From 9f572b68ebbcedfebd05c956c2137492cc403253 Mon Sep 17 00:00:00 2001
From: Steve Desmond <stevedesmond-ca@users.noreply.github.com>
Date: Wed, 19 Oct 2016 15:33:49 -0400
Subject: cross/build-rootfs.sh: fix default UbuntuPackages for default
 BuildArch (#7644)

* better default UbuntuPackages for default BuildArch
* Remove multiple sets of _UbuntuPackages to default
---
 cross/build-rootfs.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'cross')

diff --git a/cross/build-rootfs.sh b/cross/build-rootfs.sh
index 897f0b25cd..e4915a857e 100755
--- a/cross/build-rootfs.sh
+++ b/cross/build-rootfs.sh
@@ -17,10 +17,10 @@ __BuildArch=arm
 __UbuntuArch=armhf
 __UbuntuRepo="http://ports.ubuntu.com/"
 __UbuntuPackagesBase="build-essential libunwind8-dev gettext symlinks liblttng-ust-dev libicu-dev"
-__UbuntuPackages="$__UbuntuPackagesBase"
 if [ -z "$LLVM_ARM_HOME" ]; then
     __LLDB_Package="lldb-3.6-dev"
 fi
+__UbuntuPackages="$__UbuntuPackagesBase $__LLDB_Package"
 __MachineTriple=arm-linux-gnueabihf
 __UnprocessedBuildArgs=
 for i in "$@"
@@ -34,7 +34,6 @@ for i in "$@"
         arm)
         __BuildArch=arm
         __UbuntuArch=armhf
-        __UbuntuPackages="$__UbuntuPackagesBase $__LLDB_Package"
         __MachineTriple=arm-linux-gnueabihf
         ;;
         arm64)
@@ -47,7 +46,6 @@ for i in "$@"
         __BuildArch=arm-softfp
         __UbuntuArch=armel
         __UbuntuRepo="http://ftp.debian.org/debian/"
-        __UbuntuPackages="$__UbuntuPackagesBase $__LLDB_Package"
         __MachineTriple=arm-linux-gnueabi
         __UbuntuCodeName=jessie
         ;;
-- 
cgit v1.2.3