From fe6ddbda8f4dc71a3cd6a0deab6f13876b62cbe2 Mon Sep 17 00:00:00 2001 From: david Date: Wed, 23 Aug 2017 16:17:25 +0200 Subject: [PATCH 1/3] Grub: convert to versionless bee-file --- grub-2.00-0.bee => grub.be0 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename grub-2.00-0.bee => grub.be0 (98%) diff --git a/grub-2.00-0.bee b/grub.be0 similarity index 98% rename from grub-2.00-0.bee rename to grub.be0 index a903efa16..85d83a644 100755 --- a/grub-2.00-0.bee +++ b/grub.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION grub-2.00-0 + ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) @@ -52,7 +54,7 @@ build_in_sourcedir #} #mee_configure() { -# bee_configure +# bee_configure #} #mee_build() { From 99b83d357c97ff2fb6d4239c30ba0b92dd62eecf Mon Sep 17 00:00:00 2001 From: david Date: Wed, 23 Aug 2017 16:18:36 +0200 Subject: [PATCH 2/3] Grub: cleanup bee-file --- grub.be0 | 51 --------------------------------------------------- 1 file changed, 51 deletions(-) diff --git a/grub.be0 b/grub.be0 index 85d83a644..6ecd44dfa 100755 --- a/grub.be0 +++ b/grub.be0 @@ -2,49 +2,16 @@ # BEE_VERSION grub-2.00-0 -## this file was created by bee init and should be executed to build a -## bee-package. (Additional hints are located at the end of this file.) - -############################################################################### -## The source URL(s) define the location of the sources that will be -## downloaded. Version variables may be used to simplify reuse of this bee-file. - SRCURL[0]="ftp://ftp.gnu.org/gnu/grub/grub-${PKGVERSION}.tar.gz" - -############################################################################### -## Add URLs/pathes to patch files to the PATCHURL array. -## The sources will be patched in the order of the array. - PATCHURL+=(/src/mariux/patches/grub-2.00-0001-avoid-compile-error-due-to-undeclared-gets.patch) -############################################################################### -## Add filename patterns to the EXCLUDE array of files that should not -## be added to you package but may be present in the image directory. - # EXCLUDE+=() -############################################################################### -## Uncomment the next statement, if the software may not be able to be build -## outside the source directory and need to be build inside the source -## directory. - build_in_sourcedir -############################################################################### -## bee cannot detect buildtypes specified in subdirectories. -## Sometimes packages "hide" the real sources in a subdirectory named -## 'src' or 'cmake' or .. -## use 'sourcesubdir_append' to specify this directory if known. - # sourcesubdir_append src -############################################################################### -## Change the default (auto-detected) steps to -## extract, patch, configure/setup, build and install the software. -## Make sure the mee_install function does install everything to the -## image directory "${D}" - #mee_extract() { # bee_extract "${@}" #} @@ -65,21 +32,3 @@ build_in_sourcedir # bee_install #} ## by default this may be 'make install DESTDIR="${D}"' - -############################################################################### -## -## Additional hints: -## -## The name of this bee-file should follow the following naming convention: -## pkgname-pkgversion-pkgrevision.bee -## -## You may remove all comments as long as SRCURL[0]="" is set. -## -## Everything in this file will be executed in a bash environment. -## -## Build the package by executing -## './pkg-version-N.bee' or -## 'beesh ./pkg-version-N.bee' -## -## see http://beezinga.org/ -## From 7fc562130dce24e241f84217438811c1393b5ff1 Mon Sep 17 00:00:00 2001 From: david Date: Wed, 23 Aug 2017 16:19:33 +0200 Subject: [PATCH 3/3] Grub: Update from version 2.00 to 2.02 fixes for new xfs version Changelog: xfs: fix possible inode corruption in directory scan grub_xfs_iterate_dir did not restore first character after inline name when match was found. Dependning on XFS format this character could be inode number and we could return to the same node later in find_file if processing cycled symlinks. xfs: accept filesystem with meta_uuid XFS V5 stores UUID in metadata and compares them with superblock UUID. To allow changing of user-visible UUID it stores original value in new superblock field (meta_uuid) and sets incompatible flag to indicate that new field must be used to verify metadata. Our driver currently does not check metadata UUID so simply accept such filesystem. --- grub.be0 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/grub.be0 b/grub.be0 index 6ecd44dfa..429e72754 100755 --- a/grub.be0 +++ b/grub.be0 @@ -1,9 +1,10 @@ #!/usr/bin/env beesh -# BEE_VERSION grub-2.00-0 +# BEE_VERSION grub-2.02-0 SRCURL[0]="ftp://ftp.gnu.org/gnu/grub/grub-${PKGVERSION}.tar.gz" -PATCHURL+=(/src/mariux/patches/grub-2.00-0001-avoid-compile-error-due-to-undeclared-gets.patch) + +#PATCHURL+=(/src/mariux/patches/grub-2.00-0001-avoid-compile-error-due-to-undeclared-gets.patch) # EXCLUDE+=()