wok-current rev 22404

updated grub2 packages (2.02 -> 2.04)
author Hans-G?nter Theisgen
date Mon Dec 09 16:05:14 2019 +0100 (2019-12-09)
parents 4ecb2ba9c210
children bf3c685967c6
files grub2-efi-modules/receipt grub2-efi-x64-modules/receipt grub2-efi-x64/receipt grub2-efi/receipt grub2/receipt
line diff
     1.1 --- a/grub2-efi-modules/receipt	Mon Dec 09 14:21:13 2019 +0100
     1.2 +++ b/grub2-efi-modules/receipt	Mon Dec 09 16:05:14 2019 +0100
     1.3 @@ -1,19 +1,21 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="grub2-efi-modules"
     1.7 -VERSION="2.02"
     1.8 +VERSION="2.04"
     1.9  CATEGORY="base-system"
    1.10 -SHORT_DESC="GRUB2/EFI boot loader modules."
    1.11 +SHORT_DESC="GRUB2 EFI boot loader modules."
    1.12  MAINTAINER="pascal.bellard@slitaz.org"
    1.13  LICENSE="GPL3"
    1.14 -WEB_SITE="http://www.gnu.org/software/grub/"
    1.15 -WANTED="grub2-efi"
    1.16 +WEB_SITE="https://www.gnu.org/software/grub/"
    1.17  
    1.18  DEPENDS="grub2-efi"
    1.19 +WANTED="grub2-efi"
    1.20  
    1.21  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.22  genpkg_rules()
    1.23  {
    1.24  	mkdir -p $fs/boot/grub/i386-efi
    1.25 -	cp $src/grub-core/*.mod $src/grub-core/*.lst $fs/boot/grub/i386-efi
    1.26 +
    1.27 +	cp $src/grub-core/*.mod	$fs/boot/grub/i386-efi
    1.28 +	cp $src/grub-core/*.lst	$fs/boot/grub/i386-efi
    1.29  }
     2.1 --- a/grub2-efi-x64-modules/receipt	Mon Dec 09 14:21:13 2019 +0100
     2.2 +++ b/grub2-efi-x64-modules/receipt	Mon Dec 09 16:05:14 2019 +0100
     2.3 @@ -1,19 +1,21 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="grub2-efi-x64-modules"
     2.7 -VERSION="2.02"
     2.8 +VERSION="2.04"
     2.9  CATEGORY="base-system"
    2.10 -SHORT_DESC="GRUB2/EFI boot loader modules."
    2.11 +SHORT_DESC="GRUB2 EFI boot loader modules."
    2.12  MAINTAINER="pascal.bellard@slitaz.org"
    2.13  LICENSE="GPL3"
    2.14  WEB_SITE="http://www.gnu.org/software/grub/"
    2.15 -WANTED="grub2-efi-x64"
    2.16  
    2.17  DEPENDS="grub2-efi-x64"
    2.18 +WANTED="grub2-efi-x64"
    2.19  
    2.20  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.21  genpkg_rules()
    2.22  {
    2.23  	mkdir -p $fs/boot/grub/x86_64-efi
    2.24 -	cp $src/grub-core/*.mod $src/grub-core/*.lst $fs/boot/grub/x86_64-efi
    2.25 +
    2.26 +	cp $src/grub-core/*.mod	$fs/boot/grub/x86_64-efi
    2.27 +	cp $src/grub-core/*.lst	$fs/boot/grub/x86_64-efi
    2.28  }
     3.1 --- a/grub2-efi-x64/receipt	Mon Dec 09 14:21:13 2019 +0100
     3.2 +++ b/grub2-efi-x64/receipt	Mon Dec 09 16:05:14 2019 +0100
     3.3 @@ -1,19 +1,21 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="grub2-efi-x64"
     3.7 -SOURCE="grub"
     3.8 -VERSION="2.02"
     3.9 +VERSION="2.04"
    3.10  CATEGORY="base-system"
    3.11  SHORT_DESC="GRUB2 boot loader."
    3.12  MAINTAINER="pascal.bellard@slitaz.org"
    3.13  LICENSE="GPL3"
    3.14 +WEB_SITE="https://www.gnu.org/software/grub/"
    3.15 +
    3.16 +SOURCE="grub"
    3.17  TARBALL="$SOURCE-$VERSION.tar.xz"
    3.18 -WEB_SITE="http://www.gnu.org/software/grub/"
    3.19  WGET_URL="ftp://ftp.gnu.org/gnu/grub/$TARBALL"
    3.20  
    3.21 -DEPENDS="zlib freetype ncurses libusb-compat grep libusb libdevmapper"
    3.22 -BUILD_DEPENDS="flex bison zlib-dev xz-dev freetype-dev ncurses-dev fuse-dev \
    3.23 -libusb-compat-dev libusb-dev libdevmapper-dev uclibc-cross-compiler-x86_64"
    3.24 +DEPENDS="freetype grep libdevmapper libusb libusb-compat ncurses zlib"
    3.25 +BUILD_DEPENDS="bison flex freetype-dev fuse-dev libdevmapper-dev 
    3.26 +	libusb-compat-dev libusb-dev ncurses-dev 
    3.27 +	uclibc-cross-compiler-x86_64 xz-dev zlib-dev"
    3.28  
    3.29  AUFS_NOT_RAMFS="uclibc-cross-compiler-x86_64 is not compatible with aufs+tmpfs 8("
    3.30  
    3.31 @@ -31,22 +33,36 @@
    3.32  	export CFLAGS="-Wno-error=sign-compare -Wno-error=unused-value"
    3.33  	sed -i '/#undef gets/{N;s/.*/#ifdef gets\n&\n#endif/}' \
    3.34  		grub-core/gnulib/stdio*h
    3.35 -	sed -i 's/YY_FATAL_ERROR/REMOVED_&/' grub-core/script/yylex.l
    3.36 +	sed -i 's/YY_FATAL_ERROR/REMOVED_&/' \
    3.37 +		grub-core/script/yylex.l
    3.38  
    3.39  	export EFI_ARCH=x86_64
    3.40 -	sed -i 's/is_symbol_local /type == 2 || /' util/grub-module-verifier*.c*
    3.41 -	sed -i 's/.*unsupported relocation.*/continue;/' util/grub-module-verifier*.c*
    3.42 -	sed -i 's|.*add fixup entry for R_X86_64_32|// &|' util/grub-mkimage*.c*
    3.43 -	./configure BUILD_CC=gcc CFLAGS="${CFLAGS/-march=i486/-g0}" \
    3.44 -		TARGET_CC=uclibc-x86_64-gcc TARGET_OBJCOPY=uclibc-x86_64-objcopy \
    3.45 -		TARGET_NM=uclibc-x86_64-nm TARGET_STRIP=uclibc-x86_64-strip \
    3.46 -		TARGET_RANLIB='uclibc-x86_64-ranlib' \
    3.47 -		--prefix=/usr --sysconfdir=/etc \
    3.48 -		--with-platform=efi --target=${EFI_ARCH} --program-prefix="" \
    3.49 +	sed -i 's/is_symbol_local /type == 2 || /' \
    3.50 +		util/grub-module-verifier*.c*
    3.51 +	sed -i 's/.*unsupported relocation.*/continue;/' \
    3.52 +		util/grub-module-verifier*.c*
    3.53 +	sed -i 's|.*add fixup entry for R_X86_64_32|// &|' \
    3.54 +		util/grub-mkimage*.c*
    3.55 +
    3.56 +	./configure					\
    3.57 +		BUILD_CC=gcc				\
    3.58 +		CFLAGS="${CFLAGS/-march=i486/-g0}"	\
    3.59 +		TARGET_CC=uclibc-x86_64-gcc		\
    3.60 +		TARGET_OBJCOPY=uclibc-x86_64-objcopy	\
    3.61 +		TARGET_NM=uclibc-x86_64-nm		\
    3.62 +		TARGET_STRIP=uclibc-x86_64-strip	\
    3.63 +		TARGET_RANLIB='uclibc-x86_64-ranlib'	\
    3.64 +		--prefix=/usr				\
    3.65 +		--sysconfdir=/etc			\
    3.66 +		--with-platform=efi			\
    3.67 +		--target=${EFI_ARCH}			\
    3.68 +		--program-prefix=""			\
    3.69  		--mandir=/usr/share/man $CONFIGURE_ARGS &&
    3.70 +
    3.71  	sed -i 's| -Werror||;s|-Wl,--copy-dt-needed-entries||' \
    3.72  		Makefile grub-core/Makefile &&
    3.73  	make $MAKEFLAGS &&
    3.74 +
    3.75  	cd grub-core &&
    3.76  	../grub-mkimage -d . -o ../bootx64.efi -O x86_64-efi -p /boot/grub \
    3.77  		-c $stuff/grub.cfg \
     4.1 --- a/grub2-efi/receipt	Mon Dec 09 14:21:13 2019 +0100
     4.2 +++ b/grub2-efi/receipt	Mon Dec 09 16:05:14 2019 +0100
     4.3 @@ -1,38 +1,47 @@
     4.4  # SliTaz package receipt.
     4.5  
     4.6  PACKAGE="grub2-efi"
     4.7 -SOURCE="grub"
     4.8 -VERSION="2.02"
     4.9 +VERSION="2.04"
    4.10  CATEGORY="base-system"
    4.11  SHORT_DESC="GRUB2 boot loader."
    4.12  MAINTAINER="pascal.bellard@slitaz.org"
    4.13  LICENSE="GPL3"
    4.14 +WEB_SITE="https://www.gnu.org/software/grub/"
    4.15 +
    4.16 +SOURCE="grub"
    4.17  TARBALL="$SOURCE-$VERSION.tar.xz"
    4.18 -WEB_SITE="http://www.gnu.org/software/grub/"
    4.19  WGET_URL="ftp://ftp.gnu.org/gnu/grub/$TARBALL"
    4.20  
    4.21 -DEPENDS="zlib freetype ncurses libusb-compat grep libusb libdevmapper"
    4.22 -BUILD_DEPENDS="flex bison zlib-dev xz-dev freetype-dev ncurses-dev fuse-dev \
    4.23 -libusb-compat-dev libusb-dev libdevmapper-dev"
    4.24 +DEPENDS="freetype grep libdevmapper libusb-compat libusb ncurses zlib"
    4.25 +BUILD_DEPENDS="bison flex freetype-dev fuse-dev libdevmapper-dev 
    4.26 +	libusb-compat-dev libusb-dev ncurses-dev xz-dev zlib-dev"
    4.27  
    4.28  # Rules to configure and make the package.
    4.29  compile_rules()
    4.30  {
    4.31 -	sed -i 's|fprintf(...) |&(void)|' grub-core/script/yylex.l
    4.32 +	sed -i 's|fprintf(...) |&(void)|' \
    4.33 +		grub-core/script/yylex.l
    4.34  	export EFI_ARCH=i386
    4.35 -	./configure --prefix=/usr --sysconfdir=/etc \
    4.36 -		--with-platform=efi --target=${EFI_ARCH} --program-prefix="" \
    4.37 -		--mandir=/usr/share/man $CONFIGURE_ARGS &&
    4.38 +
    4.39 +	./configure			\
    4.40 +		--prefix=/usr		\
    4.41 +		--sysconfdir=/etc	\
    4.42 +		--with-platform=efi	\
    4.43 +		--target=${EFI_ARCH}	\
    4.44 +		--program-prefix=""	\
    4.45 +		--mandir=/usr/share/man	\
    4.46 +		$CONFIGURE_ARGS &&
    4.47  	make $MAKEFLAGS
    4.48 +
    4.49  	cd grub-core
    4.50  	../grub-mkimage -d . -o ../bootia32.efi -O i386-efi -p /boot/grub \
    4.51 -		lsefisystab lssal lsefimmap lsacpi ls \
    4.52 -		ntfs hfs appleldr boot cat efi_gop efi_uga elf fat hfsplus \
    4.53 -		iso9660 linux keylayouts memdisk minicmd part_apple ext2 extcmd \
    4.54 -		xfs xnu part_bsd part_gpt search search_fs_file chain btrfs \
    4.55 -		loadbios loadenv lvm minix minix2 reiserfs memrw mmap msdospart \
    4.56 -		scsi loopback normal configfile gzio all_video \
    4.57 -		gfxterm gettext echo
    4.58 +		all_video appleldr boot btrfs cat chain configfile echo \
    4.59 +		efi_gop efi_uga elf ext2 extcmd fat gettext gfxterm gzio hfs \
    4.60 +		hfsplus iso9660 keylayouts linux loadbios loadenv loopback \
    4.61 +		ls lsacpi lsefimmap lsefisystab lssal lvm memdisk memrw \
    4.62 +		minicmd minix minix2 mmap msdospart normal ntfs part_apple \
    4.63 +		part_bsd part_gpt reiserfs scsi search search_fs_file \
    4.64 +		xfs xnu
    4.65  }
    4.66  
    4.67  # Rules to gen a SliTaz package suitable for Tazpkg.
     5.1 --- a/grub2/receipt	Mon Dec 09 14:21:13 2019 +0100
     5.2 +++ b/grub2/receipt	Mon Dec 09 16:05:14 2019 +0100
     5.3 @@ -1,26 +1,31 @@
     5.4  # SliTaz package receipt.
     5.5  
     5.6  PACKAGE="grub2"
     5.7 -SOURCE="grub"
     5.8 -VERSION="2.02"
     5.9 +VERSION="2.04"
    5.10  CATEGORY="base-system"
    5.11  SHORT_DESC="GRUB2 boot loader."
    5.12  MAINTAINER="pascal.bellard@slitaz.org"
    5.13  LICENSE="GPL3"
    5.14 +WEB_SITE="https://www.gnu.org/software/grub/"
    5.15 +
    5.16 +SOURCE="grub"
    5.17  TARBALL="$SOURCE-$VERSION.tar.xz"
    5.18 -WEB_SITE="http://www.gnu.org/software/grub/"
    5.19  WGET_URL="ftp://ftp.gnu.org/gnu/grub/$TARBALL"
    5.20  
    5.21 -DEPENDS="zlib freetype ncurses libusb-compat grep libusb libdevmapper"
    5.22 -BUILD_DEPENDS="flex bison zlib-dev xz-dev freetype-dev ncurses-dev fuse-dev \
    5.23 -libusb-compat-dev libusb-dev libdevmapper-dev"
    5.24 +DEPENDS="freetype grep libdevmapper libusb libusb-compat ncurses zlib"
    5.25 +BUILD_DEPENDS="bison flex freetype-dev fuse-dev libdevmapper-dev 
    5.26 +	libusb-compat-dev libusb-dev ncurses-dev xz-dev zlib-dev"
    5.27  
    5.28  # Rules to configure and make the package.
    5.29  compile_rules()
    5.30  {
    5.31 -	sed -i 's|fprintf(...) |&(void)|' grub-core/script/yylex.l
    5.32 -	./configure --prefix=/usr --sysconfdir=/etc \
    5.33 -	--mandir=/usr/share/man $CONFIGURE_ARGS &&
    5.34 +	sed -i 's|fprintf(...) |&(void)|' \
    5.35 +		grub-core/script/yylex.l
    5.36 +	./configure			\
    5.37 +		--prefix=/usr		\
    5.38 +		--sysconfdir=/etc	\
    5.39 +		--mandir=/usr/share/man	\
    5.40 +		$CONFIGURE_ARGS &&
    5.41  	make $MAKEFLAGS &&
    5.42  	make DESTDIR=$DESTDIR install
    5.43  }
    5.44 @@ -28,21 +33,23 @@
    5.45  # Rules to gen a SliTaz package suitable for Tazpkg.
    5.46  genpkg_rules()
    5.47  {
    5.48 -	mkdir -p $fs/boot/grub $fs/usr
    5.49 -	cp -a $install/usr/bin $fs/usr
    5.50 -	cp -a $install/usr/sbin $fs/usr
    5.51 -	cp -a $install/usr/share $fs/usr
    5.52 -	cp -a $install/usr/lib $fs/usr
    5.53 -	cp -a $install/etc $fs
    5.54 +	mkdir -p $fs/boot/grub
    5.55 +	mkdir -p $fs/usr
    5.56 +
    5.57 +	cp -a $install/usr/bin		$fs/usr
    5.58 +	cp -a $install/usr/sbin		$fs/usr
    5.59 +	cp -a $install/usr/share	$fs/usr
    5.60 +	cp -a $install/usr/lib		$fs/usr
    5.61 +	cp -a $install/etc		$fs
    5.62  	
    5.63 -	# Example config file (grub.cfg).
    5.64 -	cp stuff/example-grub.cfg $fs/boot/grub
    5.65 +	# Example configuration file (grub.cfg).
    5.66 +	cp stuff/example-grub.cfg	$fs/boot/grub
    5.67  }
    5.68  
    5.69  post_install()
    5.70  {
    5.71  	cat <<EOT
    5.72 -# To install grub to your sda MBR
    5.73 +# To install grub to MBR on device sda
    5.74  grub-install /dev/sda
    5.75  
    5.76  # To generate a configuration file
    5.77 @@ -51,4 +58,3 @@
    5.78  # You can learn from /boot/grub/example-grub.cfg too.
    5.79  EOT
    5.80  }
    5.81 -