Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-10 12:47:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import patches-unapplied version 2.481 to ubuntu/bionic-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 184c0e088485431a73f365347fbeee54616b00a1

New changelog entries:
  * The target for x86 ubuntu-core images is VMs, so create them with
    a buffer of free space in order to work if booted in place.
  * ubuntu-image now produces a manifest file listing the snap revisions
    used; publish this so that it's picked up by launchpad-buildd.
  * Change ubuntu-core image builds to use the standard "$PREFIX" naming for
    artifacts instead of being gratuitously different; requires a matching
    change to ubuntu-cdimage.
This commit is contained in:
Steve Langasek 2017-11-09 23:29:50 -08:00 committed by usd-importer
parent 184c0e0884
commit c4cfbef1ee
3 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
debian/changelog vendored
View File

@ -1,3 +1,15 @@
livecd-rootfs (2.481) bionic; urgency=medium
* The target for x86 ubuntu-core images is VMs, so create them with
a buffer of free space in order to work if booted in place.
* ubuntu-image now produces a manifest file listing the snap revisions
used; publish this so that it's picked up by launchpad-buildd.
* Change ubuntu-core image builds to use the standard "$PREFIX" naming for
artifacts instead of being gratuitously different; requires a matching
change to ubuntu-cdimage.
-- Steve Langasek <steve.langasek@ubuntu.com> Thu, 09 Nov 2017 23:29:50 -0800
livecd-rootfs (2.480) bionic; urgency=medium
[ Gary Wang ]

14
live-build/auto/build
View File

@ -15,12 +15,17 @@ if [ -z "${PROJECT:-}" ]; then
exit 1
fi
# Link output files somewhere BuildLiveCD will be able to find them.
PREFIX="livecd.$PROJECT${SUBARCH:+-$SUBARCH}"
if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
# Use ubuntu-image instead of live-build
env SNAPPY_STORE_NO_CDN=1 \
ubuntu-image -c edge \
-o livecd."$PROJECT".img livecd."$PROJECT".model-assertion
xz -0 -T4 livecd."$PROJECT".img
ubuntu-image -c edge $UBUNTU_IMAGE_ARGS \
-o "$PREFIX".img "$PREFIX".model-assertion
xz -0 -T4 "$PREFIX".img
mv seed.manifest "$PREFIX".manifest
exit 0
fi
@ -443,9 +448,6 @@ else
exit 1
fi
# Link output files somewhere BuildLiveCD will be able to find them.
PREFIX="livecd.$PROJECT${SUBARCH:+-$SUBARCH}"
case $LB_INITRAMFS in
casper)
INITFS="casper"

11
live-build/auto/config
View File

@ -90,6 +90,7 @@ LIVE_TASK=
PREINSTALLED=false
PREINSTALL_POOL=
PREINSTALL_POOL_SEEDS=
PREFIX="livecd.$PROJECT${SUBARCH:+-$SUBARCH}"
CHROOT_HOOKS=
BINARY_HOOKS=
@ -171,9 +172,17 @@ case $IMAGEFORMAT in
exit 1
;;
esac
case $MODEL in
pc-amd64|pc-i386)
UBUNTU_IMAGE_ARGS="--image-size 3700M" ;;
*)
UBUNTU_IMAGE_ARGS="" ;;
esac
echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common
# Store model assertion in top dir to get it picked up later as a build artifact
env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 model="$MODEL" brand-id=canonical > livecd."$PROJECT".model-assertion
env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 model="$MODEL" brand-id=canonical > "$PREFIX".model-assertion
echo "Configured ubuntu-image for the following model assertion:"
cat livecd."$PROJECT".model-assertion
echo "----------------------------------------------------------"