summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lamb <chris@chris-lamb.co.uk>2008-08-12 06:44:21 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:38 +0100
commit1adae413a4728f1a5432e4c5af99d3e39bc98f60 (patch)
tree9e2d33324e3a1d33aae199f3ed9c5f81a115675e
parent765b7bb72d89617f070287f70fff3291767c6fe0 (diff)
downloadlive-build-1adae413a4728f1a5432e4c5af99d3e39bc98f60.zip
live-build-1adae413a4728f1a5432e4c5af99d3e39bc98f60.tar.gz
Always create stagefile for chroot_install-packages and require it for lh_source
This is required as lh_source will generate an incomplete source tarball if only the bootstrap phase has been completed.
-rwxr-xr-xhelpers/lh_chroot_install-packages5
-rwxr-xr-xhelpers/lh_source2
2 files changed, 5 insertions, 2 deletions
diff --git a/helpers/lh_chroot_install-packages b/helpers/lh_chroot_install-packages
index c97adde..e8e0ec1 100755
--- a/helpers/lh_chroot_install-packages
+++ b/helpers/lh_chroot_install-packages
@@ -64,6 +64,7 @@ then
# Saving cache
Save_cache cache/packages_chroot
- # Creating stage file
- Create_stagefile .stage/chroot_install-packages
fi
+
+# Creating stage file
+Create_stagefile .stage/chroot_install-packages
diff --git a/helpers/lh_source b/helpers/lh_source
index 5b668a0..df7cffe 100755
--- a/helpers/lh_source
+++ b/helpers/lh_source
@@ -28,6 +28,8 @@ Arguments "${@}"
Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
+Require_stagefile .stage/chroot_install-packages
+
# Enabling network in chroot
lh_chroot_hosts install ${*}
lh_chroot_resolv install ${*}