# HG changeset patch # User Hans-G?nter Theisgen # Date 1575903914 -3600 # Node ID 996067d113c6e6be03c15ef7a813c023a9018fc1 # Parent 4ecb2ba9c2104bf21057e4a0d823e65627e27e1b updated grub2 packages (2.02 -> 2.04) diff -r 4ecb2ba9c210 -r 996067d113c6 grub2-efi-modules/receipt --- a/grub2-efi-modules/receipt Mon Dec 09 14:21:13 2019 +0100 +++ b/grub2-efi-modules/receipt Mon Dec 09 16:05:14 2019 +0100 @@ -1,19 +1,21 @@ # SliTaz package receipt. PACKAGE="grub2-efi-modules" -VERSION="2.02" +VERSION="2.04" CATEGORY="base-system" -SHORT_DESC="GRUB2/EFI boot loader modules." +SHORT_DESC="GRUB2 EFI boot loader modules." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL3" -WEB_SITE="http://www.gnu.org/software/grub/" -WANTED="grub2-efi" +WEB_SITE="https://www.gnu.org/software/grub/" DEPENDS="grub2-efi" +WANTED="grub2-efi" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/boot/grub/i386-efi - cp $src/grub-core/*.mod $src/grub-core/*.lst $fs/boot/grub/i386-efi + + cp $src/grub-core/*.mod $fs/boot/grub/i386-efi + cp $src/grub-core/*.lst $fs/boot/grub/i386-efi } diff -r 4ecb2ba9c210 -r 996067d113c6 grub2-efi-x64-modules/receipt --- a/grub2-efi-x64-modules/receipt Mon Dec 09 14:21:13 2019 +0100 +++ b/grub2-efi-x64-modules/receipt Mon Dec 09 16:05:14 2019 +0100 @@ -1,19 +1,21 @@ # SliTaz package receipt. PACKAGE="grub2-efi-x64-modules" -VERSION="2.02" +VERSION="2.04" CATEGORY="base-system" -SHORT_DESC="GRUB2/EFI boot loader modules." +SHORT_DESC="GRUB2 EFI boot loader modules." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL3" WEB_SITE="http://www.gnu.org/software/grub/" -WANTED="grub2-efi-x64" DEPENDS="grub2-efi-x64" +WANTED="grub2-efi-x64" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/boot/grub/x86_64-efi - cp $src/grub-core/*.mod $src/grub-core/*.lst $fs/boot/grub/x86_64-efi + + cp $src/grub-core/*.mod $fs/boot/grub/x86_64-efi + cp $src/grub-core/*.lst $fs/boot/grub/x86_64-efi } diff -r 4ecb2ba9c210 -r 996067d113c6 grub2-efi-x64/receipt --- a/grub2-efi-x64/receipt Mon Dec 09 14:21:13 2019 +0100 +++ b/grub2-efi-x64/receipt Mon Dec 09 16:05:14 2019 +0100 @@ -1,19 +1,21 @@ # SliTaz package receipt. PACKAGE="grub2-efi-x64" -SOURCE="grub" -VERSION="2.02" +VERSION="2.04" CATEGORY="base-system" SHORT_DESC="GRUB2 boot loader." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL3" +WEB_SITE="https://www.gnu.org/software/grub/" + +SOURCE="grub" TARBALL="$SOURCE-$VERSION.tar.xz" -WEB_SITE="http://www.gnu.org/software/grub/" WGET_URL="ftp://ftp.gnu.org/gnu/grub/$TARBALL" -DEPENDS="zlib freetype ncurses libusb-compat grep libusb libdevmapper" -BUILD_DEPENDS="flex bison zlib-dev xz-dev freetype-dev ncurses-dev fuse-dev \ -libusb-compat-dev libusb-dev libdevmapper-dev uclibc-cross-compiler-x86_64" +DEPENDS="freetype grep libdevmapper libusb libusb-compat ncurses zlib" +BUILD_DEPENDS="bison flex freetype-dev fuse-dev libdevmapper-dev + libusb-compat-dev libusb-dev ncurses-dev + uclibc-cross-compiler-x86_64 xz-dev zlib-dev" AUFS_NOT_RAMFS="uclibc-cross-compiler-x86_64 is not compatible with aufs+tmpfs 8(" @@ -31,22 +33,36 @@ export CFLAGS="-Wno-error=sign-compare -Wno-error=unused-value" sed -i '/#undef gets/{N;s/.*/#ifdef gets\n&\n#endif/}' \ grub-core/gnulib/stdio*h - sed -i 's/YY_FATAL_ERROR/REMOVED_&/' grub-core/script/yylex.l + sed -i 's/YY_FATAL_ERROR/REMOVED_&/' \ + grub-core/script/yylex.l export EFI_ARCH=x86_64 - sed -i 's/is_symbol_local /type == 2 || /' util/grub-module-verifier*.c* - sed -i 's/.*unsupported relocation.*/continue;/' util/grub-module-verifier*.c* - sed -i 's|.*add fixup entry for R_X86_64_32|// &|' util/grub-mkimage*.c* - ./configure BUILD_CC=gcc CFLAGS="${CFLAGS/-march=i486/-g0}" \ - TARGET_CC=uclibc-x86_64-gcc TARGET_OBJCOPY=uclibc-x86_64-objcopy \ - TARGET_NM=uclibc-x86_64-nm TARGET_STRIP=uclibc-x86_64-strip \ - TARGET_RANLIB='uclibc-x86_64-ranlib' \ - --prefix=/usr --sysconfdir=/etc \ - --with-platform=efi --target=${EFI_ARCH} --program-prefix="" \ + sed -i 's/is_symbol_local /type == 2 || /' \ + util/grub-module-verifier*.c* + sed -i 's/.*unsupported relocation.*/continue;/' \ + util/grub-module-verifier*.c* + sed -i 's|.*add fixup entry for R_X86_64_32|// &|' \ + util/grub-mkimage*.c* + + ./configure \ + BUILD_CC=gcc \ + CFLAGS="${CFLAGS/-march=i486/-g0}" \ + TARGET_CC=uclibc-x86_64-gcc \ + TARGET_OBJCOPY=uclibc-x86_64-objcopy \ + TARGET_NM=uclibc-x86_64-nm \ + TARGET_STRIP=uclibc-x86_64-strip \ + TARGET_RANLIB='uclibc-x86_64-ranlib' \ + --prefix=/usr \ + --sysconfdir=/etc \ + --with-platform=efi \ + --target=${EFI_ARCH} \ + --program-prefix="" \ --mandir=/usr/share/man $CONFIGURE_ARGS && + sed -i 's| -Werror||;s|-Wl,--copy-dt-needed-entries||' \ Makefile grub-core/Makefile && make $MAKEFLAGS && + cd grub-core && ../grub-mkimage -d . -o ../bootx64.efi -O x86_64-efi -p /boot/grub \ -c $stuff/grub.cfg \ diff -r 4ecb2ba9c210 -r 996067d113c6 grub2-efi/receipt --- a/grub2-efi/receipt Mon Dec 09 14:21:13 2019 +0100 +++ b/grub2-efi/receipt Mon Dec 09 16:05:14 2019 +0100 @@ -1,38 +1,47 @@ # SliTaz package receipt. PACKAGE="grub2-efi" -SOURCE="grub" -VERSION="2.02" +VERSION="2.04" CATEGORY="base-system" SHORT_DESC="GRUB2 boot loader." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL3" +WEB_SITE="https://www.gnu.org/software/grub/" + +SOURCE="grub" TARBALL="$SOURCE-$VERSION.tar.xz" -WEB_SITE="http://www.gnu.org/software/grub/" WGET_URL="ftp://ftp.gnu.org/gnu/grub/$TARBALL" -DEPENDS="zlib freetype ncurses libusb-compat grep libusb libdevmapper" -BUILD_DEPENDS="flex bison zlib-dev xz-dev freetype-dev ncurses-dev fuse-dev \ -libusb-compat-dev libusb-dev libdevmapper-dev" +DEPENDS="freetype grep libdevmapper libusb-compat libusb ncurses zlib" +BUILD_DEPENDS="bison flex freetype-dev fuse-dev libdevmapper-dev + libusb-compat-dev libusb-dev ncurses-dev xz-dev zlib-dev" # Rules to configure and make the package. compile_rules() { - sed -i 's|fprintf(...) |&(void)|' grub-core/script/yylex.l + sed -i 's|fprintf(...) |&(void)|' \ + grub-core/script/yylex.l export EFI_ARCH=i386 - ./configure --prefix=/usr --sysconfdir=/etc \ - --with-platform=efi --target=${EFI_ARCH} --program-prefix="" \ - --mandir=/usr/share/man $CONFIGURE_ARGS && + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --with-platform=efi \ + --target=${EFI_ARCH} \ + --program-prefix="" \ + --mandir=/usr/share/man \ + $CONFIGURE_ARGS && make $MAKEFLAGS + cd grub-core ../grub-mkimage -d . -o ../bootia32.efi -O i386-efi -p /boot/grub \ - lsefisystab lssal lsefimmap lsacpi ls \ - ntfs hfs appleldr boot cat efi_gop efi_uga elf fat hfsplus \ - iso9660 linux keylayouts memdisk minicmd part_apple ext2 extcmd \ - xfs xnu part_bsd part_gpt search search_fs_file chain btrfs \ - loadbios loadenv lvm minix minix2 reiserfs memrw mmap msdospart \ - scsi loopback normal configfile gzio all_video \ - gfxterm gettext echo + all_video appleldr boot btrfs cat chain configfile echo \ + efi_gop efi_uga elf ext2 extcmd fat gettext gfxterm gzio hfs \ + hfsplus iso9660 keylayouts linux loadbios loadenv loopback \ + ls lsacpi lsefimmap lsefisystab lssal lvm memdisk memrw \ + minicmd minix minix2 mmap msdospart normal ntfs part_apple \ + part_bsd part_gpt reiserfs scsi search search_fs_file \ + xfs xnu } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r 4ecb2ba9c210 -r 996067d113c6 grub2/receipt --- a/grub2/receipt Mon Dec 09 14:21:13 2019 +0100 +++ b/grub2/receipt Mon Dec 09 16:05:14 2019 +0100 @@ -1,26 +1,31 @@ # SliTaz package receipt. PACKAGE="grub2" -SOURCE="grub" -VERSION="2.02" +VERSION="2.04" CATEGORY="base-system" SHORT_DESC="GRUB2 boot loader." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL3" +WEB_SITE="https://www.gnu.org/software/grub/" + +SOURCE="grub" TARBALL="$SOURCE-$VERSION.tar.xz" -WEB_SITE="http://www.gnu.org/software/grub/" WGET_URL="ftp://ftp.gnu.org/gnu/grub/$TARBALL" -DEPENDS="zlib freetype ncurses libusb-compat grep libusb libdevmapper" -BUILD_DEPENDS="flex bison zlib-dev xz-dev freetype-dev ncurses-dev fuse-dev \ -libusb-compat-dev libusb-dev libdevmapper-dev" +DEPENDS="freetype grep libdevmapper libusb libusb-compat ncurses zlib" +BUILD_DEPENDS="bison flex freetype-dev fuse-dev libdevmapper-dev + libusb-compat-dev libusb-dev ncurses-dev xz-dev zlib-dev" # Rules to configure and make the package. compile_rules() { - sed -i 's|fprintf(...) |&(void)|' grub-core/script/yylex.l - ./configure --prefix=/usr --sysconfdir=/etc \ - --mandir=/usr/share/man $CONFIGURE_ARGS && + sed -i 's|fprintf(...) |&(void)|' \ + grub-core/script/yylex.l + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + $CONFIGURE_ARGS && make $MAKEFLAGS && make DESTDIR=$DESTDIR install } @@ -28,21 +33,23 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/boot/grub $fs/usr - cp -a $install/usr/bin $fs/usr - cp -a $install/usr/sbin $fs/usr - cp -a $install/usr/share $fs/usr - cp -a $install/usr/lib $fs/usr - cp -a $install/etc $fs + mkdir -p $fs/boot/grub + mkdir -p $fs/usr + + cp -a $install/usr/bin $fs/usr + cp -a $install/usr/sbin $fs/usr + cp -a $install/usr/share $fs/usr + cp -a $install/usr/lib $fs/usr + cp -a $install/etc $fs - # Example config file (grub.cfg). - cp stuff/example-grub.cfg $fs/boot/grub + # Example configuration file (grub.cfg). + cp stuff/example-grub.cfg $fs/boot/grub } post_install() { cat <