Import patches-unapplied version 2.382 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 745856c1d8a7871fe5cabfe2285758082bf050b0

New changelog entries:
  * Remove the manta device from the list of touchsubarches as we're not
    building its kernel anymore (LP: #1553069).
This commit is contained in:
Łukasz 'sil2100' Zemczak 2016-03-04 09:47:31 +01:00 committed by usd-importer
parent 745856c1d8
commit a12aef0695
2 changed files with 8 additions and 1 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.382) xenial; urgency=medium
* Remove the manta device from the list of touchsubarches as we're not
building its kernel anymore (LP: #1553069).
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Fri, 04 Mar 2016 09:47:31 +0100
livecd-rootfs (2.381) xenial; urgency=medium
[ Ben Howard ]

View File

@ -609,7 +609,7 @@ if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-pd" ]; then
Chroot chroot "apt-get -y install android"
if [ "$ARCH" = "armhf" ]; then
touchsubarches="flo manta mako generic"
touchsubarches="flo mako generic"
for subarch in $touchsubarches; do
cp -v chroot/usr/share/android/product/*-preinstalled-system-armel+${subarch}.img\
"${PREFIX}.system-armel+${subarch}.img"