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

Adding support for including firmware packages automatically within debian-installer.

This commit is contained in:
Daniel Baumann 2012-04-26 19:52:15 +02:00
parent d2be2946db
commit bbd9c284e4
3 changed files with 66 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
functions/defaults.sh
View File

@ -1189,6 +1189,17 @@ Set_defaults ()
;;
esac
# Setting firmware option
case "${LB_MODE}" in
progress)
LB_FIRMWARE_BINARY="${LB_FIRMWARE_BINARY:-true}"
;;
*)
LB_FIRMWARE_BINARY="${LB_FIRMWARE_BINARY:-false}"
;;
esac
# Setting swap file
LB_SWAP_FILE_SIZE="${LB_SWAP_FILE_SIZE:-512}"

46
scripts/build/lb_binary_debian-installer
View File

@ -397,6 +397,48 @@ then
;;
esac
# Include firmware packages
if [ "${LB_FIRMWARE_BINARY}" = "true" ]
then
# Assumption: firmware packages install files into /lib/firmware
# Get all firmware packages names
FIRMWARE_PACKAGES="$(wget ${WGET_OPTIONS} ${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/Contents-${LB_ARCHITECTURES}.gz -O - | gunzip -c | awk '/^lib\/firmware/ { print $2 }' | sort -u)"
if [ "${LB_DERIVATIVE}" = "true" ]
then
FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(wget ${WGET_OPTIONS} ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/Contents-${LB_ARCHITECTURES}.gz -O - | gunzip -c | awk '/^lib\/firmware/ { print $2 }' | sort -u)"
fi
# Filter out contrib packages if contrib is not enabled
if ! echo ${LB_ARCHIVE_AREAS} | grep -qs contrib
then
for _PACKAGE in ${FIRMWARE_PACKAGES}
do
_FIRMWARE_PACKAGES="${_FIRMWARE_PACKAGES} $(echo ${_PACKAGE} | grep -v '^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
for _PACKAGE in ${FIRMWARE_PACKAGES}
do
_FIRMWARE_PACKAGES="${_FIRMWARE_PACKAGES} $(echo ${_PACKAGE} | grep -v '^non-free/')"
done
FIRMWARE_PACKAGES="${_FIRMWARE_PACKAGES}"
fi
# Drop section and keep package names only
for _PACKAGE in ${FIRMWARE_PACKAGES}
do
DI_FIRMWARE_PACKAGES="${DI_FIRMWARE_PACKAGES} $(echo ${_PACKAGE} | awk -F/ '{ print $NF }')"
done
fi
# Set apt command prefix
_LB_APT_COMMAND="apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb -o APT::Install-Recommends=false --download-only"
@ -429,10 +471,10 @@ then
# Download .debs of the required packages
Chroot chroot ${_LB_APT_COMMAND} install ${DI_REQ_PACKAGES}
Chroot chroot ${_LB_APT_COMMAND} install ${DI_PACKAGES}
Chroot chroot ${_LB_APT_COMMAND} install ${DI_PACKAGES} ${DI_FIRMWARE_PACKAGES}
else
# Download .debs of the required packages
Chroot chroot ${_LB_APT_COMMAND} install ${DI_PACKAGES}
Chroot chroot ${_LB_APT_COMMAND} install ${DI_PACKAGES} ${DI_FIRMWARE_PACKAGES}
# Revert dpkg status file
mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status

12
scripts/build/lb_config
View File

@ -135,6 +135,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--security true|false]\n\
\t [--source true|false]\n\
\t [-s|--source-images iso|net|tar|hdd]\n\
\t [--firmware-binary true|false]\n\
\t [--swap-file-path PATH]\n\
\t [--swap-file-size MB]\n\
\t [--syslinux-theme THEME_SUFFIX]\n\
@ -169,7 +170,7 @@ Local_arguments ()
grub-splash:,isohybrid-options:,hdd-label:,hdd-size:,iso-application:,iso-preparer:,iso-publisher:,
iso-volume:,jffs2-eraseblock:,memtest:,net-root-filesystem:,net-root-mountoptions:,
net-root-path:,net-root-server:,net-cow-filesystem:,net-cow-mountoptions:,net-cow-path:,
net-cow-server:,net-tarball:,swap-file-path:,swap-file-size:,syslinux-theme:,
net-cow-server:,net-tarball:,firmware-binary:,swap-file-path:,swap-file-size:,syslinux-theme:,
win32-loader:,source:,source-images:,breakpoints,conffile:,debug,force,
help,ignore-system-defaults,quiet,usage,verbose,version,bootstrap-qemu-static:,bootstrap-qemu-arch:,
bootstrap-qemu-exclude:"
@ -748,6 +749,11 @@ Local_arguments ()
shift 2
;;
--firmware-binary)
LB_FIRMWARE_BINARY="${2}"
shift 2
;;
--swap-file-path)
LB_SWAP_FILE_PATH="${2}"
shift 2
@ -1393,6 +1399,10 @@ LB_NET_COW_SERVER="${LB_NET_COW_SERVER}"
# (Default: ${LB_NET_TARBALL})
LB_NET_TARBALL="${LB_NET_TARBALL}"
# \$LB_FIRMWARE_BINARY: include firmware packages in debian-installer
# (Default: ${LB_FIRMWARE_BINARY})
LB_FIRMWARE_BINARY="${LB_FIRMWARE_BINARY}"
# \$LB_SWAP_FILE_PATH: set swap file path
# (Default: ${LB_SWAP_FILE_PATH})
LB_SWAP_FILE_PATH="${LB_SWAP_FILE_PATH}"