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

move configuration bits into live-build/auto/config from live-build/auto/build, per Adam

Browse Source
This commit is contained in:
Steve Langasek 2017-11-09 15:55:45 -08:00
parent 696ae6e1eb
commit 02246dbf84
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
live-build/auto/build
View File

@ -21,19 +21,8 @@ PREFIX="livecd.$PROJECT${SUBARCH:+-$SUBARCH}"
if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
# Use ubuntu-image instead of live-build # Use ubuntu-image instead of live-build
# this should actually be per-model instead of per-architecture,
# but for the moment all our x86 models follow this rule.
case $ARCH in
amd64|i386)
extra_args="--image-size 3700M"
;;
*)
extra_args=""
;;
esac
env SNAPPY_STORE_NO_CDN=1 \ env SNAPPY_STORE_NO_CDN=1 \
ubuntu-image -c edge $extra_args \ ubuntu-image -c edge $UBUNTU_IMAGE_ARGS \
-o livecd."$PROJECT".img livecd."$PROJECT".model-assertion -o livecd."$PROJECT".img livecd."$PROJECT".model-assertion
xz -0 -T4 livecd."$PROJECT".img xz -0 -T4 livecd."$PROJECT".img
mv seed.manifest "PREFIX".manifest mv seed.manifest "PREFIX".manifest

8
live-build/auto/config
View File

@ -171,7 +171,15 @@ case $IMAGEFORMAT in
exit 1 exit 1
;; ;;
esac esac
case $MODEL in
pc-amd64|pc-i386)
UBUNTU_IMAGE_ARGS="--image-size 3700M" ;;
*)
UBUNTU_IMAGE_ARGS="" ;;
esac
echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common 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 # 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 > livecd."$PROJECT".model-assertion
echo "Configured ubuntu-image for the following model assertion:" echo "Configured ubuntu-image for the following model assertion:"