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

Merge tarball-transform into ubuntu/xenial [a=codyshepherd] [r=rcj,vorlon]

Browse Source 
Bring tarball and rootfs hooks in line with bionic+, and allow for ext4 image format to be built without breaking tarballs. LP: #1863024

MP: https://code.launchpad.net/~codyshepherd/livecd-rootfs/+git/livecd-rootfs/+merge/392066
This commit is contained in:
Robert C Jennings 2020-11-20 15:23:17 -06:00
commit 51b616f991
No known key found for this signature in database
GPG Key ID: 740C3D9EEDF2ED73
4 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
livecd-rootfs (2.408.62) UNRELEASED; urgency=medium
[ Cody Shepherd ]
* buildd: ext4: change tar transform target to match changes in bionic+
* buildd: Skip jasper for buildd subproject
* buildd: Create manifests for buildd tarballs
-- Robert C Jennings <robert.jennings@canonical.com> Fri, 20 Nov 2020 15:23:31 -0600
livecd-rootfs (2.408.61) xenial; urgency=medium livecd-rootfs (2.408.61) xenial; urgency=medium
* SRU: Enable bootable-buildd hooks for Xenial (LP: #1863024) * SRU: Enable bootable-buildd hooks for Xenial (LP: #1863024)

6
live-build/auto/config
View File

@ -135,8 +135,10 @@ case $IMAGEFORMAT in
COMPONENTS='main restricted universe multiverse' COMPONENTS='main restricted universe multiverse'
;; ;;
*) *)
case $PROJECT in case $PROJECT:${SUBPROJECT:-} in
ubuntu-cpc) ubuntu-base:buildd)
;;
ubuntu-cpc:*)
;; ;;
*) *)
add_package live jasper add_package live jasper

8
live-build/buildd/hooks/50-buildd-tar.binary
View File

@ -4,7 +4,11 @@
# ourselves. # ourselves.
set -e set -e
. config/functions
create_manifest chroot "livecd.$PROJECT.rootfs.manifest"
# gzip was chosen for fastest decompression speed: it decompresses buildd # 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. # 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 \ tar --transform='s,^chroot,chroot-autobuild,' --sort=name --numeric-owner \
-czf "livecd.$PROJECT.rootfs.tar.gz" binary -czf "livecd.$PROJECT.rootfs.tar.gz" chroot

8
live-build/buildd/hooks/51-buildd-lxd.binary
View File

@ -3,14 +3,18 @@
set -e set -e
. config/bootstrap . config/bootstrap
. config/functions
TMPDIR="$(mktemp -d)" TMPDIR="$(mktemp -d)"
config/make-lxd-metadata "${LB_DISTRIBUTION%-*}" "$ARCH" \ config/make-lxd-metadata "${LB_DISTRIBUTION%-*}" "$ARCH" \
>"$TMPDIR/metadata.yaml" >"$TMPDIR/metadata.yaml"
tar --numeric-owner -cf "livecd.$PROJECT.lxd.tar" -C "$TMPDIR" metadata.yaml tar --numeric-owner -cf "livecd.$PROJECT.lxd.tar" -C "$TMPDIR" metadata.yaml
rm -rf "$TMPDIR" rm -rf "$TMPDIR"
create_manifest chroot "livecd.$PROJECT.lxd.manifest"
# When using the combined metadata/rootfs form, the rootfs must be under # When using the combined metadata/rootfs form, the rootfs must be under
# rootfs/ rather than under chroot-autobuild/. # rootfs/ rather than under chroot-autobuild/.
tar --transform='s,^binary,rootfs,' --sort=name --numeric-owner \ tar --transform='s,^chroot,rootfs,' --sort=name --numeric-owner \
-rf "livecd.$PROJECT.lxd.tar" binary -rf "livecd.$PROJECT.lxd.tar" chroot
gzip -9 "livecd.$PROJECT.lxd.tar" gzip -9 "livecd.$PROJECT.lxd.tar"