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

Merge branch 'pi-desktop-one-gadget' of git+ssh://git.launchpad.net/livecd-rootfs into ubuntu/master

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2022-02-23 16:19:57 +01:00
commit ef7a95ab82
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,10 +1,16 @@
livecd-rootfs (2.757) UNRELEASED; urgency=medium livecd-rootfs (2.757) UNRELEASED; urgency=medium
[ Dave Jones ]
* Fix holes in swapfiles on pre-installed desktop images. Instead of * Fix holes in swapfiles on pre-installed desktop images. Instead of
pre-allocating the swapfile in the image, allocate it on first boot and pre-allocating the swapfile in the image, allocate it on first boot and
use a systemd .swap unit to activate it (LP: #1961047) use a systemd .swap unit to activate it (LP: #1961047)
-- Dave Jones <dave.jones@canonical.com> Tue, 22 Feb 2022 00:45:03 +0000 [ Łukasz 'sil2100' Zemczak ]
* Use the 'classic' branch of the pi gadget for both classic and desktop
pi images by specifying the gadget make target during the gadget priming
phase.
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Tue, 22 Feb 2022 11:33:28 +0100
livecd-rootfs (2.756) jammy; urgency=medium livecd-rootfs (2.756) jammy; urgency=medium

3
live-build/auto/build
View File

@ -101,7 +101,8 @@ if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
mv output/seed.manifest "$PREFIX".manifest mv output/seed.manifest "$PREFIX".manifest
else else
# First we need to build the gadget tree # First we need to build the gadget tree
make -C "config/$PREFIX-gadget" ARCH=$ARCH SERIES=$SUITE make -C "config/$PREFIX-gadget" \
ARCH=$ARCH SERIES=$SUITE $GADGET_TARGET
ubuntu-image classic $UBUNTU_IMAGE_ARGS \ ubuntu-image classic $UBUNTU_IMAGE_ARGS \
-s $SUITE -p $PROJECT -a $ARCH --subarch $SUBARCH \ -s $SUITE -p $PROJECT -a $ARCH --subarch $SUBARCH \
-O output config/$PREFIX-gadget/install -O output config/$PREFIX-gadget/install

6
live-build/auto/config
View File

@ -507,9 +507,9 @@ case $IMAGEFORMAT in
;; ;;
esac esac
BRANCH="classic" GADGET_TARGET="server"
if [ "$SUBPROJECT" = "desktop-preinstalled" ]; then if [ "$SUBPROJECT" = "desktop-preinstalled" ]; then
BRANCH="desktop" GADGET_TARGET="desktop"
fi fi
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${SUBPROJECT:+ --subproject \"$SUBPROJECT\"}" UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${SUBPROJECT:+ --subproject \"$SUBPROJECT\"}"
@ -519,10 +519,12 @@ case $IMAGEFORMAT in
# We need to look in two places for the gadget tree: # We need to look in two places for the gadget tree:
# - Launchpad hosted gadgets will be in the snap-gadget repo # - Launchpad hosted gadgets will be in the snap-gadget repo
# - Github hosted gadgets are mirrored into a github-mirror repo # - Github hosted gadgets are mirrored into a github-mirror repo
BRANCH="classic"
git clone git://git.launchpad.net/~canonical-foundations/snap-$MODEL/+git/snap-$MODEL -b $BRANCH config/$PREFIX-gadget || git clone git://git.launchpad.net/~canonical-foundations/snap-$MODEL/+git/github-mirror -b $BRANCH config/$PREFIX-gadget || git clone git://git.launchpad.net/~canonical-foundations/snap-$MODEL/+git/github-mirror-$ARCH -b $BRANCH config/$PREFIX-gadget git clone git://git.launchpad.net/~canonical-foundations/snap-$MODEL/+git/snap-$MODEL -b $BRANCH config/$PREFIX-gadget || git clone git://git.launchpad.net/~canonical-foundations/snap-$MODEL/+git/github-mirror -b $BRANCH config/$PREFIX-gadget || git clone git://git.launchpad.net/~canonical-foundations/snap-$MODEL/+git/github-mirror-$ARCH -b $BRANCH config/$PREFIX-gadget
echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
echo "SUITE=$SUITE" >> config/common echo "SUITE=$SUITE" >> config/common
echo "GADGET_TARGET=$GADGET_TARGET" >> config/common
echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common
echo "Configured ubuntu-image for the following gadget model: $MODEL" echo "Configured ubuntu-image for the following gadget model: $MODEL"