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

Use image definition path rather than making a copy

Browse Source
This commit is contained in:
Loïc Minier 2023-06-28 09:13:28 +00:00 committed by Loïc Minier
parent 262d0f3170
commit 8bf4d3500f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
live-build/auto/build
View File

@ -107,7 +107,7 @@ if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
mv output/seed.manifest "$PREFIX".manifest mv output/seed.manifest "$PREFIX".manifest
else else
/snap/bin/ubuntu-image classic --verbose $UBUNTU_IMAGE_ARGS \ /snap/bin/ubuntu-image classic --verbose $UBUNTU_IMAGE_ARGS \
-O output "$PREFIX".yaml -O output "$IMAGE_DEFINITION"
# Since the output of the ubuntu-image call can vary based on what # Since the output of the ubuntu-image call can vary based on what
# kind of an image we build, the safest bet is to 'export' all the # kind of an image we build, the safest bet is to 'export' all the
# artifacts from the output directory. The image definition file # artifacts from the output directory. The image definition file

8
live-build/auto/config
View File

@ -504,14 +504,14 @@ case $IMAGEFORMAT in
IMAGE_PROJECT=$PROJECT IMAGE_PROJECT=$PROJECT
[ "$IMAGE_PROJECT" = "ubuntu-cpc" ] && IMAGE_PROJECT="ubuntu-server" [ "$IMAGE_PROJECT" = "ubuntu-cpc" ] && IMAGE_PROJECT="ubuntu-server"
DEFINITION="$IMAGE_PROJECT-$MODEL.yaml"
LB_UBUNTU_IMAGES_REPO="${LB_UBUNTU_IMAGES_REPO:-git://git.launchpad.net/ubuntu-images}" LB_UBUNTU_IMAGES_REPO="${LB_UBUNTU_IMAGES_REPO:-git://git.launchpad.net/ubuntu-images}"
LB_UBUNTU_IMAGES_BRANCH="${LB_UBUNTU_IMAGES_BRANCH:-$SUITE}" LB_UBUNTU_IMAGES_BRANCH="${LB_UBUNTU_IMAGES_BRANCH:-$SUITE}"
git clone "$LB_UBUNTU_IMAGES_REPO" -b "$LB_UBUNTU_IMAGES_BRANCH" image-definitions git clone "$LB_UBUNTU_IMAGES_REPO" -b "$LB_UBUNTU_IMAGES_BRANCH" image-definitions
cp image-definitions/$DEFINITION "$PREFIX".yaml IMAGE_DEFINITION="image-definitions/$IMAGE_PROJECT-$MODEL.yaml"
echo "Configured ubuntu-image for the following image-definition:" echo "IMAGE_DEFINITION=$IMAGE_DEFINITION" >> config/common
cat "$PREFIX".yaml echo "Configured ubuntu-image to use image definition file $IMAGE_DEFINITION which has the following contents:"
cat "$IMAGE_DEFINITION"
echo "----------------------------------------------------------" echo "----------------------------------------------------------"
fi fi