From 096399a05c64e7f9be30817f035e8198057cd511 Mon Sep 17 00:00:00 2001 From: Raul Hidalgo Caballero Date: Wed, 24 Oct 2018 13:26:34 +0200 Subject: [PATCH] Add Bionic to sources.list for cross (dotnet/core-setup#4623) * Create sources.list.bionic * Create sources.list.bionic * Create sources.list.bionic * Update build-rootfs.sh Commit migrated from https://github.com/dotnet/core-setup/commit/761d1f769fbb80f16cc08acd7ff6088aa536e177 --- src/installer/cross/arm/sources.list.bionic | 11 +++++++++++ src/installer/cross/arm64/sources.list.bionic | 11 +++++++++++ src/installer/cross/build-rootfs.sh | 7 ++++++- src/installer/cross/x86/sources.list.bionic | 11 +++++++++++ 4 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 src/installer/cross/arm/sources.list.bionic create mode 100644 src/installer/cross/arm64/sources.list.bionic create mode 100644 src/installer/cross/x86/sources.list.bionic diff --git a/src/installer/cross/arm/sources.list.bionic b/src/installer/cross/arm/sources.list.bionic new file mode 100644 index 0000000..2109557 --- /dev/null +++ b/src/installer/cross/arm/sources.list.bionic @@ -0,0 +1,11 @@ +deb http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted +deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted + +deb http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse +deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse diff --git a/src/installer/cross/arm64/sources.list.bionic b/src/installer/cross/arm64/sources.list.bionic new file mode 100644 index 0000000..2109557 --- /dev/null +++ b/src/installer/cross/arm64/sources.list.bionic @@ -0,0 +1,11 @@ +deb http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted +deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted + +deb http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse +deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse diff --git a/src/installer/cross/build-rootfs.sh b/src/installer/cross/build-rootfs.sh index ec6af48..805948c 100755 --- a/src/installer/cross/build-rootfs.sh +++ b/src/installer/cross/build-rootfs.sh @@ -4,7 +4,7 @@ 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, zesty, alpine. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen." + echo "LinuxCodeName - optional, Code name for Linux, can be: trusty(default), vivid, wily, xenial, zesty, bionic, alpine. 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. Ignored for alpine" echo "--skipunmount - optional, will skip the unmount of rootfs folder." exit 1 @@ -118,6 +118,11 @@ for i in "$@" ; do __LinuxCodeName=zesty fi ;; + bionic) + if [ "$__LinuxCodeName" != "jessie" ]; then + __LinuxCodeName=bionic + fi + ;; jessie) __LinuxCodeName=jessie __UbuntuRepo="http://ftp.debian.org/debian/" diff --git a/src/installer/cross/x86/sources.list.bionic b/src/installer/cross/x86/sources.list.bionic new file mode 100644 index 0000000..a71ccad --- /dev/null +++ b/src/installer/cross/x86/sources.list.bionic @@ -0,0 +1,11 @@ +deb http://archive.ubuntu.com/ubuntu/ bionic main restricted universe +deb-src http://archive.ubuntu.com/ubuntu/ bionic main restricted universe + +deb http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe +deb-src http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe + +deb http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted +deb-src http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted + +deb http://archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse +deb-src http://archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse -- 2.7.4