[Merge] ~utkarsh/livecd-rootfs/+git/livecd-rootfs:add-buildinfo-file into livecd-rootfs:ubuntu/master

Cristovao Cordeiro mp+461713 at code.launchpad.net
Tue Mar 5 13:17:27 UTC 2024



Diff comments:

> diff --git a/live-build/auto/build b/live-build/auto/build
> index 9911708..b6a5e0c 100755
> --- a/live-build/auto/build
> +++ b/live-build/auto/build
> @@ -430,10 +430,37 @@ serial: $BUILDSTAMP
>  EOF
>  		fi
>  
> +		if [ "$PROJECT:${SUBPROJECT:-}" = ubuntu-base:minimized ]; then
> +			BUILD_NAME=minimal
> +			cat > chroot/etc/base/build.info << EOF
> +build_name: $BUILD_NAME
> +serial: $BUILDSTAMP
> +EOF
> +		fi
> +
>  		if [ "$PROJECT" = "ubuntu-oci" ]; then
>  			if [ -n "$BUILDSTAMP" ]; then
>  				configure_oci chroot "$BUILDSTAMP"
> +				if [ "${SUBPROJECT:-}" = minimized ]; then
> +					BUILD_NAME=minimal
> +				else
> +					BUILD_NAME=base

can the PROJECT ever be "ubuntu-oci" and not minimized? If not, you'd only need the "PROJECT"

> +				fi
> +				cat > chroot/etc/oci/build.info << EOF
> +build_name: $BUILD_NAME
> +serial: $BUILDSTAMP
> +EOF
> +				fi
>  			else
> +				if [ "${SUBPROJECT:-}" = minimized ]; then
> +					BUILD_NAME=minimal
> +				else
> +					BUILD_NAME=base
> +				fi
> +					cat > chroot/etc/oci/build.info << EOF
> +build_name: $BUILD_NAME
> +EOF

the BUILDSTAMP is the most important value here. Without it, having this file isn't justified. We always had it with the previous code snippet below, so what are the chances we wouldn't have it here? If this code is just playing it safe, I'd rather raise an exception here

> +				fi
>  				echo "The \$BUILDSTAMP variable is empty"
>  				exit 1
>  			fi


-- 
https://code.launchpad.net/~utkarsh/livecd-rootfs/+git/livecd-rootfs/+merge/461713
Your team Ubuntu Core Development Team is subscribed to branch livecd-rootfs:ubuntu/master.




More information about the Ubuntu-reviews mailing list