diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 14:05:11 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:22:26 +0100 |
| commit | d68b95dfb379d4eeeb1d383bccc1610de608a9f8 (patch) | |
| tree | a5a6d4d81e004492636733ebf111a3c5f209f3fe /helpers | |
| parent | d225892ace01230c9a63914e455f5ced82a4d421 (diff) | |
| download | live-build-d68b95dfb379d4eeeb1d383bccc1610de608a9f8.zip live-build-d68b95dfb379d4eeeb1d383bccc1610de608a9f8.tar.gz | |
Making local udebs/local debs architecture aware.
Diffstat (limited to 'helpers')
| -rwxr-xr-x | helpers/lh_binary_debian-installer | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index eeb3ea5..7145043 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 }'`" |