From 8576454a13c8d01c79fe5d469270ff7b9069713f Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Fri, 19 Aug 2011 14:29:10 +0200 Subject: [PATCH] Import patches-unapplied version 2.29 to ubuntu/oneiric Imported using git-ubuntu import. Changelog parent: 26a8853159e5c47e8498f3f07388775da8f92d26 New changelog entries: * rename ac100 bootimage to something the build system can parse easier. --- debian/changelog | 6 ++++++ live-build/auto/build | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 04b2a1fe..2f6881a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.29) oneiric; urgency=low + + * rename ac100 bootimage to something the build system can parse easier. + + -- Oliver Grawert Fri, 19 Aug 2011 14:29:10 +0200 + livecd-rootfs (2.28) oneiric; urgency=low * Switch ubuntu-dvd to ubuntu-usb and ubuntu-usb-live tasks. diff --git a/live-build/auto/build b/live-build/auto/build index 016d2665..09c8d4fa 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -184,7 +184,7 @@ if [ "$SUBARCH" = "ac100" ]; then lb chroot_sysfs remove "$@" lb chroot_proc remove "$@" - cp "chroot/boot/installer-${KVERS}.img" "$PREFIX.installer-$FLAVOUR.img" + cp "chroot/boot/installer-${KVERS}.img" "$PREFIX.bootimg-$FLAVOUR" fi # LTSP chroot building (only in 32bit and for Edubuntu (DVD))