diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-12-06 20:45:48 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-12-06 20:47:27 +0100 |
| commit | ca42266824b4b4ccd87243b90867487ba287181b (patch) | |
| tree | b221adfbaa716f7939b257f8b3740cb622f1f8ec | |
| parent | 4804793d9a3e877f7d206f24be28692f3e1ff869 (diff) | |
| download | vyos-live-build-ca42266824b4b4ccd87243b90867487ba287181b.tar.gz vyos-live-build-ca42266824b4b4ccd87243b90867487ba287181b.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.
| -rwxr-xr-x | scripts/build/binary_debian-installer | 4 | ||||
| -rwxr-xr-x | scripts/build/chroot_linux-image | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/build/binary_debian-installer b/scripts/build/binary_debian-installer index 6c597da0f..7b49c83ec 100755 --- a/scripts/build/binary_debian-installer +++ b/scripts/build/binary_debian-installer @@ -419,7 +419,7 @@ then FIRMWARE_PACKAGES="" - if [ "${LB_PARENT_DISTRIBUTION}" = "squeeze" ] || [ "${LB_MODE}" = "ubuntu" ] || [ "${LB_MODE}" = "kubuntu" ] + if [ "${LB_PARENT_DISTRIBUTION}" = "squeeze" ] then _CONTENTS="${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/Contents-${LB_ARCHITECTURES}.gz" else @@ -446,7 +446,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 [ "${_PARENT_DISTRIBUTION}" = "squeeze" ] || [ "${LB_MODE}" = "ubuntu" ] || [ "${LB_MODE}" = "kubuntu" ] + if [ "${_PARENT_DISTRIBUTION}" = "squeeze" ] then _CONTENTS="${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/Contents-${LB_ARCHITECTURES}.gz" else diff --git a/scripts/build/chroot_linux-image b/scripts/build/chroot_linux-image index 88244b69d..7e6461c96 100755 --- a/scripts/build/chroot_linux-image +++ b/scripts/build/chroot_linux-image @@ -63,7 +63,7 @@ then FIRMWARE_PACKAGES="" - if [ "${LB_PARENT_DISTRIBUTION}" = "squeeze" ] || [ "${LB_MODE}" = "ubuntu" ] || [ "${LB_MODE}" = "kubuntu" ] + if [ "${LB_PARENT_DISTRIBUTION}" = "squeeze" ] then _CONTENTS="${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/Contents-${LB_ARCHITECTURES}.gz" else @@ -90,7 +90,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 [ "${_PARENT_DISTRIBUTION}" = "squeeze" ] || [ "${LB_MODE}" = "ubuntu" ] || [ "${LB_MODE}" = "kubuntu" ] + if [ "${_PARENT_DISTRIBUTION}" = "squeeze" ] then _CONTENTS="${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/Contents-${LB_ARCHITECTURES}.gz" else |