summaryrefslogtreecommitdiff
path: root/scripts/build/binary_debian-installer
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-12-06 20:45:48 +0100
committerDaniel Baumann <mail@daniel-baumann.ch>2013-05-06 14:50:01 +0200
commit82a5279e14b1014c68eefe5801f0553315da35ad (patch)
tree76e72adb1a442d3a56386fe841bb77a39fb13fea /scripts/build/binary_debian-installer
parentd10aa0375ea71d561b008d017d9c1ec7adb834c0 (diff)
downloadvyos-live-build-82a5279e14b1014c68eefe5801f0553315da35ad.tar.gz
vyos-live-build-82a5279e14b1014c68eefe5801f0553315da35ad.zip
Dropping ubuntu guards on firmware selection code, we're not enabling firmware inclusion in ubuntu mode anyway.
Also, we're not keeping this as ubuntu should just update their archive structure for content files to match debian. Not worth keeping temporary extra turns just for ubuntu.
Diffstat (limited to 'scripts/build/binary_debian-installer')
-rwxr-xr-xscripts/build/binary_debian-installer14
1 files changed, 2 insertions, 12 deletions
diff --git a/scripts/build/binary_debian-installer b/scripts/build/binary_debian-installer
index 3262d902f..f5c9e12c1 100755
--- a/scripts/build/binary_debian-installer
+++ b/scripts/build/binary_debian-installer
@@ -419,12 +419,7 @@ then
FIRMWARE_PACKAGES=""
- if [ "${LB_MODE}" = "ubuntu" ] || [ "${LB_MODE}" = "kubuntu" ]
- then
- _CONTENTS="${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/Contents-${LB_ARCHITECTURES}.gz"
- else
- _CONTENTS="$(for _PARENT_ARCHIVE_AREA in ${LB_PARENT_ARCHIVE_AREAS}; do echo ${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/${_PARENT_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)"
- fi
+ _CONTENTS="$(for _PARENT_ARCHIVE_AREA in ${LB_PARENT_ARCHIVE_AREAS}; do echo ${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/${_PARENT_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)"
rm -f cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES}
@@ -446,12 +441,7 @@ then
then
# FIXME: account for the fact that PARENT_DISTRIBUTION and DISTRIBUTION might be the same (to not have overlapping cache files for contents).
- if [ "${LB_MODE}" = "ubuntu" ] || [ "${LB_MODE}" = "kubuntu" ]
- then
- _CONTENTS="${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/Contents-${LB_ARCHITECTURES}.gz"
- else
- _CONTENTS="$(for _ARCHIVE_AREA in ${LB_ARCHIVE_AREAS}; do echo ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)"
- fi
+ _CONTENTS="$(for _ARCHIVE_AREA in ${LB_ARCHIVE_AREAS}; do echo ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)"
rm -f cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES}