diff options
author | Hyungju Lee <leee.lee@samsung.com> | 2018-08-10 14:28:30 +0900 |
---|---|---|
committer | Gleb Balykov <g.balykov@samsung.com> | 2018-08-14 13:54:21 +0300 |
commit | b043144f0ebcc525b69222b90bdc01732566f582 (patch) | |
tree | 59637991c3190589d71e75a4524a224db21a9409 | |
parent | d40913702377910dbef556810b6dd8ac56b2d800 (diff) | |
download | coreclr-b043144f0ebcc525b69222b90bdc01732566f582.tar.gz coreclr-b043144f0ebcc525b69222b90bdc01732566f582.tar.bz2 coreclr-b043144f0ebcc525b69222b90bdc01732566f582.zip |
[Tizen] Remove `tizen-release` package dependency for GBS buildsubmit/tizen_base/20180814.111558accepted/tizen/base/20180818.050555
`tizen-release` package holds variables that need to be defined at the
unified build. Therefore, it is about to move to unified while coreclr
stays at the base. So, the local os-release file is introduced.
Change-Id: I4d6e2bd38315750727802e8470af0eade7b83653
-rwxr-xr-x | build.sh | 7 | ||||
-rwxr-xr-x | packaging/coreclr.spec | 8 |
2 files changed, 13 insertions, 2 deletions
@@ -83,6 +83,13 @@ initHostDistroRid() if [[ $redhatRelease == "CentOS release 6."* || $redhatRelease == "Red Hat Enterprise Linux Server release 6."* ]]; then __HostDistroRid="rhel.6-$__HostArch" fi + elif [ -e os-release ]; then + echo "Build using local os-release file !!!" + source os-release + if [[ $ID == "tizen" ]]; then + __HostArch=armel + export __HostDistroRid="$ID.$VERSION_ID-$__HostArch" + fi fi fi if [ "$__HostOS" == "FreeBSD" ]; then diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec index 3acaa9b61c..04c2cdc7fb 100755 --- a/packaging/coreclr.spec +++ b/packaging/coreclr.spec @@ -28,7 +28,7 @@ BuildRequires: pkgconfig(libunwind) BuildRequires: pkgconfig(uuid) # System.Globalization.Native.so BuildRequires: libicu-devel -BuildRequires: tizen-release +#BuildRequires: tizen-release # No matter what tizen-release package you use in any profile AutoReq: 0 Requires: glibc @@ -112,7 +112,11 @@ The MSCORLIB.DLL for .NET Core Runtime (coreclr) %prep %setup -q -n %{name}-%{version} cp %{SOURCE1} . - +cat > os-release <<EOF +NAME=Tizen +ID=tizen +VERSION_ID=%{tizen_version_major}.%{tizen_version_minor}.%{tizen_version_patch} +EOF %if 0%{skipmscorlib} %else |