summaryrefslogtreecommitdiff
path: root/helpers
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 14:05:11 +0200
committerDaniel Baumann <daniel@debian.org>2007-09-23 14:05:11 +0200
commit26961cb572225683e29e03176698447b58b19bc4 (patch)
treea5a6d4d81e004492636733ebf111a3c5f209f3fe /helpers
parentcaeb8b9d72f691833691f193102537fe6c146422 (diff)
downloadvyos-live-build-26961cb572225683e29e03176698447b58b19bc4.tar.gz
vyos-live-build-26961cb572225683e29e03176698447b58b19bc4.zip
Making local udebs/local debs architecture aware.
Diffstat (limited to 'helpers')
-rwxr-xr-xhelpers/lh_binary_debian-installer8
1 files changed, 4 insertions, 4 deletions
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index eeb3ea5ef..7145043d5 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -256,9 +256,9 @@ else
fi
# Including local debs
-if ls ../config/binary_local-debs/* > /dev/null 2>&1
+if ls ../config/binary_local-debs/*.deb > /dev/null 2>&1
then
- for FILE in ../config/binary_local-debs/*.deb
+ for FILE in ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb ../config/binary_local-debs/*_all.deb
do
SOURCE="`dpkg -f ${FILE} Source | awk '{ print $1 }'`"
@@ -325,9 +325,9 @@ mkdir -p ../cache/packages_debian-installer.udeb
cp *.udeb ../cache/packages_debian-installer.udeb
# Including local udebs
-if ls ../config/binary_local-udebs/* > /dev/null 2>&1
+if ls ../config/binary_local-udebs/*.udeb > /dev/null 2>&1
then
- for FILE in ../config/binary_local-udebs/*.udeb
+ for FILE in ../config/binary_local-udebs/*_"${LH_ARCHITECTURE}".udeb ../config/binary_local-udebs/*_all.udeb
do
SOURCE="`dpkg -f ${FILE} Source | awk '{ print $1 }'`"