diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-12-06 20:59:35 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-12-06 20:59:35 +0100 |
| commit | b46eefce941d38c6f9bf445c6b1df782acdcd1bc (patch) | |
| tree | 50e616a916536c1eeb830302321c0143b1a65a17 | |
| parent | ca42266824b4b4ccd87243b90867487ba287181b (diff) | |
| download | vyos-live-build-b46eefce941d38c6f9bf445c6b1df782acdcd1bc.tar.gz vyos-live-build-b46eefce941d38c6f9bf445c6b1df782acdcd1bc.zip | |
Adding back legacy filtering for firmware packages on squeeze when contrib or non-free is not enabled.
| -rwxr-xr-x | scripts/build/binary_debian-installer | 29 | ||||
| -rwxr-xr-x | scripts/build/chroot_linux-image | 29 |
2 files changed, 58 insertions, 0 deletions
diff --git a/scripts/build/binary_debian-installer b/scripts/build/binary_debian-installer index 7b49c83ec..c72122f88 100755 --- a/scripts/build/binary_debian-installer +++ b/scripts/build/binary_debian-installer @@ -463,6 +463,35 @@ then done fi + if [ "${LB_PARENT_DISTRIBUTION}" = "squeeze" ] + then + # Filter out contrib packages if contrib is not enabled + if ! echo ${LB_ARCHIVE_AREAS} | grep -qs contrib + then + _FIRMWARE_PACKAGES="" + + for _PACKAGE in ${FIRMWARE_PACKAGES} + do + _FIRMWARE_PACKAGES="${_FIRMWARE_PACKAGES} $(echo ${_PACKAGE} | sed -e 's|^contrib/.*$||')" + done + + FIRMWARE_PACKAGES="${_FIRMWARE_PACKAGES}" + fi + + # Filter out non-free packages if non-free is not enabled + if ! echo ${LB_ARCHIVE_AREAS} | grep -qs non-free + then + _FIRMWARE_PACKAGES="" + + for _PACKAGE in ${FIRMWARE_PACKAGES} + do + _FIRMWARE_PACKAGES="${_FIRMWARE_PACKAGES} $(echo ${_PACKAGE} | sed -e 's|^non-free/.*$||')" + done + + FIRMWARE_PACKAGES="${_FIRMWARE_PACKAGES}" + fi + fi + # Drop section and keep package names only for _PACKAGE in ${FIRMWARE_PACKAGES} do diff --git a/scripts/build/chroot_linux-image b/scripts/build/chroot_linux-image index 7e6461c96..10b3fd928 100755 --- a/scripts/build/chroot_linux-image +++ b/scripts/build/chroot_linux-image @@ -107,6 +107,35 @@ then done fi + if [ "${LB_PARENT_DISTRIBUTION}" = "squeeze" ] + then + # Filter out contrib packages if contrib is not enabled + if ! echo ${LB_ARCHIVE_AREAS} | grep -qs contrib + then + _FIRMWARE_PACKAGES="" + + for _PACKAGE in ${FIRMWARE_PACKAGES} + do + _FIRMWARE_PACKAGES="${_FIRMWARE_PACKAGES} $(echo ${_PACKAGE} | sed -e 's|^contrib/.*$||')" + done + + FIRMWARE_PACKAGES="${_FIRMWARE_PACKAGES}" + fi + + # Filter out non-free packages if non-free is not enabled + if ! echo ${LB_ARCHIVE_AREAS} | grep -qs non-free + then + _FIRMWARE_PACKAGES="" + + for _PACKAGE in ${FIRMWARE_PACKAGES} + do + _FIRMWARE_PACKAGES="${_FIRMWARE_PACKAGES} $(echo ${_PACKAGE} | sed -e 's|^non-free/.*$||')" + done + + FIRMWARE_PACKAGES="${_FIRMWARE_PACKAGES}" + fi + fi + # Drop section and keep package names only for _PACKAGE in ${FIRMWARE_PACKAGES} do |