# HG changeset patch # User Antoine Bodin # Date 1300298443 -3600 # Node ID de05604eadb9e6152c0a337029c95edd3a09b38e # Parent c9d6a554c1542f42b70ebcd42ceab65d1dc58bc4 cook-toolchain: fix a bug which prevent to cook-toolchain (again) diff -r c9d6a554c154 -r de05604eadb9 chroot-scripts/cook-toolchain --- a/chroot-scripts/cook-toolchain Tue Mar 15 23:07:53 2011 +0100 +++ b/chroot-scripts/cook-toolchain Wed Mar 16 19:00:43 2011 +0100 @@ -126,6 +126,7 @@ mkdir -p /tmp/backup/var/lib/tazpkg sed 's/^AUTO_INSTALL_DEPS="yes"/AUTO_INSTALL_DEPS="no"/' -i \ /etc/slitaz/tazpkg.conf +cp -a /var/lib/tazpkg/* /tmp/backup/var/lib/tazpkg BASE_PKGS="tazpkg tazwok slitaz-base-files libtaz" for i in $BASE_PKGS; do echo N | tazpkg get-install $i --root=/tmp/backup --forced @@ -134,7 +135,6 @@ if [ -d /var/log/slitaz ]; then cp -a /var/log/slitaz/* /tmp/backup/var/log/slitaz fi -cp -a /var/lib/tazpkg/* /tmp/backup/var/lib/tazpkg cp -a /etc/slitaz/* /tmp/backup/etc/slitaz cp -a /tmp/tazpkg.conf /tmp/backup/etc/slitaz cp -a /etc/resolv.conf /tmp/backup/etc @@ -154,7 +154,7 @@ for i in $BASIC_APPS; do ln -s /tools/bin/$i /bin/$i done -BASIC_LIBS="libgcc_s.so libgcc_s.so.1 libstdc++.so libstdc++.so.6" +BASIC_LIBS="libgcc_s.so libgcc_s.so.1 libstdc++.so libstdc++.so.6 ld*.so" for i in $BASIC_LIBS; do ln -sf /tools/lib/$i /usr/lib/$i done @@ -163,6 +163,11 @@ ln -s /tools/bin/gettext.sh /usr/bin ln -s /tools/bin/busybox /bin/sh +# Touch /etc/config.site.tmptoolchain to make tazwok know +# we still cook the toolchain. +# (= non-conventional repositories configuration into chroot). +touch /etc/config.site.tmptoolchain + report end-step # Finally, cook final* version of the toolchain packages.