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

Change ubuntu-core image builds to use the standard "$PREFIX" naming for

Browse Source 
artifacts instead of being gratuitously different; requires a matching
change to ubuntu-cdimage.
This commit is contained in:
Steve Langasek 2017-11-09 16:13:08 -08:00
parent 02246dbf84
commit 7c07f8a65b
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -4,6 +4,9 @@ livecd-rootfs (2.481) UNRELEASED; urgency=medium
a buffer of free space in order to work if booted in place. a buffer of free space in order to work if booted in place.
* ubuntu-image now produces a manifest file listing the snap revisions * ubuntu-image now produces a manifest file listing the snap revisions
used; publish this so that it's picked up by launchpad-buildd. 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> Wed, 08 Nov 2017 12:01:25 -0800 -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 08 Nov 2017 12:01:25 -0800

4
live-build/auto/build
View File

@ -23,8 +23,8 @@ if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
env SNAPPY_STORE_NO_CDN=1 \ env SNAPPY_STORE_NO_CDN=1 \
ubuntu-image -c edge $UBUNTU_IMAGE_ARGS \ ubuntu-image -c edge $UBUNTU_IMAGE_ARGS \
-o livecd."$PROJECT".img livecd."$PROJECT".model-assertion -o "$PREFIX".img "$PREFIX".model-assertion
xz -0 -T4 livecd."$PROJECT".img xz -0 -T4 "$PREFIX".img
mv seed.manifest "PREFIX".manifest mv seed.manifest "PREFIX".manifest
exit 0 exit 0
fi fi

3
live-build/auto/config
View File

@ -90,6 +90,7 @@ LIVE_TASK=
PREINSTALLED=false PREINSTALLED=false
PREINSTALL_POOL= PREINSTALL_POOL=
PREINSTALL_POOL_SEEDS= PREINSTALL_POOL_SEEDS=
PREFIX="livecd.$PROJECT${SUBARCH:+-$SUBARCH}"
CHROOT_HOOKS= CHROOT_HOOKS=
BINARY_HOOKS= BINARY_HOOKS=
@ -181,7 +182,7 @@ case $IMAGEFORMAT in
echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> 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 # 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:" echo "Configured ubuntu-image for the following model assertion:"
cat livecd."$PROJECT".model-assertion cat livecd."$PROJECT".model-assertion
echo "----------------------------------------------------------" echo "----------------------------------------------------------"