From bacc18b6b3597694dbac9cf4fd77d2945a6bbfcb Mon Sep 17 00:00:00 2001 From: Cody Shepherd Date: Fri, 9 Oct 2020 09:25:23 -0700 Subject: [PATCH 1/4] Change tar transform target to match changes in bionic+, allowing for ext4 image format to be built correctly --- live-build/buildd/hooks/50-buildd-tar.binary | 4 ++-- live-build/buildd/hooks/51-buildd-lxd.binary | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/live-build/buildd/hooks/50-buildd-tar.binary b/live-build/buildd/hooks/50-buildd-tar.binary index 8be7b618..c9c4663a 100755 --- a/live-build/buildd/hooks/50-buildd-tar.binary +++ b/live-build/buildd/hooks/50-buildd-tar.binary @@ -6,5 +6,5 @@ set -e # gzip was chosen for fastest decompression speed: it decompresses buildd # chroots about twice as fast as xz and about five times as fast as bzip2. -tar --transform='s,^binary,chroot-autobuild,' --sort=name --numeric-owner \ - -czf "livecd.$PROJECT.rootfs.tar.gz" binary +tar --transform='s,^chroot,chroot-autobuild,' --sort=name --numeric-owner \ + -czf "livecd.$PROJECT.rootfs.tar.gz" chroot diff --git a/live-build/buildd/hooks/51-buildd-lxd.binary b/live-build/buildd/hooks/51-buildd-lxd.binary index b4b782d9..44b38213 100755 --- a/live-build/buildd/hooks/51-buildd-lxd.binary +++ b/live-build/buildd/hooks/51-buildd-lxd.binary @@ -11,6 +11,6 @@ tar --numeric-owner -cf "livecd.$PROJECT.lxd.tar" -C "$TMPDIR" metadata.yaml rm -rf "$TMPDIR" # When using the combined metadata/rootfs form, the rootfs must be under # rootfs/ rather than under chroot-autobuild/. -tar --transform='s,^binary,rootfs,' --sort=name --numeric-owner \ - -rf "livecd.$PROJECT.lxd.tar" binary +tar --transform='s,^chroot,rootfs,' --sort=name --numeric-owner \ + -rf "livecd.$PROJECT.lxd.tar" chroot gzip -9 "livecd.$PROJECT.lxd.tar" From aede5df67b19e6a98091f2042570c4af94aa0e75 Mon Sep 17 00:00:00 2001 From: Cody Shepherd Date: Mon, 26 Oct 2020 09:40:53 -0700 Subject: [PATCH 2/4] Skip jasper for buildd subproject --- live-build/auto/config | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/live-build/auto/config b/live-build/auto/config index a38a529e..e8a4cdc0 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -135,8 +135,10 @@ case $IMAGEFORMAT in COMPONENTS='main restricted universe multiverse' ;; *) - case $PROJECT in - ubuntu-cpc) + case $PROJECT:${SUBPROJECT:-} in + ubuntu-base:buildd) + ;; + ubuntu-cpc:*) ;; *) add_package live jasper From c5102d998ef9e607b95d7290ce64907c385ae169 Mon Sep 17 00:00:00 2001 From: Cody Shepherd Date: Wed, 18 Nov 2020 14:22:57 -0800 Subject: [PATCH 3/4] Create manifests for buildd tarballs --- live-build/buildd/hooks/50-buildd-tar.binary | 4 ++++ live-build/buildd/hooks/51-buildd-lxd.binary | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/live-build/buildd/hooks/50-buildd-tar.binary b/live-build/buildd/hooks/50-buildd-tar.binary index c9c4663a..88947a07 100755 --- a/live-build/buildd/hooks/50-buildd-tar.binary +++ b/live-build/buildd/hooks/50-buildd-tar.binary @@ -4,6 +4,10 @@ # ourselves. set -e +. config/functions + +create_manifest chroot "livecd.$PROJECT.rootfs.tar.gz.manifest" + # gzip was chosen for fastest decompression speed: it decompresses buildd # chroots about twice as fast as xz and about five times as fast as bzip2. tar --transform='s,^chroot,chroot-autobuild,' --sort=name --numeric-owner \ diff --git a/live-build/buildd/hooks/51-buildd-lxd.binary b/live-build/buildd/hooks/51-buildd-lxd.binary index 44b38213..d0ff69a6 100755 --- a/live-build/buildd/hooks/51-buildd-lxd.binary +++ b/live-build/buildd/hooks/51-buildd-lxd.binary @@ -3,12 +3,16 @@ set -e . config/bootstrap +. config/functions TMPDIR="$(mktemp -d)" config/make-lxd-metadata "${LB_DISTRIBUTION%-*}" "$ARCH" \ >"$TMPDIR/metadata.yaml" tar --numeric-owner -cf "livecd.$PROJECT.lxd.tar" -C "$TMPDIR" metadata.yaml rm -rf "$TMPDIR" + +create_manifest chroot "livecd.$PROJECT.lxd.tar.manifest" + # When using the combined metadata/rootfs form, the rootfs must be under # rootfs/ rather than under chroot-autobuild/. tar --transform='s,^chroot,rootfs,' --sort=name --numeric-owner \ From 695b4de393731c141575c3a333df91122dcb9003 Mon Sep 17 00:00:00 2001 From: Cody Shepherd Date: Fri, 20 Nov 2020 12:36:23 -0800 Subject: [PATCH 4/4] Omit file type exensions in manifest names --- live-build/buildd/hooks/50-buildd-tar.binary | 2 +- live-build/buildd/hooks/51-buildd-lxd.binary | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/live-build/buildd/hooks/50-buildd-tar.binary b/live-build/buildd/hooks/50-buildd-tar.binary index 88947a07..738e5f9a 100755 --- a/live-build/buildd/hooks/50-buildd-tar.binary +++ b/live-build/buildd/hooks/50-buildd-tar.binary @@ -6,7 +6,7 @@ set -e . config/functions -create_manifest chroot "livecd.$PROJECT.rootfs.tar.gz.manifest" +create_manifest chroot "livecd.$PROJECT.rootfs.manifest" # gzip was chosen for fastest decompression speed: it decompresses buildd # chroots about twice as fast as xz and about five times as fast as bzip2. diff --git a/live-build/buildd/hooks/51-buildd-lxd.binary b/live-build/buildd/hooks/51-buildd-lxd.binary index d0ff69a6..85daa72a 100755 --- a/live-build/buildd/hooks/51-buildd-lxd.binary +++ b/live-build/buildd/hooks/51-buildd-lxd.binary @@ -11,7 +11,7 @@ config/make-lxd-metadata "${LB_DISTRIBUTION%-*}" "$ARCH" \ tar --numeric-owner -cf "livecd.$PROJECT.lxd.tar" -C "$TMPDIR" metadata.yaml rm -rf "$TMPDIR" -create_manifest chroot "livecd.$PROJECT.lxd.tar.manifest" +create_manifest chroot "livecd.$PROJECT.lxd.manifest" # When using the combined metadata/rootfs form, the rootfs must be under # rootfs/ rather than under chroot-autobuild/.