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

Merge latest prerequisite branch.

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2018-10-31 12:51:59 +01:00
commit 37f3cb1714
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
live-build/auto/build
View File

@ -587,7 +587,7 @@ case $PROJECT:${SUBPROJECT:-} in
if [ "$PROJECT:$SUBPROJECT" = "ubuntu-core:system-image" ]; then if [ "$PROJECT:$SUBPROJECT" = "ubuntu-core:system-image" ]; then
case $ARCH in case $ARCH in
armhf) armhf)
subarches="generic raspi2 raspi3" subarches="generic raspi2"
;; ;;
arm64) arm64)
subarches="generic dragonboard" subarches="generic dragonboard"
@ -623,9 +623,7 @@ case $PROJECT:${SUBPROJECT:-} in
fi fi
;; ;;
armhf) armhf)
if [ "$devarch" = "raspi2" ]; then if [ "$devarch" = "raspi2" ] || [ "$devarch" = "raspi3" ]; then
linux_package="linux-image-raspi2"
elif [ "$devarch" = "raspi3" ]; then
linux_package="linux-image-raspi2" linux_package="linux-image-raspi2"
fi fi
;; ;;
@ -871,13 +869,13 @@ done
NUMFLAVOURS="$(set -- $LB_LINUX_FLAVOURS; echo $#)" NUMFLAVOURS="$(set -- $LB_LINUX_FLAVOURS; echo $#)"
if [ "$NUMFLAVOURS" = 1 ] && [ "$LB_LINUX_FLAVOURS" != "none" ]; then if [ "$NUMFLAVOURS" = 1 ] && [ "$LB_LINUX_FLAVOURS" != "none" ]; then
# only one kernel flavour # only one kernel flavour
if [ -e "binary/$INITFS/vmlinuz" -a ! -h "binary/$INITFS/vmlinuz" ]; then if [ -f "binary/$INITFS/vmlinuz" ]; then
ln "binary/$INITFS/vmlinuz" "$PREFIX.kernel" ln "binary/$INITFS/vmlinuz" "$PREFIX.kernel"
chmod 644 "$PREFIX.kernel" chmod 644 "$PREFIX.kernel"
else else
ln -sf "$PREFIX.kernel-$LB_LINUX_FLAVOURS" "$PREFIX.kernel" ln -sf "$PREFIX.kernel-$LB_LINUX_FLAVOURS" "$PREFIX.kernel"
fi fi
if [ -e "binary/$INITFS/initrd.lz" -a ! -h "binary/$INITFS/initrd.lz" ]; then if [ -f "binary/$INITFS/initrd.lz" ]; then
ln "binary/$INITFS/initrd.lz" "$PREFIX.initrd" ln "binary/$INITFS/initrd.lz" "$PREFIX.initrd"
chmod 644 "$PREFIX.initrd" chmod 644 "$PREFIX.initrd"
else else
@ -917,6 +915,12 @@ case $SUBARCH in
;; ;;
raspi2|raspi3) raspi2|raspi3)
# copy the kernel and initrd to a predictable directory for
# ubuntu-image consumption. In some cases, like in pi2/3
# u-boot, the bootloader needs to contain the kernel and initrd,
# so during rootfs build we copy it over to a directory that
# ubuntu-image looks for and shoves into the bootloader
# partition.
UBOOT_BOOT="image/boot/uboot" UBOOT_BOOT="image/boot/uboot"
mkdir -p $UBOOT_BOOT mkdir -p $UBOOT_BOOT

8
live-build/auto/config
View File

@ -831,17 +831,11 @@ case $ARCH in
add_package live ac100-tarball-installer add_package live ac100-tarball-installer
BINARY_REMOVE_LINUX=false BINARY_REMOVE_LINUX=false
;; ;;
raspi2) raspi2|raspi3)
COMPONENTS='main restricted universe multiverse' COMPONENTS='main restricted universe multiverse'
add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools
BINARY_REMOVE_LINUX=false BINARY_REMOVE_LINUX=false
;; ;;
raspi3)
COMPONENTS='main restricted universe multiverse'
KERNEL_FLAVOURS=raspi2
add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools
BINARY_REMOVE_LINUX=false
;;
esac esac
;; ;;
esac esac