From a12aef0695b89d7deb3d53c71464a122d52b053d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Fri, 4 Mar 2016 09:47:31 +0100 Subject: [PATCH] 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). --- debian/changelog | 7 +++++++ live-build/auto/build | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8d0769de..8579e18f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Fri, 04 Mar 2016 09:47:31 +0100 + livecd-rootfs (2.381) xenial; urgency=medium [ Ben Howard ] diff --git a/live-build/auto/build b/live-build/auto/build index 56bc790f..5066c4bb 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -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"