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

Remove 'IMAGETYPE' and 'IMAGEFORMAT' bits per the suggestions.

Browse Source
This commit is contained in:
Gary.Wzl 2017-09-18 09:38:20 +08:00
parent eb76178ab5
commit 228ed7c87b
2 changed files with 30 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
live-build/auto/build
View File

@ -16,17 +16,11 @@ if [ -z "${PROJECT:-}" ]; then
fi fi
if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
if [ "${IMAGETYPE:-}" = "classic" ]; then # Use ubuntu-image instead of live-build
# Use ubuntu-image instead of live-build env SNAPPY_STORE_NO_CDN=1 \
OPTS="${PROJECT:+--project=$PROJECT} ${SUITE:+--suite=$SUITE} ${ARCH:+--arch=$ARCH} ${SUBPROJECT:+--subproject=$SUBPROJECT} ${SUBARCH:+--subarch=$SUBARCH} ${PROPOSED:+--with-proposed=$PROPOSED} ${IMAGEFORMAT:+--image-format=$IMAGEFORMAT} ${EXTRA_PPAS:+--extra-ppas=$EXTRA_PPAS}" ubuntu-image -c edge \
ubuntu-image classic $OPTS gadget_tree
else
# Use ubuntu-image instead of live-build
env SNAPPY_STORE_NO_CDN=1 \
ubuntu-image snap -c edge \
-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
fi
exit 0 exit 0
fi fi

66
live-build/auto/config
View File

@ -153,48 +153,34 @@ case $IMAGEFORMAT in
;; ;;
ubuntu-image) ubuntu-image)
case $IMAGETYPE in case "$ARCH+${SUBARCH:-}" in
classic) amd64+*)
echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common MODEL=pc-amd64 ;;
# TODO livecd-rootfs needs to take a branch URI for the gadget as input, i386+*)
# stage it, and pass it to ubuntu-image, where do we get it? MODEL=pc-i386 ;;
arm64+snapdragon)
# Fake finished configuration for lb build MODEL=dragonboard ;;
mkdir -p .build armhf+raspi2)
touch .build/config MODEL=pi2 ;;
exit 0 armhf+raspi3)
;; MODEL=pi3 ;;
*) # backport compatibility for core image creation. armhf+cm3)
case "$ARCH+${SUBARCH:-}" in MODEL=cm3 ;;
amd64+*) *)
MODEL=pc-amd64 ;; echo "Model $ARCH+${SUBARCH:-} unknown to livecd-rootfs" >&2
i386+*) exit 1
MODEL=pc-i386 ;;
arm64+snapdragon)
MODEL=dragonboard ;;
armhf+raspi2)
MODEL=pi2 ;;
armhf+raspi3)
MODEL=pi3 ;;
armhf+cm3)
MODEL=cm3 ;;
*)
echo "Model $ARCH+${SUBARCH:-} unknown to livecd-rootfs" >&2
exit 1
;;
esac
echo "IMAGEFORMAT=$IMAGEFORMAT" >> 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
echo "Configured ubuntu-image for the following model assertion:"
cat livecd."$PROJECT".model-assertion
echo "----------------------------------------------------------"
# Fake finished configuration for lb build
mkdir -p .build
touch .build/config
exit 0
;; ;;
esac esac
echo "IMAGEFORMAT=$IMAGEFORMAT" >> 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
echo "Configured ubuntu-image for the following model assertion:"
cat livecd."$PROJECT".model-assertion
echo "----------------------------------------------------------"
# Fake finished configuration for lb build
mkdir -p .build
touch .build/config
exit 0
;; ;;
*) *)