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

update kernel snap building to match the new kernel policy

Browse Source
This commit is contained in:
Michael Vogt 2016-05-10 18:18:06 -07:00
parent 303bbfa418
commit d617d8f840
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.411) UNRELEASED; urgency=medium
* update kernel snap building to match the new kernel policy
-- Michael Vogt <michael.vogt@ubuntu.com> Tue, 10 May 2016 18:16:56 -0700
livecd-rootfs (2.410) yakkety; urgency=medium livecd-rootfs (2.410) yakkety; urgency=medium
* Rename old ubuntu-core tarballs to ubuntu-base to avoid confusion. * Rename old ubuntu-core tarballs to ubuntu-base to avoid confusion.

15
live-build/auto/build
View File

@ -451,8 +451,16 @@ case $PROJECT:$SUBPROJECT in
mkdir -p $TMPDIR/assets/ mkdir -p $TMPDIR/assets/
cd chroot cd chroot
cp -ar --parent lib/modules/ $TMPDIR/system/ cp -ar lib/modules/ $TMPDIR/system/
cp -ar --parent lib/firmware/ $TMPDIR/system/ cp -ar lib/firmware/ $TMPDIR/system/
# FIXME: compat with the old kernel spec/old initramfs that
# expects lib/{modules,firmware}
#
# FIXME2: update the initramfs-tools-ubuntu-core scripts/ubuntu-core
# to look at the new location
mkdir $TMPDIR/system/lib
ln -s $TMPDIR/system/modules $TMPDIR/system/lib
ln -s $TMPDIR/system/firmware $TMPDIR/system/lib
# new assets handling # new assets handling
if [ -f boot/vmlinu?-*.signed ]; then if [ -f boot/vmlinu?-*.signed ]; then
@ -562,8 +570,11 @@ EOF
cd $HERE/snap cd $HERE/snap
kernel="$(ls vmlinuz-*)" kernel="$(ls vmlinuz-*)"
initrd="$(ls initrd.img-*)" initrd="$(ls initrd.img-*)"
# old kernel spec
ln -s $kernel vmlinuz ln -s $kernel vmlinuz
ln -s $initrd initrd.img ln -s $initrd initrd.img
# new kernel spec
ln -s $kernel kernel.img
kvers="$(ls vmlinuz-*|sed 's/^.*vmlinuz-//;s/-[a-z.]*$//')" kvers="$(ls vmlinuz-*|sed 's/^.*vmlinuz-//;s/-[a-z.]*$//')"
VERSION=$kvers+$(date +20%y%m%d.%H-%M) VERSION=$kvers+$(date +20%y%m%d.%H-%M)