[SCM] live-build branch, debian-next, updated. debian/3.0_a8-1-2-g78b95f0
Daniel Baumann
daniel at debian.org
Sun Dec 5 13:06:38 UTC 2010
The following commit has been merged in the debian-next branch:
commit 78b95f094dd8b67d7a98d38c13197a093b8e5282
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Dec 5 14:06:12 2010 +0100
Passing chroot directory explicitly to Apt() in preparation for multi-arch.
diff --git a/functions/wrapper.sh b/functions/wrapper.sh
index 3b8a672..ab14a48 100755
--- a/functions/wrapper.sh
+++ b/functions/wrapper.sh
@@ -10,13 +10,16 @@
Apt ()
{
+ CHROOT="${1}"
+ shift
+
case "${LB_APT}" in
apt|apt-get)
- Chroot chroot apt-get ${APT_OPTIONS} ${@}
+ Chroot ${CHROOT} apt-get ${APT_OPTIONS} ${@}
;;
aptitude)
- Chroot chroot aptitude ${APTITUDE_OPTIONS} ${@}
+ Chroot ${CHROOT} aptitude ${APTITUDE_OPTIONS} ${@}
;;
esac
}
diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks
index 2b7c1d6..d5a7d7f 100755
--- a/scripts/build/lb_chroot_hacks
+++ b/scripts/build/lb_chroot_hacks
@@ -138,7 +138,7 @@ case "${LB_BINARY_IMAGES}" in
net)
if [ ! -f chroot/usr/bin/smbmount ]
then
- Apt install smbfs
+ Apt chroot install smbfs
fi
if [ ! -d chroot/etc/initramfs-tools ]
diff --git a/scripts/build/lb_chroot_sources b/scripts/build/lb_chroot_sources
index 5b77f65..8d6dc76 100755
--- a/scripts/build/lb_chroot_sources
+++ b/scripts/build/lb_chroot_sources
@@ -411,15 +411,15 @@ EOF
Chroot chroot "apt-get ${APT_OPTIONS} install aptitude"
fi
- Apt update
- Apt upgrade
- Apt dist-upgrade
+ Apt chroot update
+ Apt chroot upgrade
+ Apt chroot dist-upgrade
# Installing keyring packages
if [ -n "${LB_KEYRING_PACKAGES}" ]
then
Chroot chroot "apt-get --yes --force-yes install ${LB_KEYRING_PACKAGES}"
- Apt update
+ Apt chroot update
fi
if [ "${LB_CACHE_INDICES}" = "true" ]
@@ -625,7 +625,7 @@ EOF
fi
# Updating indices
- Apt update
+ Apt chroot update
# Cleaning apt package cache
rm -rf chroot/var/cache/apt
--
live-build
More information about the debian-live-changes
mailing list