wok-tiny rev 166
plop: update bdeps
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu Feb 18 09:03:39 2021 +0000 (2021-02-18) |
parents | 6a0aae17c69a |
children | c1bce725480a |
files | linux/receipt plop/receipt |
line diff
1.1 --- a/linux/receipt Thu Aug 20 08:30:01 2020 +0000 1.2 +++ b/linux/receipt Thu Feb 18 09:03:39 2021 +0000 1.3 @@ -15,10 +15,9 @@ 1.4 AUTO_SELECTION="always" 1.5 1.6 DEPENDS="" 1.7 -BUILD_DEPENDS="slitaz-toolchain perl git lzma wget gcc2" 1.8 +BUILD_DEPENDS="slitaz-toolchain perl git lzma wget gcc2 upx" 1.9 BUILD_SUGGESTED="advancecomp" 1.10 INSTALL_DEPENDS="lz4 grep" 1.11 -INSTALL_SUGGESTED="upx" 1.12 1.13 case "$TARGET" in 1.14 i486) SUGGESTED="memtest ipxe plop";; # bundle may install a boot menu 1.15 @@ -45,7 +44,7 @@ 1.16 echo 'obj-y += kstrdup.o' >> mm/Makefile 1.17 sed -i 's|3.1024|11*256|' arch/i386/boot/compressed/misc.c 1.18 sed -i 's/O_CREAT/&|O_TRUNC/' init/initramfs.c 1.19 - which advdef 2> /dev/null && 1.20 + which advdef 2> /dev/null && ! which upx 2> /dev/null && 1.21 sed -i 's|gzip)|&\n advdef -z4 $@|' \ 1.22 usr/Makefile arch/i386/boot/compressed/Makefile 1.23 1.24 @@ -71,13 +70,16 @@ 1.25 cp $stuff/bundle . 1.26 sh ./bundle 1.27 S2bin cmdline 1.28 + which upx 2> /dev/null && 1.29 + cp arch/i386/boot/bzImage arch/i386/boot/bzImage.noupx && 1.30 + upx --ultra-brute arch/i386/boot/bzImage 1.31 } 1.32 1.33 # Rules to gen a SliTaz package suitable for Tazpkg. 1.34 genpkg_rules() 1.35 { 1.36 mkdir $fs/boot 1.37 - cp -a $src/arch/i386/boot/bzImage $fs/boot/ 1.38 + cp -a $src/arch/i386/boot/bzImage* $fs/boot/ 1.39 dd if=$src/bootloader.bin of=$fs/boot/bzImage conv=notrunc 1.40 dd if=$src/cmdline.bin bs=1 seek=560 of=$fs/boot/bzImage conv=notrunc 1.41 cp -a $src/pack $fs/boot/ 1.42 @@ -89,9 +91,8 @@ 1.43 # Pre and post install commands for Tazpkg. 1.44 post_install() 1.45 { 1.46 + rm -f $1/boot/bzImage.noupx 1.47 [ -s $1/boot/cmdline ] && cat $1/boot/cmdline | sed 's/^ *//' | \ 1.48 dd of=$1/boot/bzImage conv=notrunc bs=1 seek=768 count=3072 1.49 - which upx 2> /dev/null && 1.50 - upx --ultra-brute $1/boot/bzImage 1.51 $1/boot/pack $1/boot/bzImage 1.52 }
2.1 --- a/plop/receipt Thu Aug 20 08:30:01 2020 +0000 2.2 +++ b/plop/receipt Thu Feb 18 09:03:39 2021 +0000 2.3 @@ -11,7 +11,7 @@ 2.4 WGET_URL="https://download.plop.at/files/bootmngr/$TARBALL" 2.5 TARGET="i486" 2.6 2.7 -BUILD_DEPENDS="xz" 2.8 +BUILD_DEPENDS="xz wget" 2.9 2.10 # Rules to configure and make the package. 2.11 compile_rules()