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

Import patches-unapplied version 2.3 to ubuntu/oneiric

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 757cfb724fa34dad889175ccee95fc8163962c3e

New changelog entries:
  * Set pipefail (bash-specific) in auto/build so that we fail immediately
    if the main image build fails.
  * Anchor regex to avoid misdetecting vmlinux-3.0-0-powerpc64-smp as a
    powerpc flavour kernel.
This commit is contained in:
Colin Watson 2011-06-14 09:16:43 +01:00 committed by usd-importer
parent 757cfb724f
commit d53152166c
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
livecd-rootfs (2.3) oneiric; urgency=low
* Set pipefail (bash-specific) in auto/build so that we fail immediately
if the main image build fails.
* Anchor regex to avoid misdetecting vmlinux-3.0-0-powerpc64-smp as a
powerpc flavour kernel.
-- Colin Watson <cjwatson@ubuntu.com> Tue, 14 Jun 2011 09:16:43 +0100
livecd-rootfs (2.2) oneiric; urgency=low livecd-rootfs (2.2) oneiric; urgency=low
* Pass --linux-flavours to lb config if necessary. * Pass --linux-flavours to lb config if necessary.

5
live-build/auto/build
View File

@ -1,5 +1,6 @@
#! /bin/sh #! /bin/bash
set -e set -e
set -o pipefail
export LC_ALL=C export LC_ALL=C
@ -59,7 +60,7 @@ for OUTPUT in ext2 ext3 manifest manifest-remove size squashfs; do
done done
for FLAVOUR in $LB_LINUX_FLAVOURS; do for FLAVOUR in $LB_LINUX_FLAVOURS; do
KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-*) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)/\\1/p" )" KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-*) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
if [ -z "$KVERS" ]; then if [ -z "$KVERS" ]; then
echo "No kernel output for $FLAVOUR!" >&2 echo "No kernel output for $FLAVOUR!" >&2
exit 1 exit 1