From 4f2d97ace8643614eb65b7c7994be1100937fc21 Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Thu, 9 Mar 2017 23:27:55 +0100 Subject: [PATCH] Support cross compiling for Zesty (dotnet/coreclr#10066) * Support Zesty, newer liblldb packages * Describe lldb options Commit migrated from https://github.com/dotnet/coreclr/commit/edb21e4087b8496924806f7bd7261b8876327120 --- src/coreclr/cross/arm/sources.list.zesty | 11 +++++++++++ src/coreclr/cross/arm64/sources.list.zesty | 11 +++++++++++ src/coreclr/cross/build-rootfs.sh | 15 +++++++++++++-- 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 src/coreclr/cross/arm/sources.list.zesty create mode 100644 src/coreclr/cross/arm64/sources.list.zesty diff --git a/src/coreclr/cross/arm/sources.list.zesty b/src/coreclr/cross/arm/sources.list.zesty new file mode 100644 index 0000000..ea2c14a --- /dev/null +++ b/src/coreclr/cross/arm/sources.list.zesty @@ -0,0 +1,11 @@ +deb http://ports.ubuntu.com/ubuntu-ports/ zesty main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ zesty-updates main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-updates main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ zesty-backports main restricted +deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-backports main restricted + +deb http://ports.ubuntu.com/ubuntu-ports/ zesty-security main restricted universe multiverse +deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-security main restricted universe multiverse diff --git a/src/coreclr/cross/arm64/sources.list.zesty b/src/coreclr/cross/arm64/sources.list.zesty new file mode 100644 index 0000000..ea2c14a --- /dev/null +++ b/src/coreclr/cross/arm64/sources.list.zesty @@ -0,0 +1,11 @@ +deb http://ports.ubuntu.com/ubuntu-ports/ zesty main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ zesty-updates main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-updates main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ zesty-backports main restricted +deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-backports main restricted + +deb http://ports.ubuntu.com/ubuntu-ports/ zesty-security main restricted universe multiverse +deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-security main restricted universe multiverse diff --git a/src/coreclr/cross/build-rootfs.sh b/src/coreclr/cross/build-rootfs.sh index d1d79bb..6ef286d 100755 --- a/src/coreclr/cross/build-rootfs.sh +++ b/src/coreclr/cross/build-rootfs.sh @@ -4,8 +4,8 @@ usage() { echo "Usage: $0 [BuildArch] [LinuxCodeName] [lldbx.y] [--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 "LinuxCodeName - optional, Code name for Linux, can be: trusty(default), vivid, wily, xenial, zesty. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen." + echo "lldbx.y - optional, LLDB version, can be: lldb3.6(default), lldb3.8, lldb3.9, lldb4.0, no-lldb" echo "--skipunmount - optional, will skip the unmount of rootfs folder." exit 1 } @@ -70,6 +70,12 @@ for i in "$@" ; do lldb3.8) __LLDB_Package="lldb-3.8-dev" ;; + lldb3.9) + __LLDB_Package="lldb-3.9-dev" + ;; + lldb4.0) + __LLDB_Package="lldb-4.0-dev" + ;; no-lldb) unset __LLDB_Package ;; @@ -88,6 +94,11 @@ for i in "$@" ; do __LinuxCodeName=xenial fi ;; + zesty) + if [ "$__LinuxCodeName" != "jessie" ]; then + __LinuxCodeName=zesty + fi + ;; jessie) __LinuxCodeName=jessie __UbuntuRepo="http://ftp.debian.org/debian/" -- 2.7.4