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

Import patches-unapplied version 2.327 to ubuntu/wily-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: d61ed6ef41f71a97dfe529c8ee7812f6d4ad1257

New changelog entries:
  * merge lp:~sergiusens/livecd-rootfs/snappyDevicePart for using versioned
    kernel and initrd binaries in snappy
This commit is contained in:
Oliver Grawert 2015-07-08 17:46:36 +02:00 committed by usd-importer
parent d61ed6ef41
commit 9eaa1cb0b2
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.327) wily; urgency=medium
* merge lp:~sergiusens/livecd-rootfs/snappyDevicePart for using versioned
kernel and initrd binaries in snappy
-- Oliver Grawert <ogra@ubuntu.com> Wed, 08 Jul 2015 17:46:36 +0200
livecd-rootfs (2.326) wily; urgency=medium livecd-rootfs (2.326) wily; urgency=medium
* snappy: install libc6:i386 on amd64 images for multiarch support out of * snappy: install libc6:i386 on amd64 images for multiarch support out of

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

@ -16,39 +16,34 @@ mkdir -p $TMPDIR/assets/
( (
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/modules/ $TMPDIR/system/
cp -ar --parent lib/firmware/ $TMPDIR/system/ cp -ar --parent lib/firmware/ $TMPDIR/system/
# new assets handling # new assets handling
# FIXME:
# - how to keep version information (and do we care)
if [ -f boot/vmlinu?-*.signed ]; then if [ -f boot/vmlinu?-*.signed ]; then
cp -ar boot/vmlinu?-*.signed $TMPDIR/assets/vmlinuz kernel=boot/vmlinu?-*.signed
else else
cp -ar boot/vmlinu?-* $TMPDIR/assets/vmlinuz kernel=boot/vmlinu?-*
fi fi
cp -ar boot/initrd.img-* $TMPDIR/assets/initrd.img
initrd=boot/initrd.img-*
cp -ar "$initrd" $TMPDIR/assets/
cp -ar "$kernel" $TMPDIR/assets/
cp -ar 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) dtbs=$(find lib/firmware -type d -name 'device-tree' -print0)
if [ -n "$dtbs" ]; then if [ -n "$dtbs" ]; then
mv "$dtbs" $TMPDIR/assets/dtbs mv "$dtbs" $TMPDIR/assets/dtbs
fi fi
)
# create hardware.yaml for u-boot # create hardware.yaml
# this assumes armh == u-boot # this assumes armh == u-boot
# and all others grub # and all others grub
( # common bits
# common bits
cat > $TMPDIR/hardware.yaml << EOF cat > $TMPDIR/hardware.yaml << EOF
kernel: assets/vmlinuz kernel: assets/$(basename "$kernel")
initrd: assets/initrd.img initrd: assets/$(basename "$initrd")
partition-layout: system-AB partition-layout: system-AB
EOF EOF