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>2008-08-14 05:44:21 +0200
commitd22dde7e476aa259abc9e7cde535585b7318ae09 (patch)
tree8b52c41315518ffb1d848615bb2f5810c7ef04eb
parent9ffd1c7c2335f6cbafbbce0493629329090750fb (diff)
downloadvyos-live-build-d22dde7e476aa259abc9e7cde535585b7318ae09.tar.gz
vyos-live-build-d22dde7e476aa259abc9e7cde535585b7318ae09.zip
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. Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
-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 c97adde1e..e8e0ec12e 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 5b668a0d4..df7cffe7c 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 ${*}