Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900

external/corefx/cross/build-rootfs.sh

@@ -2,15 +2,22 @@
 
 usage()
 {
-    echo "Usage: $0 [BuildArch] [LinuxCodeName] [--SkipUnmount]"
-    echo "BuildArch can be: arm, armel, arm64, x86"
-    echo "LinuxCodeName - optional, Code name for Ubuntu, can be: trusty(default), vivid, wily, xenial. If BuildArch is armel, jessie(default) or tizen."
-    echo "[--SkipUnmount] - do not unmount rootfs folders."
+    echo "Usage: $0 [BuildArch] [LinuxCodeName] [--skipunmount]"
+    echo "BuildArch can be: arm(default), armel, arm64, x86"
+    echo "LinuxCodeName - optional, Code name for Linux, can be: trusty(default), vivid, wily, xenial. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen."
+    echo "lldbx.y - optional, LLDB version, can be: lldb3.6(default), lldb3.8, no-lldb"
+    echo "--skipunmount - optional, will skip the unmount of rootfs folder."
     exit 1
 }
 
+__LinuxCodeName=trusty
 __CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 __InitialDir=$PWD
+__BuildArch=arm
+__UbuntuArch=armhf
+__UbuntuRepo="http://ports.ubuntu.com/"
+__LLDB_Package="lldb-3.6-dev"
+__SkipUnmount=0
 
 # base development support
 __UbuntuPackages="build-essential"
@@ -20,27 +27,16 @@ __UbuntuPackages+=" symlinks"
 
 # CoreCLR and CoreFX dependencies
 __UbuntuPackages+=" gettext"
-__UbuntuPackages+=" libcurl4-openssl-dev"
-__UbuntuPackages+=" libicu-dev"
-__UbuntuPackages+=" libkrb5-dev"
-__UbuntuPackages+=" liblttng-ust-dev"
-__UbuntuPackages+=" libssl-dev"
 __UbuntuPackages+=" libunwind8-dev"
+__UbuntuPackages+=" liblttng-ust-dev"
+__UbuntuPackages+=" libicu-dev"
+
+# CoreFX dependencies
+__UbuntuPackages+=" libcurl4-openssl-dev"
+__UbuntuPackages+=" libkrb5-dev"
+__UbuntuPackages+=" libssl-dev"
 __UbuntuPackages+=" zlib1g-dev"
 
-if [ -z "$LLVM_ARM_HOME" ]; then
-    __LLDB_Package="lldb-3.6-dev"
-fi
- 
-
-
-__BuildArch=arm
-__UbuntuArch=armhf
-__LinuxCodeName=trusty
-__UbuntuRepo="http://ports.ubuntu.com/"
-__MachineTriple=arm-linux-gnueabihf
-__SkipUnmount=0
-
 __UnprocessedBuildArgs=
 for i in "$@" ; do
     lowerI="$(echo $i | awk '{print tolower($0)}')"
@@ -49,31 +45,34 @@ for i in "$@" ; do
             usage
             exit 1
             ;;
-        --skipunmount)
-            __SkipUnmount=1
-            ;;
         arm)
             __BuildArch=arm
             __UbuntuArch=armhf
-            __MachineTriple=arm-linux-gnueabihf
             ;;
         arm64)
             __BuildArch=arm64
             __UbuntuArch=arm64
-            __MachineTriple=aarch64-linux-gnu
-            ;;
-        x86)
-            __BuildArch=x86
-            __UbuntuArch=i386
-            __UbuntuRepo="http://archive.ubuntu.com/ubuntu"
             ;;
         armel)
             __BuildArch=armel
             __UbuntuArch=armel
             __UbuntuRepo="http://ftp.debian.org/debian/"
-            __MachineTriple=arm-linux-gnueabi
             __LinuxCodeName=jessie
             ;;
+        x86)
+            __BuildArch=x86
+            __UbuntuArch=i386
+            __UbuntuRepo="http://archive.ubuntu.com/ubuntu/"
+            ;;
+        lldb3.6)
+            __LLDB_Package="lldb-3.6-dev"
+            ;;
+        lldb3.8)
+            __LLDB_Package="lldb-3.8-dev"
+            ;;
+        no-lldb)
+            unset __LLDB_Package
+            ;;
         vivid)
             if [ "$__LinuxCodeName" != "jessie" ]; then
                 __LinuxCodeName=vivid
@@ -95,7 +94,7 @@ for i in "$@" ; do
             ;;
         tizen)
             if [ "$__BuildArch" != "armel" ]; then
-                echo "Tizen is available only for armel"
+                echo "Tizen is available only for armel."
                 usage;
                 exit 1;
             fi
@@ -103,20 +102,19 @@ for i in "$@" ; do
             __UbuntuRepo=
             __Tizen=tizen
             ;;
+        --skipunmount)
+            __SkipUnmount=1
+            ;;
         *)
             __UnprocessedBuildArgs="$__UnprocessedBuildArgs $i"
             ;;
     esac
 done
 
-if [[ "$__BuildArch" == "arm" ]]; then
-    __UbuntuPackages+=" ${__LLDB_Package:-}"
-fi
-
-if [ "$__BuildArch" == "armel" ]; then  
+if [ "$__BuildArch" == "armel" ]; then
     __LLDB_Package="lldb-3.5-dev"
-    __UbuntuPackages+=" ${__LLDB_Package:-}"
-fi 
+fi
+__UbuntuPackages+=" ${__LLDB_Package:-}"
 
 __RootfsDir="$__CrossDir/rootfs/$__BuildArch"
 
@@ -124,12 +122,13 @@ if [[ -n "$ROOTFS_DIR" ]]; then
     __RootfsDir=$ROOTFS_DIR
 fi
 
-if [ $__SkipUnmount == 0 ]; then
-    umount $__RootfsDir/*
+if [ -d "$__RootfsDir" ]; then
+    if [ $__SkipUnmount == 0 ]; then
+        umount $__RootfsDir/*
+    fi
+    rm -rf $__RootfsDir
 fi
 
-rm -rf $__RootfsDir
-
 if [[ -n $__LinuxCodeName ]]; then
     qemu-debootstrap --arch $__UbuntuArch $__LinuxCodeName $__RootfsDir $__UbuntuRepo
     cp $__CrossDir/$__BuildArch/sources.list.$__LinuxCodeName $__RootfsDir/etc/apt/sources.list
@@ -142,6 +141,11 @@ if [[ -n $__LinuxCodeName ]]; then
         umount $__RootfsDir/*
     fi
 
+    if [[ "$__BuildArch" == "arm" && "$__LinuxCodeName" == "trusty" ]]; then
+        pushd $__RootfsDir
+        patch -p1 < $__CrossDir/$__BuildArch/trusty.patch
+        popd
+    fi
 elif [ "$__Tizen" == "tizen" ]; then
     ROOTFS_DIR=$__RootfsDir $__CrossDir/$__BuildArch/tizen-build-rootfs.sh
 else