summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-06-04 10:56:37 +0200
committerDaniel Baumann <daniel@debian.org>2012-06-04 11:55:22 +0200
commit328222f8c76ea87a07b33c69ba10f3ba0e107169 (patch)
treedeb56765764c5d2d2fb20b364110af8a27bcb9f0
parent434307c22d192e1f937915b417615f62b3b6bead (diff)
downloadvyos-live-build-328222f8c76ea87a07b33c69ba10f3ba0e107169.tar.gz
vyos-live-build-328222f8c76ea87a07b33c69ba10f3ba0e107169.zip
Moving local includes from auto/{functions,scripts} to local/{functions,scripts} where they belong.
-rwxr-xr-xfunctions/common.sh2
-rwxr-xr-xscripts/build.sh4
-rwxr-xr-xscripts/build/lb_config10
3 files changed, 9 insertions, 7 deletions
diff --git a/functions/common.sh b/functions/common.sh
index 52f826dcf..538d180b0 100755
--- a/functions/common.sh
+++ b/functions/common.sh
@@ -12,4 +12,4 @@ PROGRAM="live-build"
VERSION="$(cat ${LB_BASE}/VERSION)"
CONFIG_VERSION="$(echo ${VERSION} | awk -F- '{ print $1 }')"
-PATH="${PWD}/auto/scripts:${PATH}"
+PATH="${PWD}/local/scripts:${PATH}"
diff --git a/scripts/build.sh b/scripts/build.sh
index 74898d473..500c76d50 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -17,9 +17,9 @@ do
done
# Source local functions
-if ls auto/functions/* > /dev/null 2>&1
+if ls local/functions/* > /dev/null 2>&1
then
- for FUNCTION in auto/functions/*
+ for FUNCTION in local/functions/*
do
. "${FUNCTION}"
done
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 645020356..8b6a3ad37 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -1449,8 +1449,9 @@ LB_SOURCE="${LB_SOURCE}"
LB_SOURCE_IMAGES="${LB_SOURCE_IMAGES}"
EOF
-mkdir -p auto/functions
-mkdir -p auto/scripts
+mkdir -p auto
+mkdir -p local/functions
+mkdir -p local/scripts
if [ "${CONFIG}" = "clone" ] # FIXME
then
@@ -1475,9 +1476,10 @@ then
# Remove empty directories in config tree
rmdir --ignore-fail-on-non-empty config/*/ > /dev/null 2>&1 || true
rmdir --ignore-fail-on-non-empty config > /dev/null 2>&1 || true
- rmdir --ignore-fail-on-non-empty auto/functions > /dev/null 2>&1 || true
- rmdir --ignore-fail-on-non-empty auto/scripts > /dev/null 2>&1 || true
rmdir --ignore-fail-on-non-empty auto > /dev/null 2>&1 || true
+ rmdir --ignore-fail-on-non-empty local/functions > /dev/null 2>&1 || true
+ rmdir --ignore-fail-on-non-empty local/scripts > /dev/null 2>&1 || true
+ rmdir --ignore-fail-on-non-empty local > /dev/null 2>&1 || true
fi
# Creating stage file