SliTaz Repositories

     1.1 --- a/grub2/receipt	Mon Dec 09 09:08:14 2019 +0100
     1.2 +++ b/grub2/receipt	Mon Dec 09 09:37:11 2019 +0100
     1.3 @@ -1,45 +1,52 @@
     1.4  # SliTaz package receipt v2.
     1.5  
     1.6  PACKAGE="grub2"
     1.7 -VERSION="2.02"
     1.8 +VERSION="2.04"
     1.9  CATEGORY="base-system"
    1.10  SHORT_DESC="GRUB2 boot loader"
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
    1.12  LICENSE="GPL3"
    1.13 -WEB_SITE="http://www.gnu.org/software/grub/"
    1.14 +WEB_SITE="https://www.gnu.org/software/grub/"
    1.15  LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/grub.html"
    1.16  REPOLOGY="grub"
    1.17  
    1.18  TARBALL="grub-$VERSION.tar.xz"
    1.19  WGET_URL="ftp://ftp.gnu.org/gnu/grub/$TARBALL"
    1.20  
    1.21 -BUILD_DEPENDS="flex bison zlib-dev xz-dev freetype-dev ncurses-dev \
    1.22 -libusb-compat-dev libusb-dev libdevmapper-dev"
    1.23 +BUILD_DEPENDS="bison flex freetype-dev libusb-compat-dev libusb-dev 
    1.24 +	libdevmapper-dev ncurses-dev xz-dev zlib-dev"
    1.25  SPLIT="$PACKAGE-efi:efi $PACKAGE-efi-modules:efi"
    1.26  
    1.27 -compile_rules() {
    1.28 +compile_rules()
    1.29 +{
    1.30  	sed -i 's|sys/types.h>|&\n#include <sys/sysmacros.h>|' \
    1.31 -		util/getroot.c grub-core/kern/emu/hostdisk.c
    1.32 +		util/getroot.c \
    1.33 +		grub-core/kern/emu/hostdisk.c
    1.34  
    1.35  	# CVE-2015-8370
    1.36 -	sed -i "s/'.b'/& \\&\\& cur_len/" grub-core/lib/crypto.c grub-core/normal/auth.c
    1.37 +	sed -i "s/'.b'/& \\&\\& cur_len/" \
    1.38 +		grub-core/lib/crypto.c \
    1.39 +		grub-core/normal/auth.c
    1.40  
    1.41  	# Fixes for flex 2.5.37
    1.42  	export CFLAGS="-Wno-error=sign-compare -Wno-error=unused-value"
    1.43 -	sed -i '/#undef gets/{N;s/.*/#ifdef gets\n&\n#endif/}' grub-core/gnulib/stdio*h
    1.44 -	sed -i 's/YY_FATAL_ERROR/REMOVED_&/' grub-core/script/yylex.l
    1.45 +	sed -i '/#undef gets/{N;s/.*/#ifdef gets\n&\n#endif/}' \
    1.46 +		grub-core/gnulib/stdio*h
    1.47 +	sed -i 's/YY_FATAL_ERROR/REMOVED_&/' \
    1.48 +		grub-core/script/yylex.l
    1.49  
    1.50  	case $SET in
    1.51  		'')
    1.52  			#chmod +x install-sh
    1.53 -			./configure \
    1.54 -				--disable-werror \
    1.55 +			./configure			\
    1.56 +				--disable-werror	\
    1.57  				$CONFIGURE_ARGS &&
    1.58  			make $MAKEFLAGS &&
    1.59  			make DESTDIR=$install install || return 1
    1.60  
    1.61 -			# Example config file (grub.cfg)
    1.62 -			install -Dm0644 $stuff/example-grub.cfg $install/boot/grub/example-grub.cfg
    1.63 +			# Example configuration file (grub.cfg)
    1.64 +			install -Dm0644 $stuff/example-grub.cfg \
    1.65 +				$install/boot/grub/example-grub.cfg
    1.66  			;;
    1.67  		efi)
    1.68  			case $ARCH in
    1.69 @@ -51,38 +58,40 @@
    1.70  					EFI_ARCH=x86_64;;
    1.71  			esac
    1.72  			export EFI_ARCH
    1.73 -			./configure \
    1.74 -				--with-platform=efi \
    1.75 -				--target=$EFI_ARCH \
    1.76 -				--program-prefix="" \
    1.77 +			./configure			\
    1.78 +				--with-platform=efi	\
    1.79 +				--target=$EFI_ARCH	\
    1.80 +				--program-prefix=""	\
    1.81  				$CONFIGURE_ARGS &&
    1.82  			make clean &&
    1.83  			make $MAKEFLAGS || return 1
    1.84  
    1.85  			cd grub-core
    1.86 -			../grub-mkimage \
    1.87 -				-d . \
    1.88 -				-o ../$bootimg \
    1.89 -				-O $EFI_ARCH-efi \
    1.90 -				-p /boot/grub \
    1.91 -				lsefisystab lssal lsefimmap lsacpi ls \
    1.92 -				ntfs hfs appleldr boot cat efi_gop efi_uga elf fat hfsplus \
    1.93 -				iso9660 linux keylayouts memdisk minicmd part_apple ext2 extcmd \
    1.94 -				xfs xnu part_bsd part_gpt search search_fs_file chain btrfs \
    1.95 -				loadbios loadenv lvm minix minix2 reiserfs memrw mmap msdospart \
    1.96 -				scsi loopback normal configfile gzio all_video \
    1.97 -				gfxterm gettext echo || return 1
    1.98 +			../grub-mkimage			\
    1.99 +				-d .			\
   1.100 +				-o ../$bootimg		\
   1.101 +				-O $EFI_ARCH-efi	\
   1.102 +				-p /boot/grub		\
   1.103 +				all_video appleldr boot btrfs cat chain configfile \
   1.104 +				echo efi_gop efi_uga elf ext2 extcmd fat gettext \
   1.105 +				gfxterm gzio hfs hfsplus iso9660 keylayouts linux \
   1.106 +				loadbios loadenv loopback ls lsacpi lsefimmap \
   1.107 +				lsefisystab lssal lvm memdisk memrw minicmd minix \
   1.108 +				minix2 mmap msdospart normal ntfs part_apple part_bsd \
   1.109 +				part_gpt reiserfs scsi search search_fs_file xfs xnu ||
   1.110 +				return 1
   1.111  
   1.112  				install -Dm644 $src/$bootimg $install/boot/efi/boot/$bootimg
   1.113  				;;
   1.114  	esac
   1.115  }
   1.116  
   1.117 -genpkg_rules() {
   1.118 +genpkg_rules()
   1.119 +{
   1.120  	case $PACKAGE in
   1.121  		grub2)
   1.122  			copy @std
   1.123 -			DEPENDS="zlib freetype ncurses libusb-compat grep libusb libdevmapper"
   1.124 +			DEPENDS="freetype grep libdevmapper libusb libusb-compat ncurses zlib"
   1.125  			TAGS="LFS"
   1.126  			;;
   1.127  		grub2-efi)
   1.128 @@ -101,11 +110,12 @@
   1.129  	esac
   1.130  }
   1.131  
   1.132 -post_install_grub2() {
   1.133 +post_install_grub2()
   1.134 +{
   1.135  	[ -n "$quiet" ] || cat <<EOT
   1.136  
   1.137  	.-------------------------------------------------------.
   1.138 -	| # To install grub to your sda MBR                     |
   1.139 +	| # To install grub to MBR on device sda                |
   1.140  	|   grub-install /dev/sda                               |
   1.141  	|-------------------------------------------------------|
   1.142  	| # To generate a configuration file                    |