summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 14:05:14 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:22:27 +0100
commite1ed7f2202c14347e2eb334f282e7c1c0409799e (patch)
tree0ae5fba714e5f4b0891cec9ee83a1300ada444d6
parentb88433933b5d437a71f9d34808c8e4abe6f22e29 (diff)
downloadlive-build-e1ed7f2202c14347e2eb334f282e7c1c0409799e.zip
live-build-e1ed7f2202c14347e2eb334f282e7c1c0409799e.tar.gz
Adding local udeb_exclude file functionality.
-rwxr-xr-xhelpers/lh_binary_debian-installer6
-rw-r--r--[-rwxr-xr-x]helpers/lh_config1
2 files changed, 7 insertions, 0 deletions
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 919ea3a..19d084a 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -362,6 +362,12 @@ grep -v "^#" "${LH_BASE}"/data/debian-cd/"${LH_DISTRIBUTION}"/udeb_exclude > exc
grep -v "^#" "${LH_BASE}"/data/debian-cd/"${LH_DISTRIBUTION}"/exclude-udebs >> exclude
grep -v "^#" "${LH_BASE}"/data/debian-cd/"${LH_DISTRIBUTION}"/exclude-udebs-${LH_ARCHITECTURE} >> exclude
+# Local exclude file
+if [ -e ../config/binary_debian-installer/udeb_exclude ]
+then
+ cat ../config/binary_debian-installer/udeb_exclude >> exclude
+fi
+
for EXCLUDE in `cat exclude`
do
rm -f "${EXCLUDE}"_*.udeb
diff --git a/helpers/lh_config b/helpers/lh_config
index 9c9d11b..d80dd9d 100755..100644
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -823,6 +823,7 @@ LH_SYSVINIT="${LH_SYSVINIT}"
EOF
# Creating lh_binary_* configuration
+mkdir -p config/binary_debian-installer
mkdir -p config/binary_grub
mkdir -p config/binary_local-debs
mkdir -p config/binary_local-hooks