diff options
| author | Matt Ellis <matell@microsoft.com> | 2016-05-25 12:37:23 -0700 |
|---|---|---|
| committer | Matt Ellis <matell@microsoft.com> | 2016-05-26 18:50:40 -0700 |
| commit | ba385ce8b44e2018579cf3a52e34c3980a82b5c4 (patch) | |
| tree | 9df509d90de9c26bd810b995a229f2fe940e7653 /build-packages.sh | |
| parent | 5e40c4dbfd67fa996fb6cea9842a433b8976e1ed (diff) | |
| download | coreclr-ba385ce8b44e2018579cf3a52e34c3980a82b5c4.tar.gz coreclr-ba385ce8b44e2018579cf3a52e34c3980a82b5c4.tar.bz2 coreclr-ba385ce8b44e2018579cf3a52e34c3980a82b5c4.zip | |
Add Fedora, OpenSuse and Ubuntu 16.04 packages
- Add packages for Fedora 23 and OpenSuse 13.2
- Move the package authoring for Ubuntu into versioned folders
- Update our selection logic for what to produce to be based on an
actual RID instead of just a distro name, since that's now not enough
with us building for two Ubuntu versions
Diffstat (limited to 'build-packages.sh')
| -rwxr-xr-x | build-packages.sh | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/build-packages.sh b/build-packages.sh index c6580bd00d..0403c3f1f0 100755 --- a/build-packages.sh +++ b/build-packages.sh @@ -103,18 +103,13 @@ case $OSName in esac if [ "$__BuildOS" == "Linux" ]; then - # Detect Distro - if [ "$(cat /etc/*-release | grep -cim1 ubuntu)" -eq 1 ]; then - export __DistroName=ubuntu - elif [ "$(cat /etc/*-release | grep -cim1 centos)" -eq 1 ]; then - export __DistroName=rhel - elif [ "$(cat /etc/*-release | grep -cim1 rhel)" -eq 1 ]; then - export __DistroName=rhel - elif [ "$(cat /etc/*-release | grep -cim1 debian)" -eq 1 ]; then - export __DistroName=debian - else - export __DistroName="" - fi + if [ ! -e /etc/os-release ]; then + echo "WARNING: Can not determine runtime id for current distro." + export __DistroRid="" + else + source /etc/os-release + export __DistroRid="$ID.$VERSION_ID-$__BuildArch" + fi fi __IntermediatesDir="$__ProjectRoot/bin/obj/$__BuildOS.$__BuildArch.$__BuildType" |