wok-6.x rev 5124
gtk+ openvas-scanner pango slitaz-base-files ttf-bitstream-vera xfree86-base-fonts xorg-base-fonts: remove spurrious SELF_INSTALL
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Sun Mar 21 11:50:42 2010 +0100 (2010-03-21) |
| parents | 627d16bb5e3e |
| children | c656dd6befc1 |
| files | gtk+/receipt openvas-scanner/receipt pango/receipt slitaz-base-files/receipt ttf-bitstream-vera/receipt xfree86-base-fonts/receipt xorg-base-fonts/receipt |
line diff
1.1 --- a/gtk+/receipt Sun Mar 21 11:28:25 2010 +0100 1.2 +++ b/gtk+/receipt Sun Mar 21 11:50:42 2010 +0100 1.3 @@ -63,16 +63,16 @@ 1.4 # Pre and post install commands for Tazpkg. 1.5 post_install() 1.6 { 1.7 - local root 1.8 - root=$1 1.9 + local arg 1.10 echo "Processing post-install commands..." 1.11 - /usr/bin/gtk-query-immodules-2.0 > $root/etc/gtk-2.0/gtk.immodules 1.12 - /usr/bin/gdk-pixbuf-query-loaders > $root/etc/gtk-2.0/gdk-pixbuf.loaders 1.13 + chroot $1/ /usr/bin/gtk-query-immodules-2.0 > $1/etc/gtk-2.0/gtk.immodules 1.14 + chroot $1/ /usr/bin/gdk-pixbuf-query-loaders > $1/etc/gtk-2.0/gdk-pixbuf.loaders 1.15 # Force reinstall of clearlooks theme (1.0 compatibilty until 1.16 # clearlooks are updated) 1.17 - if [ -d $root/usr/lib/gtk-2.0/2.4.0 ]; then 1.18 - tazpkg get-install clearlooks --forced 1.19 - rm -rf $root/usr/lib/gtk-2.0/2.4.0 1.20 + if [ -d $1/usr/lib/gtk-2.0/2.4.0 ]; then 1.21 + arg="--forced" 1.22 + [ -n "$1" ] && arg="--forced --root=$1/" 1.23 + tazpkg get-install clearlooks $arg 1.24 + rm -rf $1/usr/lib/gtk-2.0/2.4.0 1.25 fi 1.26 } 1.27 -SELF_INSTALL=1
2.1 --- a/openvas-scanner/receipt Sun Mar 21 11:28:25 2010 +0100 2.2 +++ b/openvas-scanner/receipt Sun Mar 21 11:50:42 2010 +0100 2.3 @@ -36,7 +36,7 @@ 2.4 2.5 post_install() 2.6 { 2.7 - [ -s $1/var/lib/openvas/CA/cacert.pem ] || openvas-mkcert <<EOT 2.8 + [ -s $1/var/lib/openvas/CA/cacert.pem ] || chroot $1/ openvas-mkcert <<EOT 2.9 2.10 2.11 $(. /etc/locale.conf ; echo ${LANG#*_}) 2.12 @@ -46,5 +46,3 @@ 2.13 2.14 EOT 2.15 } 2.16 - 2.17 -SELF_INSTALL=1
3.1 --- a/pango/receipt Sun Mar 21 11:28:25 2010 +0100 3.2 +++ b/pango/receipt Sun Mar 21 11:50:42 2010 +0100 3.3 @@ -41,10 +41,7 @@ 3.4 # Pre and post install commands for Tazpkg. 3.5 post_install() 3.6 { 3.7 - local root 3.8 - root=$1 3.9 echo "Processing post-install commands..." 3.10 # Rebuils pango.modules when installed. 3.11 - pango-querymodules > $root/etc/pango/pango.modules 3.12 + chroot $1/ pango-querymodules > $1/etc/pango/pango.modules 3.13 } 3.14 -SELF_INSTALL=1
4.1 --- a/slitaz-base-files/receipt Sun Mar 21 11:28:25 2010 +0100 4.2 +++ b/slitaz-base-files/receipt Sun Mar 21 11:50:42 2010 +0100 4.3 @@ -98,11 +98,7 @@ 4.4 chmod 640 $root/etc/gshadow 4.5 4.6 if ! grep -q audio $root/etc/group; then 4.7 - if [ -n "$root" ]; then 4.8 - cp /etc/group $root/etc/group 4.9 - else 4.10 - addgroup -g 20 audio 4.11 - fi 4.12 + chroot $root/ addgroup -g 20 audio 4.13 fi 4.14 4.15 # daemons.conf (tftp + dnsd) 4.16 @@ -117,6 +113,3 @@ 4.17 echo '' >> $root/etc/daemons.conf 4.18 fi 4.19 } 4.20 - 4.21 -# We need this package on build host to install it in target directory 4.22 -SELF_INSTALL=1
5.1 --- a/ttf-bitstream-vera/receipt Sun Mar 21 11:28:25 2010 +0100 5.2 +++ b/ttf-bitstream-vera/receipt Sun Mar 21 11:50:42 2010 +0100 5.3 @@ -25,13 +25,5 @@ 5.4 local root 5.5 root=$1 5.6 echo "Processing post-install commands..." 5.7 - if [ -n "$root" ]; then 5.8 - rm -Rf $root/var/cache/fontconfig 5.9 - cp -a /var/cache/fontconfig $root/var/cache 5.10 - else 5.11 - fc-cache 5.12 - fi 5.13 + chroot $root/ fc-cache 5.14 } 5.15 - 5.16 -# We need this package on build host to install it in target directory 5.17 -SELF_INSTALL=1
6.1 --- a/xfree86-base-fonts/receipt Sun Mar 21 11:28:25 2010 +0100 6.2 +++ b/xfree86-base-fonts/receipt Sun Mar 21 11:50:42 2010 +0100 6.3 @@ -1,4 +1,3 @@ 6.4 -# SliTaz package receipt. 6.5 6.6 PACKAGE="xfree86-base-fonts" 6.7 VERSION="4.6.0" 6.8 @@ -22,13 +21,5 @@ 6.9 { 6.10 local root 6.11 root=$1 6.12 - if [ -n "$root" ]; then 6.13 - rm -Rf $root/var/cache/fontconfig 6.14 - cp -a /var/cache/fontconfig $root/var/cache 6.15 - else 6.16 - fc-cache 6.17 - fi 6.18 + chroot $root/ fc-cache 6.19 } 6.20 - 6.21 -# We need this package on build host to install it in target directory 6.22 -SELF_INSTALL=1
7.1 --- a/xorg-base-fonts/receipt Sun Mar 21 11:28:25 2010 +0100 7.2 +++ b/xorg-base-fonts/receipt Sun Mar 21 11:50:42 2010 +0100 7.3 @@ -21,13 +21,5 @@ 7.4 { 7.5 local root 7.6 root=$1 7.7 - if [ -n "$root" ]; then 7.8 - rm -Rf $root/var/cache/fontconfig 7.9 - cp -a /var/cache/fontconfig $root/var/cache 7.10 - else 7.11 - fc-cache 7.12 - fi 7.13 + chroot $root/ fc-cache 7.14 } 7.15 - 7.16 -# We need this package on build host to install it in target directory 7.17 -SELF_INSTALL=1