wok-tiny rev 165 tip

plop: update url
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Aug 20 08:30:01 2020 +0000 (2 months ago)
parents 5f5bea2af6b6
children
files linux/receipt plop/receipt
line diff
     1.1 --- a/linux/receipt	Tue Jul 28 06:28:54 2020 +0000
     1.2 +++ b/linux/receipt	Thu Aug 20 08:30:01 2020 +0000
     1.3 @@ -15,9 +15,10 @@
     1.4  AUTO_SELECTION="always"
     1.5  
     1.6  DEPENDS=""
     1.7 -BUILD_DEPENDS="slitaz-toolchain perl git lzma wget gcc2 upx"
     1.8 -BUILD_SUGGESTED="advancecomp zopfli"
     1.9 +BUILD_DEPENDS="slitaz-toolchain perl git lzma wget gcc2"
    1.10 +BUILD_SUGGESTED="advancecomp"
    1.11  INSTALL_DEPENDS="lz4 grep"
    1.12 +INSTALL_SUGGESTED="upx"
    1.13  
    1.14  case "$TARGET" in
    1.15  	i486) SUGGESTED="memtest ipxe plop";;  # bundle may install a boot menu
    1.16 @@ -44,11 +45,9 @@
    1.17  	echo 'obj-y += kstrdup.o' >> mm/Makefile
    1.18  	sed -i 's|3.1024|11*256|' arch/i386/boot/compressed/misc.c
    1.19  	sed -i 's/O_CREAT/&|O_TRUNC/' init/initramfs.c
    1.20 -	which advdef 2> /dev/null && ! which upx 2> /dev/null &&
    1.21 +	which advdef 2> /dev/null &&
    1.22  	sed -i 's|gzip)|&\n	advdef -z4 $@|' \
    1.23  		usr/Makefile arch/i386/boot/compressed/Makefile
    1.24 -	false && which zopfli 2> /dev/null &&
    1.25 -	sed -i 's|gzip -f -9 <|time zopfli --i100 -c|' scripts/Makefile.lib
    1.26  
    1.27  	mkdir $src/slitaz
    1.28  	cp $stuff/list_modules.sh $src/slitaz
    1.29 @@ -72,10 +71,6 @@
    1.30  	cp $stuff/bundle .
    1.31  	sh ./bundle
    1.32  	S2bin cmdline
    1.33 -	
    1.34 -	which upx 2> /dev/null &&
    1.35 -	cp arch/i386/boot/bzImage arch/i386/boot/bzImage.noupx &&
    1.36 -	upx --ultra-brute arch/i386/boot/bzImage
    1.37  }
    1.38  
    1.39  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.40 @@ -96,5 +91,7 @@
    1.41  {
    1.42  	[ -s $1/boot/cmdline ] && cat $1/boot/cmdline | sed 's/^ *//' | \
    1.43  		dd of=$1/boot/bzImage conv=notrunc bs=1 seek=768 count=3072
    1.44 +	which upx 2> /dev/null &&
    1.45 +	upx --ultra-brute $1/boot/bzImage
    1.46  	$1/boot/pack $1/boot/bzImage
    1.47  }
     2.1 --- a/plop/receipt	Tue Jul 28 06:28:54 2020 +0000
     2.2 +++ b/plop/receipt	Thu Aug 20 08:30:01 2020 +0000
     2.3 @@ -7,7 +7,7 @@
     2.4  MAINTAINER="pascal.bellard@slitaz.org"
     2.5  LICENSE="other"
     2.6  WEB_SITE="https://www.plop.at/en/bootmanagers.html"
     2.7 -TARBALL="$PACKAGE-$VERSION.zip"
     2.8 +TARBALL="plpbt-$VERSION.zip"
     2.9  WGET_URL="https://download.plop.at/files/bootmngr/$TARBALL"
    2.10  TARGET="i486"
    2.11