Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-06-24 00:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable using ubuntu-server-raspi, clean up handling of raspi setup.

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2021-04-20 11:15:44 +02:00
parent b9eb0aaee3
commit 52f3b69331
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
live-build/auto/config
View File

@ -812,15 +812,18 @@ case $PROJECT in
BINARY_REMOVE_LINUX=false BINARY_REMOVE_LINUX=false
OPTS="${OPTS:+$OPTS }--initramfs=none" OPTS="${OPTS:+$OPTS }--initramfs=none"
case $ARCH in case "$ARCH+${SUBARCH:-}" in
armhf) *+raspi)
add_task install ubuntu-server-raspi
;;
armhf*)
KERNEL_FLAVOURS=generic-lpae KERNEL_FLAVOURS=generic-lpae
add_package install flash-kernel add_package install flash-kernel
;; ;;
arm64) arm64*)
add_package install flash-kernel add_package install flash-kernel
;; ;;
riscv64) riscv64*)
if [ -n "$SUBARCH" ]; then if [ -n "$SUBARCH" ]; then
KERNEL_FLAVOURS=generic KERNEL_FLAVOURS=generic
fi fi
@ -938,18 +941,16 @@ case $PROJECT in
;; ;;
esac esac
case $ARCH in case "$ARCH+${SUBARCH:-}" in
armhf|arm64) arm*+raspi)
KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}" # Common configuration for all Raspberry Pi image variants (server,
case $SUBARCH in # desktop etc.)
raspi) KERNEL_FLAVOURS="$SUBARCH"
# Generic Raspberry Pi images COMPONENTS='main restricted universe multiverse'
COMPONENTS='main restricted universe multiverse' # Most Pi-specific package installation is handled via the seeds in the
add_package install linux-firmware-raspi2 pi-bluetooth u-boot-rpi flash-kernel u-boot-tools wpasupplicant ubuntu-raspi-settings # per-project/subproject cases above
BINARY_REMOVE_LINUX=false add_package install linux-firmware-raspi2 pi-bluetooth u-boot-rpi u-boot-tool
;; BINARY_REMOVE_LINUX=false
esac
;; ;;
esac esac