diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-07-19 19:37:26 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-07-19 21:11:59 +0200 |
| commit | 8473b925fd94fdb7bb1ae6309a4ab58d490382c9 (patch) | |
| tree | 94b76a6288395e37619b900f3eea2009a25d9b28 /scripts/build/lb_binary_debian-installer | |
| parent | 6c0ddb7d6d72d15ab2887a4b40de2c5d71f26d3a (diff) | |
| download | vyos-live-build-8473b925fd94fdb7bb1ae6309a4ab58d490382c9.tar.gz vyos-live-build-8473b925fd94fdb7bb1ae6309a4ab58d490382c9.zip | |
Fixing up inclusion of functions while allowing local usage of live-build with different file layouts.
Diffstat (limited to 'scripts/build/lb_binary_debian-installer')
| -rwxr-xr-x | scripts/build/lb_binary_debian-installer | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer index bdf7308ea..c49ec8d0b 100755 --- a/scripts/build/lb_binary_debian-installer +++ b/scripts/build/lb_binary_debian-installer @@ -11,7 +11,7 @@ set -e # Including common functions -. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh +( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh # Setting static variables DESCRIPTION="$(Echo 'install debian-installer into binary')" @@ -671,9 +671,17 @@ then fi # Excluding udebs - grep -v "^#" "${LB_BASE}"/data/debian-cd/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/udeb_exclude > exclude || true - grep -v "^#" "${LB_BASE}"/data/debian-cd/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/exclude-udebs >> exclude || true - grep -v "^#" "${LB_BASE}"/data/debian-cd/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/exclude-udebs-${LB_ARCHITECTURES} >> exclude || true + for LOCATION in "${LIVE_BUILD}/data/debian-cd" /usr/share/live/build/data/debian-cd + do + if [ -e "${LOCATION}" ] + then + grep -v "^#" "${LOCATION}/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/udeb_exclude" > exclude || true + grep -v "^#" "${LOCATION}/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/exclude-udebs" >> exclude || true + grep -v "^#" "${LOCATION}/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/exclude-udebs-${LB_ARCHITECTURES}" >> exclude || true + + continue + fi + done # Local exclude file if [ -e ../config/binary_debian-installer/udeb_exclude ] |