mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-05-28 19:22:17 +00:00
Cherry-pick all the additionally needed fixes to enable proper raspi3 support.
This commit is contained in:
parent
e6aa5a0b16
commit
6b63fa210f
9
debian/changelog
vendored
9
debian/changelog
vendored
@ -3,7 +3,14 @@ livecd-rootfs (2.525.13) UNRELEASED; urgency=medium
|
|||||||
[ Balint Reczey ]
|
[ Balint Reczey ]
|
||||||
* Update Vcs-* fields in debian/control to point to git.
|
* Update Vcs-* fields in debian/control to point to git.
|
||||||
|
|
||||||
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Thu, 13 Dec 2018 15:22:15 +1300
|
[ Łukasz 'sil2100' Zemczak ]
|
||||||
|
* Add wpasupplicant to the additional packages installed for the raspi2 and
|
||||||
|
raspi3 targets.
|
||||||
|
* Default to IMAGEFORMAT=ubuntu-image for raspi3 ubuntu-cpc builds.
|
||||||
|
* Link the resulting raspi3 image to a filename that cdimage expects from a
|
||||||
|
preinstalled image build.
|
||||||
|
|
||||||
|
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Fri, 11 Jan 2019 14:53:10 +0100
|
||||||
|
|
||||||
livecd-rootfs (2.525.12) bionic; urgency=medium
|
livecd-rootfs (2.525.12) bionic; urgency=medium
|
||||||
|
|
||||||
|
@ -45,6 +45,8 @@ if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
|
|||||||
# define those.
|
# define those.
|
||||||
mv output/*.img "$PREFIX".img
|
mv output/*.img "$PREFIX".img
|
||||||
xz -0 -T4 "$PREFIX".img
|
xz -0 -T4 "$PREFIX".img
|
||||||
|
# Also link the output image to a filename that cdimage expects
|
||||||
|
ln "$PREFIX".img.xz livecd.ubuntu-cpc.disk1.img.xz
|
||||||
mv output/filesystem.manifest "$PREFIX".manifest
|
mv output/filesystem.manifest "$PREFIX".manifest
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -114,7 +114,12 @@ add_binary_hook ()
|
|||||||
if [ -z "${IMAGEFORMAT:-}" ]; then
|
if [ -z "${IMAGEFORMAT:-}" ]; then
|
||||||
case $PROJECT:${SUBPROJECT:-} in
|
case $PROJECT:${SUBPROJECT:-} in
|
||||||
ubuntu-cpc:*)
|
ubuntu-cpc:*)
|
||||||
|
if [ "$SUBARCH" = "raspi3" ]; then
|
||||||
|
# For now only raspi3, but others are soon to follow
|
||||||
|
IMAGEFORMAT=ubuntu-image
|
||||||
|
else
|
||||||
IMAGEFORMAT=ext4
|
IMAGEFORMAT=ext4
|
||||||
|
fi
|
||||||
;;
|
;;
|
||||||
ubuntu-server:live)
|
ubuntu-server:live)
|
||||||
IMAGEFORMAT=plain
|
IMAGEFORMAT=plain
|
||||||
@ -806,13 +811,13 @@ case $ARCH in
|
|||||||
;;
|
;;
|
||||||
raspi2)
|
raspi2)
|
||||||
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 wpasupplicant
|
||||||
BINARY_REMOVE_LINUX=false
|
BINARY_REMOVE_LINUX=false
|
||||||
;;
|
;;
|
||||||
raspi3)
|
raspi3)
|
||||||
COMPONENTS='main restricted universe multiverse'
|
COMPONENTS='main restricted universe multiverse'
|
||||||
KERNEL_FLAVOURS=raspi2
|
KERNEL_FLAVOURS=raspi2
|
||||||
add_package install raspi3-firmware u-boot-rpi flash-kernel u-boot-tools
|
add_package install raspi3-firmware u-boot-rpi flash-kernel u-boot-tools wpasupplicant
|
||||||
BINARY_REMOVE_LINUX=false
|
BINARY_REMOVE_LINUX=false
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user