SliTaz Repositories

     1.1 --- a/gpxe/receipt	Sun Nov 19 17:34:42 2017 +0100
     1.2 +++ b/gpxe/receipt	Sun Nov 19 18:31:14 2017 +0100
     1.3 @@ -29,8 +29,8 @@
     1.4  	sed -i '/timer2_running/d' include/timer.h
     1.5  	make EXTRA_CFLAGS="-fno-strict-aliasing \
     1.6  -Wno-error=unused-but-set-variable -Wno-error=implicit-function-declaration \
     1.7 --Wno-error=array-bounds -Wno-error=misleading-indentation" \
     1.8 -bin/gpxe.lkrn bin/undionly.kpxe  2>&1 | grep -v housekeeping: | grep -v blib.list
     1.9 +-Wno-error=array-bounds" bin/gpxe.lkrn bin/undionly.kpxe 2>&1 | \
    1.10 +	grep -v housekeeping: | grep -v blib.list
    1.11  }
    1.12  
    1.13  # Rules to gen a SliTaz package suitable for Tazpkg.

     2.1 --- a/grub2-efi/receipt	Sun Nov 19 17:34:42 2017 +0100
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,48 +0,0 @@
     2.4 -# SliTaz package receipt.
     2.5 -
     2.6 -PACKAGE="grub2-efi"
     2.7 -SOURCE="grub"
     2.8 -VERSION="2.00"
     2.9 -CATEGORY="base-system"
    2.10 -SHORT_DESC="GRUB2 boot loader."
    2.11 -MAINTAINER="pascal.bellard@slitaz.org"
    2.12 -LICENSE="GPL3"
    2.13 -TARBALL="$SOURCE-$VERSION.tar.xz"
    2.14 -WEB_SITE="http://www.gnu.org/software/grub/"
    2.15 -WGET_URL="ftp://ftp.gnu.org/gnu/grub/$TARBALL"
    2.16 -
    2.17 -DEPENDS="zlib freetype ncurses libusb-compat grep libusb libdevmapper"
    2.18 -BUILD_DEPENDS="flex bison zlib-dev xz-dev freetype-dev ncurses-dev \
    2.19 -libusb-compat-dev libusb-dev libdevmapper-dev"
    2.20 -
    2.21 -# Rules to configure and make the package.
    2.22 -compile_rules()
    2.23 -{
    2.24 -	# CVE-2015-8370
    2.25 -	sed -i "s/'.b'/& \\&\\& cur_len/" grub-core/lib/crypto.c grub-core/normal/auth.c
    2.26 -
    2.27 -	# Fixes for flex 2.5.37
    2.28 -	export CFLAGS="-Wno-error=sign-compare"
    2.29 -	sed -i 's/YY_FATAL_ERROR/REMOVED_&/' grub-core/script/yylex.l
    2.30 -
    2.31 -	export EFI_ARCH=i386
    2.32 -	./configure --prefix=/usr --sysconfdir=/etc \
    2.33 -		--with-platform=efi --target=${EFI_ARCH} --program-prefix="" \
    2.34 -		--mandir=/usr/share/man $CONFIGURE_ARGS &&
    2.35 -	make $MAKEFLAGS
    2.36 -	cd grub-core
    2.37 -	../grub-mkimage -d . -o ../bootia32.efi -O i386-efi -p /boot/grub \
    2.38 -		ntfs hfs appleldr boot cat efi_gop efi_uga elf fat hfsplus \
    2.39 -		iso9660 linux keylayouts memdisk minicmd part_apple ext2 extcmd \
    2.40 -		xfs xnu part_bsd part_gpt search search_fs_file chain btrfs \
    2.41 -		loadbios loadenv lvm minix minix2 reiserfs memrw mmap msdospart \
    2.42 -		scsi loopback normal configfile gzio all_video efi_gop efi_uga \
    2.43 -		gfxterm gettext echo boot chain
    2.44 -}
    2.45 -
    2.46 -# Rules to gen a SliTaz package suitable for Tazpkg.
    2.47 -genpkg_rules()
    2.48 -{
    2.49 -	mkdir -p $fs/boot/efi/boot
    2.50 -	cp $src/bootia32.efi $fs/boot/efi/boot
    2.51 -}

     3.1 --- a/grub2/receipt	Sun Nov 19 17:34:42 2017 +0100
     3.2 +++ b/grub2/receipt	Sun Nov 19 18:31:14 2017 +0100
     3.3 @@ -1,28 +1,32 @@
     3.4 -# SliTaz package receipt.
     3.5 +# SliTaz package receipt v2.
     3.6  
     3.7  PACKAGE="grub2"
     3.8  SOURCE="grub"
     3.9 -VERSION="2.00"
    3.10 +VERSION="2.02"
    3.11  CATEGORY="base-system"
    3.12 -SHORT_DESC="GRUB2 boot loader."
    3.13 +SHORT_DESC="GRUB2 boot loader"
    3.14  MAINTAINER="pascal.bellard@slitaz.org"
    3.15  LICENSE="GPL3"
    3.16  TARBALL="$SOURCE-$VERSION.tar.xz"
    3.17  WEB_SITE="http://www.gnu.org/software/grub/"
    3.18  WGET_URL="ftp://ftp.gnu.org/gnu/grub/$TARBALL"
    3.19  
    3.20 -DEPENDS="zlib freetype ncurses libusb-compat grep libusb libdevmapper"
    3.21  BUILD_DEPENDS="flex bison zlib-dev xz-dev freetype-dev ncurses-dev \
    3.22  libusb-compat-dev libusb-dev libdevmapper-dev"
    3.23 +SPLIT="grub2 grub2-efi"
    3.24  
    3.25  # Rules to configure and make the package.
    3.26  compile_rules()
    3.27  {
    3.28 +	sed -i 's|sys/types.h>|&\n#include <sys/sysmacros.h>|' \
    3.29 +		util/getroot.c util/raid.c grub-core/kern/emu/hostdisk.c
    3.30 +
    3.31  	# CVE-2015-8370
    3.32  	sed -i "s/'.b'/& \\&\\& cur_len/" grub-core/lib/crypto.c grub-core/normal/auth.c
    3.33  
    3.34  	# Fixes for flex 2.5.37
    3.35 -	export CFLAGS="-Wno-error=sign-compare"
    3.36 +	export CFLAGS="-Wno-error=sign-compare -Wno-error=unused-value"       
    3.37 +	sed -i '/#undef gets/{N;s/.*/#ifdef gets\n&\n#endif/}' grub-core/gnulib/stdio*h
    3.38  	sed -i 's/YY_FATAL_ERROR/REMOVED_&/' grub-core/script/yylex.l
    3.39  	
    3.40  	#chmod +x install-sh
    3.41 @@ -30,23 +34,47 @@
    3.42  	--mandir=/usr/share/man $CONFIGURE_ARGS &&
    3.43  	make $MAKEFLAGS &&
    3.44  	make DESTDIR=$DESTDIR install
    3.45 +
    3.46 +	export EFI_ARCH=i386
    3.47 +	./configure --prefix=/usr --sysconfdir=/etc \
    3.48 +		--with-platform=efi --target=${EFI_ARCH} --program-prefix="" \
    3.49 +		--mandir=/usr/share/man $CONFIGURE_ARGS &&
    3.50 +	make clean &&
    3.51 +	make $MAKEFLAGS
    3.52 +	cd grub-core
    3.53 +	../grub-mkimage -d . -o ../bootia32.efi -O i386-efi -p /boot/grub \
    3.54 +		ntfs hfs appleldr boot cat efi_gop efi_uga elf fat hfsplus \
    3.55 +		iso9660 linux keylayouts memdisk minicmd part_apple ext2 extcmd \
    3.56 +		xfs xnu part_bsd part_gpt search search_fs_file chain btrfs \
    3.57 +		loadbios loadenv lvm minix minix2 reiserfs memrw mmap msdospart \
    3.58 +		scsi loopback normal configfile gzio all_video efi_gop efi_uga \
    3.59 +		gfxterm gettext echo boot chain
    3.60  }
    3.61  
    3.62  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.63  genpkg_rules()
    3.64  {
    3.65 -	mkdir -p $fs/boot/grub $fs/usr
    3.66 -	cp -a $install/usr/bin $fs/usr
    3.67 -	cp -a $install/usr/sbin $fs/usr
    3.68 -	cp -a $install/usr/share $fs/usr
    3.69 -	cp -a $install/usr/lib $fs/usr
    3.70 -	cp -a $install/etc $fs
    3.71 -	
    3.72 -	# Example config file (grub.cfg).
    3.73 -	cp stuff/example-grub.cfg $fs/boot/grub
    3.74 +	case $PACKAGE in
    3.75 +	grub2)
    3.76 +		DEPENDS="zlib freetype ncurses libusb-compat grep libusb libdevmapper"
    3.77 +		mkdir -p $fs/boot/grub $fs/usr
    3.78 +		cp -a $install/usr/bin $fs/usr
    3.79 +		cp -a $install/usr/sbin $fs/usr
    3.80 +		cp -a $install/usr/share $fs/usr
    3.81 +		cp -a $install/usr/lib $fs/usr
    3.82 +		cp -a $install/etc $fs
    3.83 +		
    3.84 +		# Example config file (grub.cfg).
    3.85 +		cp stuff/example-grub.cfg $fs/boot/grub
    3.86 +		;;
    3.87 +	grub2-efi)
    3.88 +		mkdir -p $fs/boot/efi/boot
    3.89 +		cp $src/bootia32.efi $fs/boot/efi/boot
    3.90 +		;;
    3.91 +	esac
    3.92  }
    3.93  
    3.94 -post_install()
    3.95 +post_install_grub2()
    3.96  {
    3.97  	cat <<EOT
    3.98  # To install grub to your sda MBR
    3.99 @@ -58,4 +86,3 @@
   3.100  # You can learn from /boot/grub/example-grub.cfg too.
   3.101  EOT
   3.102  }
   3.103 -