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

Import patches-unapplied version 2.103 to ubuntu/raring-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 164ac67eb48ebe22134caa8e2a5d5e43595287eb

New changelog entries:
  * live-build/auto/build: Exclude all *.efi* files from kernel version
    detection (i.e. including *.efi.signature), not just *.efi.signed.
This commit is contained in:
Colin Watson 2012-11-21 22:31:46 +00:00 committed by usd-importer
parent 164ac67eb4
commit 394b1e1116
2 changed files with 8 additions and 1 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.103) raring; urgency=low
* live-build/auto/build: Exclude all *.efi* files from kernel version
detection (i.e. including *.efi.signature), not just *.efi.signed.
-- Colin Watson <cjwatson@ubuntu.com> Wed, 21 Nov 2012 22:31:46 +0000
livecd-rootfs (2.102) raring; urgency=low
* create the nexus7 rootfs image with .ext4 as suffix instead of using

2
live-build/auto/build
View File

@ -320,7 +320,7 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
if [ -z "$LB_LINUX_FLAVOURS" ] || [ "$LB_LINUX_FLAVOURS" = "none" ]; then
continue
fi
KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-* 2>/dev/null || true) | fgrep -v .efi.signed | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-* 2>/dev/null || true) | fgrep -v .efi | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
if [ -z "$KVERS" ]; then
if [ -e "binary/$INITFS/vmlinuz" ]; then
# already renamed by ubuntu-defaults-image