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

Refactor ubuntu-cpc hooks to always produce a 'plain' rootfs via

Browse Source 
live-build and reuse this for the tarball, instead of lb_binary_rootfs
creating some artifact that we ignore / throw away.
This commit is contained in:
Steve Langasek 2016-02-09 12:22:13 -08:00
parent 375554f157
commit 0b279f731b
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/changelog vendored
View File

@ -35,6 +35,11 @@ livecd-rootfs (2.376ubuntu1) UNRELEASED; urgency=medium
* Chroot to execute zipl, because it's nice. * Chroot to execute zipl, because it's nice.
* Use the right loop device to install zipl onto. * Use the right loop device to install zipl onto.
[ Steve Langasek ]
* Refactor ubuntu-cpc hooks to always produce a 'plain' rootfs via
live-build and reuse this for the tarball, instead of lb_binary_rootfs
creating some artifact that we ignore / throw away.
-- Ben Howard <ben.howard@ubuntu.com> Sun, 07 Feb 2016 16:59:41 -0700 -- Ben Howard <ben.howard@ubuntu.com> Sun, 07 Feb 2016 16:59:41 -0700
livecd-rootfs (2.375) xenial; urgency=medium livecd-rootfs (2.375) xenial; urgency=medium

14
live-build/auto/config
View File

@ -101,6 +101,12 @@ add_binary_hook ()
BINARY_HOOKS="${BINARY_HOOKS:+$BINARY_HOOKS }$1" BINARY_HOOKS="${BINARY_HOOKS:+$BINARY_HOOKS }$1"
} }
case $PROJECT in
ubuntu-cpc)
IMAGEFORMAT=plain
;;
esac
case $IMAGEFORMAT in case $IMAGEFORMAT in
ext2|ext3|ext4) ext2|ext3|ext4)
OPTS="${OPTS:+$OPTS }--initramfs none --chroot-filesystem $IMAGEFORMAT" OPTS="${OPTS:+$OPTS }--initramfs none --chroot-filesystem $IMAGEFORMAT"
@ -111,13 +117,7 @@ case $IMAGEFORMAT in
COMPONENTS='main restricted universe multiverse' COMPONENTS='main restricted universe multiverse'
;; ;;
*) *)
case $PROJECT in add_package live jasper
ubuntu-cpc)
;;
*)
add_package live jasper
;;
esac
;; ;;
esac esac
;; ;;

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

@ -5,10 +5,6 @@ if [ -n "$SUBARCH" ]; then
exit 0 exit 0
fi fi
mkdir binary/boot/filesystem.dir
cp -a chroot/* binary/boot/filesystem.dir
mount --bind /dev "binary/boot/filesystem.dir/dev" mount --bind /dev "binary/boot/filesystem.dir/dev"
mount proc-live -t proc "binary/boot/filesystem.dir/proc" mount proc-live -t proc "binary/boot/filesystem.dir/proc"
mount sysfs-live -t sysfs "binary/boot/filesystem.dir/sys" mount sysfs-live -t sysfs "binary/boot/filesystem.dir/sys"