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

merged lp:~snappy-dev/livecd-rootfs/core_update and added some fixes

Browse Source
This commit is contained in:
Michael Vogt 2015-03-25 19:39:28 +01:00
commit 2b070c5a9e
2 changed files with 46 additions and 3 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.296) UNRELEASED; urgency=low
* merged lp:~snappy-dev/livecd-rootfs/core_update
to generate device tar conform hardware.yaml
-- Michael Vogt <michael.vogt@ubuntu.com> Wed, 25 Mar 2015 14:43:38 +0100
livecd-rootfs (2.295) vivid; urgency=medium livecd-rootfs (2.295) vivid; urgency=medium
* forcefully add ubuntu-system-settings-online-accounts to ubuntu-touch * forcefully add ubuntu-system-settings-online-accounts to ubuntu-touch

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

@ -2,23 +2,58 @@
# #
# move the kernel out into a new device tarfile with system/boot # move the kernel out into a new device tarfile with system/boot
set -e set -ex
echo "I: Moving kernel into device tarball" echo "I: Moving kernel into device tarball"
HERE="$(pwd)" HERE="$(pwd)"
TMPDIR="$(mktemp -d)" TMPDIR="$(mktemp -d)"
ARCH=$(dpkg --print-architecture)
mkdir -p $TMPDIR/system/ mkdir -p $TMPDIR/system/
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
cp -ar --parent boot/vmlinu?-* boot/initrd.img-* boot/abi-* boot/System.map-* $TMPDIR/system/ 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 --parent lib/modules/ $TMPDIR/system/ cp -ar --parent lib/modules/ $TMPDIR/system/
dtbs=$(find lib/firmware -type d -name 'device-tree' -print0)
[ -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/system cp -ar --parent vmlinu? initrd.img $TMPDIR/assets
cp -ar --parent vmlinu? initrd.img $TMPDIR/assets
fi fi
) )
# create hardware.yaml for u-boot
# this assumes armh == u-boot
# and all others grub
(
# common bits
cat > $TMPDIR/hardware.yaml << EOF
kernel: assets/vmlinuz
initrd: assets/initrd.img
partiton-layout: system-AB
EOF
# arch specific ones
if [ "$ARCH" = "armhf" ]; then
cat >> $TMPDIR/hardware.yaml << EOF
dtbs: assets/dtbs
bootloader: u-boot
EOF
else
cat >> $TMPDIR/hardware.yaml << EOF
bootloader: grub
EOF
fi
)
# and tar it up # and tar it up
( (
cd $TMPDIR cd $TMPDIR
@ -58,6 +93,7 @@ rm -rf $TMPDIR
rm -f initrd.img rm -f initrd.img
rm -f vmlinu? rm -f vmlinu?
rm -rf lib/modules rm -rf lib/modules
rm -rf lib/firmware
# remove walinuxagent # remove walinuxagent
if [ -e var/lib/dpkg/info/walinuxagent.list ]; then if [ -e var/lib/dpkg/info/walinuxagent.list ]; then
chroot . dpkg --purge walinuxagent || true chroot . dpkg --purge walinuxagent || true