summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-07-28 23:29:14 +0200
committerDaniel Baumann <daniel@debian.org>2012-07-28 23:55:22 +0200
commitd360b3dc34c3206ce3fb51439be474f94942b3d3 (patch)
treed2c67b3e6c855d02f1950e7c85f5cbb0fc8c76e1 /scripts
parenta691caa0f2738941075efe00df9af06cb10e98c1 (diff)
downloadvyos-live-build-d360b3dc34c3206ce3fb51439be474f94942b3d3.tar.gz
vyos-live-build-d360b3dc34c3206ce3fb51439be474f94942b3d3.zip
Handling dctrl-tools temporary installation in chroot during package-lists expansion.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build/lb_chroot_package-lists19
1 files changed, 19 insertions, 0 deletions
diff --git a/scripts/build/lb_chroot_package-lists b/scripts/build/lb_chroot_package-lists
index 0237be13a..fbb3bc786 100755
--- a/scripts/build/lb_chroot_package-lists
+++ b/scripts/build/lb_chroot_package-lists
@@ -41,6 +41,15 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
+# Checking depends
+Check_package chroot/usr/bin/grep-aptavail dctrl-tools
+
+# Restoring cache
+Restore_cache cache/packages.chroot
+
+# Installing depends
+Install_package
+
# Handling global package lists
if [ -n "${LB_PACKAGE_LISTS}" ] && [ "${LB_PACKAGE_LISTS}" != "none" ]
then
@@ -74,3 +83,13 @@ then
# Creating stage file
Create_stagefile .build/chroot_package-lists.${_PASS}
fi
+
+# Saving cache
+Save_cache cache/packages.binary
+
+# Removing dctrl-tools again if the user has not installed it
+if ! grep -qs dctrl-tools chroot/root/packages.chroot
+then
+ # Removing depends
+ Remove_package
+fi