wok-tiny rev 123
busybox: shrink script, isapnptools: merge
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Mon Dec 26 16:37:28 2016 +0100 (2016-12-26) |
parents | 71578afbe544 |
children | b422abc85a5f |
files | busybox/receipt isapnptools/receipt |
line diff
1.1 --- a/busybox/receipt Mon Dec 26 14:18:29 2016 +0100 1.2 +++ b/busybox/receipt Mon Dec 26 16:37:28 2016 +0100 1.3 @@ -118,6 +118,10 @@ 1.4 #ln -s var/tmp rootfs/tmp 1.5 1.6 sed -i 's/[ \t]*#.*//;s/[ \t] / /g;s/[ \t]\t/\t/g;/^$/d' rootfs/etc/services 1.7 + sed -i '2,$s/^#.*//;/^$/d' rootfs/etc/init.d/rc* rootfs/etc/init.d/daemon \ 1.8 + rootfs/etc/init.d/*.sh 1.9 + sed -i 's/^#.*//;/^$/d' rootfs/etc/*.conf rootfs/etc/*tab \ 1.10 + rootfs/etc/profile rootfs/etc/securetty rootfs/etc/shells 1.11 ( cd rootfs ; find | cpio -o -H newc ) > rootfs.cpio 1.12 du -h rootfs.cpio 1.13
2.1 --- a/isapnptools/receipt Mon Dec 26 14:18:29 2016 +0100 2.2 +++ b/isapnptools/receipt Mon Dec 26 16:37:28 2016 +0100 2.3 @@ -22,6 +22,9 @@ 2.4 ln -s $i ./$PREFIX-${i#/usr/bin/uclibc-$TARGET-} 2.5 done 2.6 2.7 + sed -i 's/pnpdump_main.$(OBJEXT)/isapnp_main.$(OBJEXT) &/' src/Makefile.* 2.8 + sed -i 's/return/if (!strcmp(basename(argv[0]),"isapnp")) return (isapnp_main(argc, argv));\n&/' src/pnpdump.c 2.9 + 2.10 # Let's go ! 2.11 ./configure \ 2.12 --host=$PREFIX \ 2.13 @@ -34,6 +37,8 @@ 2.14 # Rules to gen a SliTaz package suitable for Tazpkg. 2.15 genpkg_rules() 2.16 { 2.17 + mkdir -p $fs/sbin 2.18 # move /usr/sbin/* /sbin to use pnptools *before* mounting /usr 2.19 - cp -a $install/usr/sbin $fs 2.20 + cp -a $install/usr/sbin/pnpdump $fs/sbin 2.21 + ln $fs/sbin/pnpdump $fs/sbin/isapnp 2.22 }