Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-03-04 07:51:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'raspi-server-seed' of git+ssh://git.launchpad.net/livecd-rootfs into ubuntu/master

Browse Source
This commit is contained in:
Dimitri John Ledkov 2021-05-05 12:01:37 +01:00
commit f58b0693f6
No known key found for this signature in database
GPG Key ID: 9B8EC849D5EF70ED
2 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/changelog vendored
View File

@ -12,6 +12,11 @@ livecd-rootfs (2.721) UNRELEASED; urgency=medium
[ Michael Hudson-Doyle ]
* remove the workaround for bug #1893818
[ Łukasz 'sil2100' Zemczak ]
* Start using the ubuntu-server-raspi seeds for preinstalled raspi server
images, similarly to how it's done for desktop-preinstalled images.
* Drop the unused imx6 support.
-- Dimitri John Ledkov <xnox@ubuntu.com> Wed, 05 May 2021 11:42:27 +0100
livecd-rootfs (2.720) impish; urgency=medium

43
live-build/auto/config
View File

@ -281,7 +281,7 @@ if [ -z "${IMAGEFORMAT:-}" ]; then
case $PROJECT:${SUBPROJECT:-} in
ubuntu-cpc:*|ubuntu:desktop-preinstalled)
case $SUBARCH in
raspi|imx6)
raspi)
IMAGEFORMAT=ubuntu-image
;;
*)
@ -352,8 +352,6 @@ case $IMAGEFORMAT in
MODEL=pi3-arm64 ;;
armhf+cm3)
MODEL=cm3 ;;
armhf+imx6)
MODEL=nitrogen6x ;;
*)
echo "Model $ARCH+${SUBARCH:-} unknown to livecd-rootfs" >&2
exit 1
@ -831,12 +829,15 @@ case $PROJECT in
BINARY_REMOVE_LINUX=false
OPTS="${OPTS:+$OPTS }--initramfs=none"
case $ARCH in
armhf)
case "$ARCH+${SUBARCH:-}" in
*+raspi)
add_task install ubuntu-server-raspi
;;
armhf*)
KERNEL_FLAVOURS=generic-lpae
add_package install flash-kernel
;;
arm64)
arm64*)
add_package install flash-kernel
if [ "${SUBARCH:-}" = "generic" ]; then
KERNEL_FLAVOURS=generic
@ -847,7 +848,7 @@ case $PROJECT in
KERNEL_FLAVOURS=generic
fi
;;
riscv64)
riscv64*)
if [ -n "$SUBARCH" ]; then
KERNEL_FLAVOURS=generic
fi
@ -965,24 +966,16 @@ case $PROJECT in
;;
esac
case $ARCH in
armhf|arm64)
KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}"
case $SUBARCH in
raspi)
# Generic Raspberry Pi images
COMPONENTS='main restricted universe multiverse'
add_package install linux-firmware-raspi2 pi-bluetooth u-boot-rpi flash-kernel u-boot-tools wpasupplicant ubuntu-raspi-settings
BINARY_REMOVE_LINUX=false
;;
imx6)
COMPONENTS='main restricted universe multiverse'
KERNEL_FLAVOURS=generic
add_package install flash-kernel u-boot-tools wpasupplicant
BINARY_REMOVE_LINUX=false
;;
esac
case "$ARCH+${SUBARCH:-}" in
arm*+raspi)
# Common configuration for all Raspberry Pi image variants (server,
# desktop etc.)
KERNEL_FLAVOURS="$SUBARCH"
COMPONENTS='main restricted universe multiverse'
# Most Pi-specific package installation is handled via the seeds in the
# per-project/subproject cases above
add_package install linux-firmware-raspi2 pi-bluetooth u-boot-rpi u-boot-tool
BINARY_REMOVE_LINUX=false
;;
esac