wok-6.x rev 16806
busybox/dpkg_deb: add xz support
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Wed Jul 09 11:25:23 2014 +0200 (2014-07-09) |
parents | 497a94b577b4 |
children | 34b9552c3539 |
files | apache/receipt busybox/receipt busybox/stuff/busybox-1.22-dpkg_deb-xz.u |
line diff
1.1 --- a/apache/receipt Sun Jul 06 10:56:03 2014 +0200 1.2 +++ b/apache/receipt Wed Jul 09 11:25:23 2014 +0200 1.3 @@ -78,7 +78,7 @@ 1.4 # Just in case. 1.5 chown www.www $1/var/log/$PACKAGE 1.6 ping -c 2 $(hostname) > /dev/null 2>&1 || 1.7 - sed -i "s/localhost/$(hostname) localhost/" /etc/hosts 1.8 + sed -i "s/localhost/$(hostname) localhost/" $1/etc/hosts 1.9 [ -s $1/etc/ssl/apache/apache.pem ] || 1.10 openssl req -new -x509 -keyout $1/etc/ssl/apache/apache.pem \ 1.11 -out $1/etc/ssl/apache/apache.pem -days 3650 -nodes <<EOT 1.12 @@ -97,6 +97,7 @@ 1.13 echo "Reconfiguring $pkg for $PACKAGE..." 1.14 tazpkg reconfigure $pkg 1.15 done 1.16 + [ -f $1/etc/php.ini ] && tazpkg get-install php-apache --root=$1 1.17 if [ -z "$1" ]; then 1.18 for i in lighttpd ; do 1.19 [ -f /etc/init.d/$i ] && /etc/init.d/$i stop
2.1 --- a/busybox/receipt Sun Jul 06 10:56:03 2014 +0200 2.2 +++ b/busybox/receipt Wed Jul 09 11:25:23 2014 +0200 2.3 @@ -44,6 +44,7 @@ 2.4 diet.u 2.5 losetup.u 2.6 fatattr.u 2.7 +dpkg_deb-xz.u 2.8 EOT 2.9 cp $stuff/$PACKAGE-${VERSION%.*}.config .config 2.10 }
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/busybox/stuff/busybox-1.22-dpkg_deb-xz.u Wed Jul 09 11:25:23 2014 +0200 3.3 @@ -0,0 +1,13 @@ 3.4 +--- busybox-1.22.0/archival/dpkg_deb.c 3.5 ++++ busybox-1.22.0/archival/dpkg_deb.c 3.6 +@@ -82,6 +82,10 @@ 3.7 + llist_add_to(&ar_archive->accept, (char*)"data.tar.lzma"); 3.8 + llist_add_to(&control_tar_llist, (char*)"control.tar.lzma"); 3.9 + #endif 3.10 ++#if ENABLE_FEATURE_SEAMLESS_XZ 3.11 ++ llist_add_to(&ar_archive->accept, (char*)"data.tar.xz"); 3.12 ++ llist_add_to(&control_tar_llist, (char*)"control.tar.xz"); 3.13 ++#endif 3.14 + 3.15 + opt_complementary = "c--efXx:e--cfXx:f--ceXx:X--cefx:x--cefX"; 3.16 + opt = getopt32(argv, "cefXx");