summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2011-09-07 16:33:53 +0200
committerDaniel Baumann <daniel@debian.org>2011-09-07 16:33:53 +0200
commit039df15831fb6eda461fe329df6a85b056ff66f7 (patch)
tree4e2d988ed32a133aace4406ad54235ed1d9fe411 /scripts
parent7a1350fcc0977c2be0fd47b4cfaf496cf183b5a4 (diff)
downloadvyos-live-build-039df15831fb6eda461fe329df6a85b056ff66f7.tar.gz
vyos-live-build-039df15831fb6eda461fe329df6a85b056ff66f7.zip
Using config/includes.binary rather than config/binary_local-includes.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build/lb_binary_local-includes4
-rwxr-xr-xscripts/build/lb_config2
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/build/lb_binary_local-includes b/scripts/build/lb_binary_local-includes
index 627e683a5..6ec33ac72 100755
--- a/scripts/build/lb_binary_local-includes
+++ b/scripts/build/lb_binary_local-includes
@@ -38,10 +38,10 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if Find_files config/binary_local-includes/
+if Find_files config/includes.binary/
then
# Copying includes
- cd config/binary_local-includes
+ cd config/includes.binary
find . | cpio -dmpu --no-preserve-owner "${OLDPWD}"/binary
cd "${OLDPWD}"
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index a1b2a0e65..45f583bf9 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -1233,7 +1233,7 @@ mkdir -p config/binary_debian-installer
mkdir -p config/binary_debian-installer-includes
mkdir -p config/binary_grub
mkdir -p config/binary_local-debs
-mkdir -p config/binary_local-includes
+mkdir -p config/includes.binary
mkdir -p config/package-lists
mkdir -p config/binary_local-udebs
mkdir -p config/binary_rootfs