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

Merge branch 'add-buildinfo-file' into ubuntu/master

Browse Source 
* add-buildinfo-file:
  Drop the second parameter passed to configure_oci
  Add build_name metadata to build.info file for OCI and Base images
This commit is contained in:
Utkarsh Gupta 2024-03-13 18:26:45 +05:30
commit cebc2f85d5
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
live-build/auto/build
View File

@ -430,9 +430,16 @@ serial: $BUILDSTAMP
EOF EOF
fi fi
if [ "$PROJECT" = "ubuntu-oci" ]; then if [ "${PROJECT}" = ubuntu-base ] || [ "${PROJECT}" = "ubuntu-oci" ]; then
if [ -n "$BUILDSTAMP" ]; then if [ -n "$BUILDSTAMP" ]; then
configure_oci chroot "$BUILDSTAMP" mkdir -p chroot/etc/cloud
cat > chroot/etc/cloud/build.info << EOF
build_name: $PROJECT:${SUBPROJECT:}
serial: $BUILDSTAMP
EOF
if [ "${PROJECT}" = "ubuntu-oci" ]; then
configure_oci chroot
fi
else else
echo "The \$BUILDSTAMP variable is empty" echo "The \$BUILDSTAMP variable is empty"
exit 1 exit 1

8
live-build/functions
View File

@ -955,7 +955,6 @@ configure_oci() {
# at https://github.com/tianon/docker-brew-ubuntu-core/blob/master/update.sh # at https://github.com/tianon/docker-brew-ubuntu-core/blob/master/update.sh
local chroot=$1 local chroot=$1
local serial=$2
if [ ! -d "${chroot}" ]; then if [ ! -d "${chroot}" ]; then
echo "The chroot does not exist" echo "The chroot does not exist"
@ -970,13 +969,6 @@ configure_oci() {
Chroot ${chroot} "chmod +x /usr/sbin/policy-rc.d" Chroot ${chroot} "chmod +x /usr/sbin/policy-rc.d"
# Inject a build stamp into the image
mkdir -p ${chroot}/etc/cloud
cat > ${chroot}/etc/cloud/build.info << EOF
serial: $serial
EOF
# https://github.com/docker/docker/blob/9a9fc01af8fb5d98b8eec0740716226fadb3735c/contrib/mkimage/debootstrap#L54-L56 # https://github.com/docker/docker/blob/9a9fc01af8fb5d98b8eec0740716226fadb3735c/contrib/mkimage/debootstrap#L54-L56
Chroot ${chroot} "dpkg-divert --local --rename --add /sbin/initctl" Chroot ${chroot} "dpkg-divert --local --rename --add /sbin/initctl"
cp -a ${chroot}/usr/sbin/policy-rc.d ${chroot}/sbin/initctl cp -a ${chroot}/usr/sbin/policy-rc.d ${chroot}/sbin/initctl