Import patches-unapplied version 2.17 to ubuntu/oneiric

Imported using git-ubuntu import.

Changelog parent: 648f92a9a6f8896723fa75c5d754907e8693f1f5

New changelog entries:
  * Only set KERNEL_FLAVOURS to SUBARCH if SUBARCH is already set.
This commit is contained in:
Adam Conrad 2011-07-15 14:55:13 -06:00 committed by usd-importer
parent 648f92a9a6
commit 5f2fbb762b
2 changed files with 7 additions and 1 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.17) oneiric; urgency=low
* Only set KERNEL_FLAVOURS to SUBARCH if SUBARCH is already set.
-- Adam Conrad <adconrad@ubuntu.com> Fri, 15 Jul 2011 14:55:13 -0600
livecd-rootfs (2.16) oneiric; urgency=low
* Add support for building new "ubuntu-core" rootfs tarballs:

View File

@ -171,7 +171,7 @@ esac
case $ARCH in
armel)
KERNEL_FLAVOURS="$SUBARCH"
KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}"
case $SUBARCH in
dove)
BINARY_REMOVE_LINUX=false