manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding back legacy filtering for firmware packages on squeeze when contrib or non-free is not enabled.

This commit is contained in:
Daniel Baumann 2012-12-06 20:59:35 +01:00
parent ca42266824
commit b46eefce94
2 changed files with 58 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
scripts/build/binary_debian-installer
View File

@ -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

29
scripts/build/chroot_linux-image
View File

@ -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