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

add compability handling for current u-d-f/grub when extracting

Browse Source 
the device tarball
This commit is contained in:
Michael Vogt 2015-03-26 15:43:09 +01:00
parent 2b070c5a9e
commit c82069baf6
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -1,7 +1,9 @@
livecd-rootfs (2.296) UNRELEASED; urgency=low livecd-rootfs (2.296~ppa1) vivid; urgency=low
* merged lp:~snappy-dev/livecd-rootfs/core_update * merged lp:~snappy-dev/livecd-rootfs/core_update
to generate device tar conform hardware.yaml to generate device tar conform hardware.yaml
* add compability handling for current u-d-f/grub when extracting
the device tarball
-- Michael Vogt <michael.vogt@ubuntu.com> Wed, 25 Mar 2015 14:43:38 +0100 -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 25 Mar 2015 14:43:38 +0100

13
live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary
View File

@ -15,16 +15,23 @@ mkdir -p $TMPDIR/assets/
# cp files, we can't simply use tar --transform as it changes the symlink target # cp files, we can't simply use tar --transform as it changes the symlink target
( (
cd binary/boot/filesystem.dir cd binary/boot/filesystem.dir
# for compatibility with current grub/u-d-f
cp -ar --parent boot/vmlinu?-* boot/initrd.img-* boot/abi-* boot/System.map-* $TMPDIR/system/
if [ -e vmlinu? ] && [ -e initrd.img ]; then
cp -ar --parent vmlinu? initrd.img $TMPDIR/system
fi
cp -ar --parent lib/modules/ $TMPDIR/system/
cp -ar --parent lib/firmware/ $TMPDIR/system/
# new assets handling
cp -ar boot/vmlinu?-* $TMPDIR/assets/vmlinuz cp -ar boot/vmlinu?-* $TMPDIR/assets/vmlinuz
cp -ar boot/initrd.img-* $TMPDIR/assets/initrd.img cp -ar boot/initrd.img-* $TMPDIR/assets/initrd.img
cp -ar boot/vmlinu?-* boot/initrd.img-* boot/abi-* boot/System.map-* $TMPDIR/assets/ cp -ar boot/vmlinu?-* boot/initrd.img-* boot/abi-* boot/System.map-* $TMPDIR/assets/
cp -ar --parent lib/modules/ $TMPDIR/system/
dtbs=$(find lib/firmware -type d -name 'device-tree' -print0) dtbs=$(find lib/firmware -type d -name 'device-tree' -print0)
[ -n "$dtbs" ] && mv "$dtbs" $TMPDIR/assets/dtbs [ -n "$dtbs" ] && mv "$dtbs" $TMPDIR/assets/dtbs
cp -ar --parent lib/firmware/ $TMPDIR/system/
if [ -e vmlinu? ] && [ -e initrd.img ]; then if [ -e vmlinu? ] && [ -e initrd.img ]; then
cp -ar --parent vmlinu? initrd.img $TMPDIR/assets cp -ar --parent vmlinu? initrd.img $TMPDIR/assets
cp -ar --parent vmlinu? initrd.img $TMPDIR/assets cp -ar --parent vmlinu? initrd.img $TMPDIR/assets