Dropping ubuntu guards on firmware selection code, we're not enabling firmware inclus...
authorDaniel Baumann <daniel@debian.org>
Thu, 6 Dec 2012 19:45:48 +0000 (20:45 +0100)
committerDaniel Baumann <daniel@debian.org>
Thu, 6 Dec 2012 19:47:27 +0000 (20:47 +0100)
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.

scripts/build/binary_debian-installer
scripts/build/chroot_linux-image

index 6c597da..7b49c83 100755 (executable)
@@ -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
index 88244b6..7e6461c 100755 (executable)
@@ -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