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

Import patches-unapplied version 2.37 to ubuntu/oneiric

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 3bad58702fb8351205853cc5ec7bf075c026cc95

New changelog entries:
  * BuildLiveCD: Fix typo that broke installing ubuntu-defaults-builder and
    its recommendations.
  * Squash errors from 'ls vmlinu?-*'.
This commit is contained in:
Colin Watson 2011-09-14 12:15:02 +01:00 committed by usd-importer
parent 3bad58702f
commit 720cdd5c88
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BuildLiveCD
View File

@ -115,7 +115,7 @@ for STE in $SUITES; do
sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -qq update || true
sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y dist-upgrade || true
sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y install livecd-rootfs || true
sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y --install-recommends ubuntu-defaults-builder || true
sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y --install-recommends install ubuntu-defaults-builder || true
fi
done
for STE in $SUITES; do

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.37) oneiric; urgency=low
* BuildLiveCD: Fix typo that broke installing ubuntu-defaults-builder and
its recommendations.
* Squash errors from 'ls vmlinu?-*'.
-- Colin Watson <cjwatson@ubuntu.com> Wed, 14 Sep 2011 12:15:02 +0100
livecd-rootfs (2.36) oneiric; urgency=low
[ Colin Watson ]

2
live-build/auto/build
View File

@ -146,7 +146,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?-*) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-* 2>/dev/null || true) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
if [ -z "$KVERS" ]; then
if [ -e "binary/$INITFS/vmlinuz" ]; then
# already renamed by ubuntu-defaults-image