summaryrefslogtreecommitdiff
path: root/helpers/lh_chroot_local-packages
diff options
context:
space:
mode:
authorChris Lamb <chris@chris-lamb.co.uk>2008-04-17 04:13:49 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:32 +0100
commit36cc525945f8726662dbb35395a24064cee0098f (patch)
tree0fa56a1d775b64c68bbfed441499872f4463870f /helpers/lh_chroot_local-packages
parentae785955db43a135455b50b98807a26b9fb8805a (diff)
downloadlive-build-36cc525945f8726662dbb35395a24064cee0098f.zip
live-build-36cc525945f8726662dbb35395a24064cee0098f.tar.gz
Install most chroot packages in one ${LH_APT} call (Closes: #475739)
This patch installs (almost) all chroot packages by queueing the package names into a single file and then installing that. It depends on my previous patch to install local packages by using an APT mirror. This speeds up image build causes even greater speedups once more packages adopt triggers. (Packages installed by debconf preseeding are not touched, nor are packages installed by tasks.)
Diffstat (limited to 'helpers/lh_chroot_local-packages')
-rwxr-xr-xhelpers/lh_chroot_local-packages15
1 files changed, 5 insertions, 10 deletions
diff --git a/helpers/lh_chroot_local-packages b/helpers/lh_chroot_local-packages
index 15ce988..5b5800f 100755
--- a/helpers/lh_chroot_local-packages
+++ b/helpers/lh_chroot_local-packages
@@ -1,6 +1,6 @@
#!/bin/sh
-# lh_chroot_local-packages(1) - install local packages into chroot
+# lh_chroot_local-packages(1) - queue install of local packages into chroot
# Copyright (C) 2006-2008 Daniel Baumann <daniel@debian.org>
#
# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
@@ -18,7 +18,7 @@ do
done
# Setting static variables
-DESCRIPTION="install local packages into chroot"
+DESCRIPTION="queue install of local packages into chroot"
HELP=""
USAGE="${PROGRAM} [--force]"
@@ -28,7 +28,7 @@ Arguments "${@}"
Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-Echo_message "Begin installing local packages..."
+Echo_message "Begin queueing installation of local packages..."
# Requiring stage file
Require_stagefile .stage/bootstrap
@@ -44,13 +44,8 @@ Create_lockfile .lock
if ls chroot/root/local-packages/*.deb > /dev/null 2>&1
then
- # Restoring cache
- Restore_cache cache/packages_local-packages
-
- Apt install $(gunzip < chroot/root/local-packages/Packages.gz | awk '/^Package: / { print $2 }')
-
- # Saving cache
- Save_cache cache/packages_local-packages
+ gunzip < chroot/root/local-packages/Packages.gz | awk '/^Package: / { print $2 }' \
+ >> chroot/root/chroot_packages
# Creating stage file
Create_stagefile .stage/chroot_local-packages