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

Adding support for including firmware packages automatically within the live system.

This commit is contained in:
Daniel Baumann 2012-04-26 22:27:56 +02:00
parent add95845d9
commit b8bf4da08f
3 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
functions/defaults.sh
View File

@ -1192,10 +1192,12 @@ Set_defaults ()
# Setting firmware option
case "${LB_MODE}" in
progress)
LB_FIRMWARE_CHROOT="${LB_FIRMWARE_CHROOT:-true}"
LB_FIRMWARE_BINARY="${LB_FIRMWARE_BINARY:-true}"
;;
*)
LB_FIRMWARE_CHROOT="${LB_FIRMWARE_CHROOT:-false}"
LB_FIRMWARE_BINARY="${LB_FIRMWARE_BINARY:-false}"
;;
esac

41
scripts/build/lb_chroot_linux-image
View File

@ -53,6 +53,47 @@ then
done
done
if [ "${LB_FIRMWARE_CHROOT}" = "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
echo $(echo ${_PACKAGE} | awk -F/ '{ print $NF }') >> chroot/root/packages.chroot
done
fi
# Creating stage file
Create_stagefile .stage/chroot_linux-image
fi

12
scripts/build/lb_config
View File

@ -136,6 +136,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--source true|false]\n\
\t [-s|--source-images iso|net|tar|hdd]\n\
\t [--firmware-binary true|false]\n\
\t [--firmware-chroot true|false]\n\
\t [--swap-file-path PATH]\n\
\t [--swap-file-size MB]\n\
\t [--syslinux-theme THEME_SUFFIX]\n\
@ -170,7 +171,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:,firmware-binary:,swap-file-path:,swap-file-size:,syslinux-theme:,
net-cow-server:,net-tarball:,firmware-binary:,firmware-chroot:,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:"
@ -754,6 +755,11 @@ Local_arguments ()
shift 2
;;
--firmware-chroot)
LB_FIRMWARE_CHROOT="${2}"
shift 2
;;
--swap-file-path)
LB_SWAP_FILE_PATH="${2}"
shift 2
@ -1403,6 +1409,10 @@ LB_NET_TARBALL="${LB_NET_TARBALL}"
# (Default: ${LB_FIRMWARE_BINARY})
LB_FIRMWARE_BINARY="${LB_FIRMWARE_BINARY}"
# \$LB_FIRMWARE_CHROOT: include firmware packages in debian-installer
# (Default: ${LB_FIRMWARE_CHROOT})
LB_FIRMWARE_CHROOT="${LB_FIRMWARE_CHROOT}"
# \$LB_SWAP_FILE_PATH: set swap file path
# (Default: ${LB_SWAP_FILE_PATH})
LB_SWAP_FILE_PATH="${LB_SWAP_FILE_PATH}"