# HG changeset patch # User Pascal Bellard # Date 1269168642 -3600 # Node ID db63cccdb8d474f7dc13315b39fcd07a1608d04f # Parent 627d16bb5e3e0cb5ef4dfa923cfd943322845200 gtk+ openvas-scanner pango slitaz-base-files ttf-bitstream-vera xfree86-base-fonts xorg-base-fonts: remove spurrious SELF_INSTALL diff -r 627d16bb5e3e -r db63cccdb8d4 gtk+/receipt --- a/gtk+/receipt Sun Mar 21 11:28:25 2010 +0100 +++ b/gtk+/receipt Sun Mar 21 11:50:42 2010 +0100 @@ -63,16 +63,16 @@ # Pre and post install commands for Tazpkg. post_install() { - local root - root=$1 + local arg echo "Processing post-install commands..." - /usr/bin/gtk-query-immodules-2.0 > $root/etc/gtk-2.0/gtk.immodules - /usr/bin/gdk-pixbuf-query-loaders > $root/etc/gtk-2.0/gdk-pixbuf.loaders + chroot $1/ /usr/bin/gtk-query-immodules-2.0 > $1/etc/gtk-2.0/gtk.immodules + chroot $1/ /usr/bin/gdk-pixbuf-query-loaders > $1/etc/gtk-2.0/gdk-pixbuf.loaders # Force reinstall of clearlooks theme (1.0 compatibilty until # clearlooks are updated) - if [ -d $root/usr/lib/gtk-2.0/2.4.0 ]; then - tazpkg get-install clearlooks --forced - rm -rf $root/usr/lib/gtk-2.0/2.4.0 + if [ -d $1/usr/lib/gtk-2.0/2.4.0 ]; then + arg="--forced" + [ -n "$1" ] && arg="--forced --root=$1/" + tazpkg get-install clearlooks $arg + rm -rf $1/usr/lib/gtk-2.0/2.4.0 fi } -SELF_INSTALL=1 diff -r 627d16bb5e3e -r db63cccdb8d4 openvas-scanner/receipt --- a/openvas-scanner/receipt Sun Mar 21 11:28:25 2010 +0100 +++ b/openvas-scanner/receipt Sun Mar 21 11:50:42 2010 +0100 @@ -36,7 +36,7 @@ post_install() { - [ -s $1/var/lib/openvas/CA/cacert.pem ] || openvas-mkcert < $root/etc/pango/pango.modules + chroot $1/ pango-querymodules > $1/etc/pango/pango.modules } -SELF_INSTALL=1 diff -r 627d16bb5e3e -r db63cccdb8d4 slitaz-base-files/receipt --- a/slitaz-base-files/receipt Sun Mar 21 11:28:25 2010 +0100 +++ b/slitaz-base-files/receipt Sun Mar 21 11:50:42 2010 +0100 @@ -98,11 +98,7 @@ chmod 640 $root/etc/gshadow if ! grep -q audio $root/etc/group; then - if [ -n "$root" ]; then - cp /etc/group $root/etc/group - else - addgroup -g 20 audio - fi + chroot $root/ addgroup -g 20 audio fi # daemons.conf (tftp + dnsd) @@ -117,6 +113,3 @@ echo '' >> $root/etc/daemons.conf fi } - -# We need this package on build host to install it in target directory -SELF_INSTALL=1 diff -r 627d16bb5e3e -r db63cccdb8d4 ttf-bitstream-vera/receipt --- a/ttf-bitstream-vera/receipt Sun Mar 21 11:28:25 2010 +0100 +++ b/ttf-bitstream-vera/receipt Sun Mar 21 11:50:42 2010 +0100 @@ -25,13 +25,5 @@ local root root=$1 echo "Processing post-install commands..." - if [ -n "$root" ]; then - rm -Rf $root/var/cache/fontconfig - cp -a /var/cache/fontconfig $root/var/cache - else - fc-cache - fi + chroot $root/ fc-cache } - -# We need this package on build host to install it in target directory -SELF_INSTALL=1 diff -r 627d16bb5e3e -r db63cccdb8d4 xfree86-base-fonts/receipt --- a/xfree86-base-fonts/receipt Sun Mar 21 11:28:25 2010 +0100 +++ b/xfree86-base-fonts/receipt Sun Mar 21 11:50:42 2010 +0100 @@ -1,4 +1,3 @@ -# SliTaz package receipt. PACKAGE="xfree86-base-fonts" VERSION="4.6.0" @@ -22,13 +21,5 @@ { local root root=$1 - if [ -n "$root" ]; then - rm -Rf $root/var/cache/fontconfig - cp -a /var/cache/fontconfig $root/var/cache - else - fc-cache - fi + chroot $root/ fc-cache } - -# We need this package on build host to install it in target directory -SELF_INSTALL=1 diff -r 627d16bb5e3e -r db63cccdb8d4 xorg-base-fonts/receipt --- a/xorg-base-fonts/receipt Sun Mar 21 11:28:25 2010 +0100 +++ b/xorg-base-fonts/receipt Sun Mar 21 11:50:42 2010 +0100 @@ -21,13 +21,5 @@ { local root root=$1 - if [ -n "$root" ]; then - rm -Rf $root/var/cache/fontconfig - cp -a /var/cache/fontconfig $root/var/cache - else - fc-cache - fi + chroot $root/ fc-cache } - -# We need this package on build host to install it in target directory -SELF_INSTALL=1