* live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary:

- ignore /vmlinu?, /initrd.img symlinks when building the boot assets
This commit is contained in:
Michael Vogt 2015-06-09 11:19:31 +02:00
parent 01ae2ce538
commit 7245efa89f
2 changed files with 13 additions and 6 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.311) UNRELEASED; urgency=low
* live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary:
- ignore /vmlinu?, /initrd.img symlinks when building the boot assets
-- Michael Vogt <michael.vogt@ubuntu.com> Tue, 09 Jun 2015 09:46:41 +0200
livecd-rootfs (2.311) wily; urgency=medium
* Updates users and groups for desktop next

View File

@ -25,18 +25,18 @@ mkdir -p $TMPDIR/assets/
cp -ar --parent lib/firmware/ $TMPDIR/system/
# new assets handling
# FIXME:
# - how to keep version information (and do we care)
cp -ar boot/vmlinu?-* $TMPDIR/assets/vmlinuz
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/abi-* boot/System.map-* $TMPDIR/assets/
dtbs=$(find lib/firmware -type d -name 'device-tree' -print0)
[ -n "$dtbs" ] && mv "$dtbs" $TMPDIR/assets/dtbs
if [ -e vmlinu? ] && [ -e initrd.img ]; then
cp -ar --parent vmlinu? initrd.img $TMPDIR/assets
cp -ar --parent vmlinu? initrd.img $TMPDIR/assets
if [ -n "$dtbs" ]; then
mv "$dtbs" $TMPDIR/assets/dtbs
fi
)
# create hardware.yaml for u-boot
# this assumes armh == u-boot
# and all others grub