Commit 31dbf95d authored by Lyndon Brown's avatar Lyndon Brown Committed by Daniel Baumann
Browse files

Address "should check that we're building on debian through e.g. a...

Address "should check that we're building on debian through e.g. a 'derivative-is-based-on' variable or somesuch" fixme.
parent 9d5639e9
......@@ -127,6 +127,7 @@ Set_defaults ()
progress-linux)
LB_DISTRIBUTION="${LB_DISTRIBUTION:-baureo}"
LB_DERIVATIVE="true"
LB_DERIVATIVE_IS_BASED_ON="debian"
;;
ubuntu)
......
......@@ -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" ]
......
......@@ -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" ]
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment