diff options
| -rw-r--r-- | Documentation/building/cross-building.md | 9 | ||||
| -rw-r--r-- | cross/arm-softfp/sources.list.jessie (renamed from cross/arm-softfp/sources.list) | 0 | ||||
| -rw-r--r-- | cross/arm/sources.list.trusty (renamed from cross/arm/sources.list) | 0 | ||||
| -rw-r--r-- | cross/arm/sources.list.vivid | 11 | ||||
| -rw-r--r-- | cross/arm/sources.list.wily | 11 | ||||
| -rw-r--r-- | cross/arm64/sources.list.trusty (renamed from cross/arm64/sources.list) | 0 | ||||
| -rw-r--r-- | cross/arm64/sources.list.vivid | 11 | ||||
| -rw-r--r-- | cross/arm64/sources.list.wily | 11 | ||||
| -rwxr-xr-x | cross/build-rootfs.sh | 31 |
9 files changed, 72 insertions, 12 deletions
diff --git a/Documentation/building/cross-building.md b/Documentation/building/cross-building.md index 9395084b85..30e8a08562 100644 --- a/Documentation/building/cross-building.md +++ b/Documentation/building/cross-building.md @@ -23,8 +23,9 @@ Generating the rootfs --------------------- The `cross\build-rootfs.sh` script can be used to download the files needed for cross compilation. It will generate an Ubuntu 14.04 rootfs as this is what CoreCLR targets. - Usage: build-rootfs.sh [BuildArch] - BuildArch can be: arm, arm64 + Usage: build-rootfs.sh [BuildArch] [UbuntuCodeName] + BuildArch can be: arm, arm-softfp, arm64 + UbuntuCodeName - optional, Code name for Ubuntu, can be: trusty(default), vivid, wily The `build-rootfs.sh` script must be run as root as it has to make some symlinks to the system, it will by default generate the rootfs in `cross\rootfs\<BuildArch>` however this can be changed by setting the `ROOTFS_DIR` environment variable. @@ -32,6 +33,10 @@ For example, to generate an arm rootfs: ben@ubuntu ~/git/coreclr/ $ sudo ./cross/build-rootfs.sh arm +You can choose Ubuntu code name to match your target, give `vivid` for `15.04`, `wily` for `15.10`. Default is `trusty`, version `14.04`. + + ben@ubuntu ~/git/coreclr/ $ sudo ./cross/build-rootfs.sh arm wily + and if you wanted to generate the rootfs elsewhere: ben@ubuntu ~/git/coreclr/ $ sudo ROOTFS_DIR=/home/ben/coreclr-cross/arm ./cross/build-rootfs.sh arm diff --git a/cross/arm-softfp/sources.list b/cross/arm-softfp/sources.list.jessie index 4d142ac9b1..4d142ac9b1 100644 --- a/cross/arm-softfp/sources.list +++ b/cross/arm-softfp/sources.list.jessie diff --git a/cross/arm/sources.list b/cross/arm/sources.list.trusty index 07d8f88d82..07d8f88d82 100644 --- a/cross/arm/sources.list +++ b/cross/arm/sources.list.trusty diff --git a/cross/arm/sources.list.vivid b/cross/arm/sources.list.vivid new file mode 100644 index 0000000000..0b1215e475 --- /dev/null +++ b/cross/arm/sources.list.vivid @@ -0,0 +1,11 @@ +deb http://ports.ubuntu.com/ubuntu-ports/ vivid main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ vivid main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ vivid-updates main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ vivid-updates main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ vivid-backports main restricted +deb-src http://ports.ubuntu.com/ubuntu-ports/ vivid-backports main restricted + +deb http://ports.ubuntu.com/ubuntu-ports/ vivid-security main restricted universe multiverse +deb-src http://ports.ubuntu.com/ubuntu-ports/ vivid-security main restricted universe multiverse
\ No newline at end of file diff --git a/cross/arm/sources.list.wily b/cross/arm/sources.list.wily new file mode 100644 index 0000000000..e23d1e02a0 --- /dev/null +++ b/cross/arm/sources.list.wily @@ -0,0 +1,11 @@ +deb http://ports.ubuntu.com/ubuntu-ports/ wily main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ wily main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ wily-updates main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ wily-updates main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ wily-backports main restricted +deb-src http://ports.ubuntu.com/ubuntu-ports/ wily-backports main restricted + +deb http://ports.ubuntu.com/ubuntu-ports/ wily-security main restricted universe multiverse +deb-src http://ports.ubuntu.com/ubuntu-ports/ wily-security main restricted universe multiverse
\ No newline at end of file diff --git a/cross/arm64/sources.list b/cross/arm64/sources.list.trusty index 07d8f88d82..07d8f88d82 100644 --- a/cross/arm64/sources.list +++ b/cross/arm64/sources.list.trusty diff --git a/cross/arm64/sources.list.vivid b/cross/arm64/sources.list.vivid new file mode 100644 index 0000000000..0b1215e475 --- /dev/null +++ b/cross/arm64/sources.list.vivid @@ -0,0 +1,11 @@ +deb http://ports.ubuntu.com/ubuntu-ports/ vivid main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ vivid main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ vivid-updates main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ vivid-updates main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ vivid-backports main restricted +deb-src http://ports.ubuntu.com/ubuntu-ports/ vivid-backports main restricted + +deb http://ports.ubuntu.com/ubuntu-ports/ vivid-security main restricted universe multiverse +deb-src http://ports.ubuntu.com/ubuntu-ports/ vivid-security main restricted universe multiverse
\ No newline at end of file diff --git a/cross/arm64/sources.list.wily b/cross/arm64/sources.list.wily new file mode 100644 index 0000000000..e23d1e02a0 --- /dev/null +++ b/cross/arm64/sources.list.wily @@ -0,0 +1,11 @@ +deb http://ports.ubuntu.com/ubuntu-ports/ wily main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ wily main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ wily-updates main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ wily-updates main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ wily-backports main restricted +deb-src http://ports.ubuntu.com/ubuntu-ports/ wily-backports main restricted + +deb http://ports.ubuntu.com/ubuntu-ports/ wily-security main restricted universe multiverse +deb-src http://ports.ubuntu.com/ubuntu-ports/ wily-security main restricted universe multiverse
\ No newline at end of file diff --git a/cross/build-rootfs.sh b/cross/build-rootfs.sh index 6e563d27ca..25a46a08a9 100755 --- a/cross/build-rootfs.sh +++ b/cross/build-rootfs.sh @@ -2,8 +2,9 @@ usage() { - echo "Usage: $0 [BuildArch]" + echo "Usage: $0 [BuildArch] [UbuntuCodeName]" echo "BuildArch can be: arm, arm-softfp, arm64" + echo "UbuntuCodeName - optional, Code name for Ubuntu, can be: trusty(default), vivid, wily. If BuildArch is arm-softfp, UbuntuCodeName is ignored." exit 1 } @@ -15,7 +16,8 @@ __InitialDir=$PWD __BuildArch=arm __UbuntuArch=armhf __UbuntuRepo="http://ports.ubuntu.com/" -__UbuntuPackages="build-essential lldb-3.6-dev libunwind8-dev gettext symlinks liblttng-ust-dev libicu-dev" +__UbuntuPackagesBase="build-essential libunwind8-dev gettext symlinks liblttng-ust-dev libicu-dev" +__UbuntuPackages="$__UbuntuPackagesBase" __MachineTriple=arm-linux-gnueabihf __UnprocessedBuildArgs= for i in "$@" @@ -29,27 +31,36 @@ for i in "$@" arm) __BuildArch=arm __UbuntuArch=armhf - __UbuntuRepo="http://ports.ubuntu.com/" - __UbuntuPackages="build-essential lldb-3.6-dev libunwind8-dev gettext symlinks liblttng-ust-dev libicu-dev" + __UbuntuPackages="$__UbuntuPackagesBase lldb-3.6-dev" __MachineTriple=arm-linux-gnueabihf ;; arm64) __BuildArch=arm64 __UbuntuArch=arm64 - __UbuntuRepo="http://ports.ubuntu.com/" - __UbuntuPackages="build-essential libunwind8-dev gettext symlinks liblttng-ust-dev libicu-dev" + __UbuntuPackages="$__UbuntuPackagesBase" __MachineTriple=aarch64-linux-gnu ;; arm-softfp) __BuildArch=arm-softfp __UbuntuArch=armel __UbuntuRepo="http://ftp.debian.org/debian/" - __UbuntuPackages="build-essential lldb-3.6-dev libunwind8-dev gettext symlinks liblttng-ust-dev libicu-dev" + __UbuntuPackages="$__UbuntuPackagesBase lldb-3.6-dev" __MachineTriple=arm-linux-gnueabi - __UbuntuCodeName=stable + __UbuntuCodeName=jessie + ;; + vivid) + if [ __UbuntuCodeName != "jessie" ]; then + __UbuntuCodeName=vivid + fi + ;; + wily) + if [ __UbuntuCodeName != "jessie" ]; then + __UbuntuCodeName=wily + fi ;; *) __UnprocessedBuildArgs="$__UnprocessedBuildArgs $i" + ;; esac done @@ -62,9 +73,9 @@ fi umount $__RootfsDir/* rm -rf $__RootfsDir qemu-debootstrap --arch $__UbuntuArch $__UbuntuCodeName $__RootfsDir $__UbuntuRepo -cp $__CrossDir/$__BuildArch/sources.list $__RootfsDir/etc/apt/sources.list +cp $__CrossDir/$__BuildArch/sources.list.$__UbuntuCodeName $__RootfsDir/etc/apt/sources.list chroot $__RootfsDir apt-get update +chroot $__RootfsDir apt-get -f -y install chroot $__RootfsDir apt-get -y install $__UbuntuPackages chroot $__RootfsDir symlinks -cr /usr umount $__RootfsDir/* - |