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

If a subarch is specified for a cloud image build, don't build rootfs

Browse Source 
artifacts; these should come from the 'generic' build.
This commit is contained in:
Steve Langasek 2016-02-05 11:08:26 -08:00
parent 691a0ca08f
commit cb58e88614
4 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -11,6 +11,8 @@ livecd-rootfs (2.376) UNRELEASED; urgency=medium
all flavors and archs, but at the moment it's only needed on armhf+raspi2 all flavors and archs, but at the moment it's only needed on armhf+raspi2
to work around the raspberrypi2-firmware postinst calling sync, which is to work around the raspberrypi2-firmware postinst calling sync, which is
actually warranted in the normal case. actually warranted in the normal case.
* If a subarch is specified for a cloud image build, don't build rootfs
artifacts; these should come from the 'generic' build.
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Thu, 04 Feb 2016 17:31:18 +0100 -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Thu, 04 Feb 2016 17:31:18 +0100

6
live-build/ubuntu-cpc/hooks/030-root-tarball.binary
View File

@ -1,4 +1,10 @@
#!/bin/bash -ex #!/bin/bash -ex
if [ -n "$SUBARCH" ]; then
echo "Skipping rootfs build for subarch flavor build"
exit 0
fi
mkdir binary/boot/filesystem.dir mkdir binary/boot/filesystem.dir
cp -a chroot/* binary/boot/filesystem.dir cp -a chroot/* binary/boot/filesystem.dir

4
live-build/ubuntu-cpc/hooks/031-root-xz.binary
View File

@ -3,6 +3,10 @@
# #
# Generate the rootfs.tar.gz and manifest # Generate the rootfs.tar.gz and manifest
if [ -n "$SUBARCH" ]; then
exit 0
fi
dpkg-query --admindir=binary/boot/filesystem.dir/var/lib/dpkg -W > livecd.ubuntu-cpc.rootfs.manifest dpkg-query --admindir=binary/boot/filesystem.dir/var/lib/dpkg -W > livecd.ubuntu-cpc.rootfs.manifest
(cd "binary/boot/filesystem.dir/" && tar -c *) | \ (cd "binary/boot/filesystem.dir/" && tar -c *) | \

4
live-build/ubuntu-cpc/hooks/032-root-squashfs.binary
View File

@ -3,6 +3,10 @@
# #
# Generate a squashfs root and manifest # Generate a squashfs root and manifest
if [ -n "$SUBARCH" ]; then
exit 0
fi
apt-get -qqy install squashfs-tools apt-get -qqy install squashfs-tools
squashfs_f="${PWD}/livecd.ubuntu-cpc.squashfs" squashfs_f="${PWD}/livecd.ubuntu-cpc.squashfs"