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

Address "should check that we're building on debian through e.g. a 'derivative-is-based-on' variable or somesuch" fixme.

This commit is contained in:
jnqnfe 2014-11-24 19:40:30 +00:00 committed by Daniel Baumann
parent 9d5639e9a0
commit 31dbf95d86
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
functions/defaults.sh
View File

@ -127,6 +127,7 @@ Set_defaults ()
progress-linux)
LB_DISTRIBUTION="${LB_DISTRIBUTION:-baureo}"
LB_DERIVATIVE="true"
LB_DERIVATIVE_IS_BASED_ON="debian"
;;
ubuntu)

14
scripts/build/chroot_firmware
View File

@ -69,9 +69,19 @@ done
if echo ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS} | grep -qs "non-free"
then
# FIXME: should check that we're building on debian through e.g. a 'derivative-is-based-on' variable or somesuch.
# Manually add firmware-linux/non-free meta package
FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
if [ "${LB_DERIVATIVE}" != "true" ]
then
FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
else
case "${LB_DERIVATIVE_IS_BASED_ON}" in
debian)
FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
;;
*)
;;
esac
fi
fi
if [ "${LB_DERIVATIVE}" = "true" ]

14
scripts/build/installer_debian-installer
View File

@ -432,9 +432,19 @@ then
if echo ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS} | grep -qs "non-free"
then
# FIXME: should check that we're building on debian through e.g. a 'derivative-is-based-on' variable or somesuch.
# Manually add firmware-linux/non-free meta package
FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
if [ "${LB_DERIVATIVE}" != "true" ]
then
FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
else
case "${LB_DERIVATIVE_IS_BASED_ON}" in
debian)
FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
;;
*)
;;
esac
fi
fi
if [ "${LB_DERIVATIVE}" = "true" ]