summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHyungju Lee <leee.lee@samsung.com>2018-08-10 14:28:30 +0900
committerGleb Balykov <g.balykov@samsung.com>2018-09-18 15:49:14 +0300
commit39130a7580a8f7ce16f425f164c5afd954789615 (patch)
treeb7f075e7f8bd04ad9cefa6a68a65ac04b700308a
parent71aa32dd3589b8082871b7c9ac7ad7866e8bfc58 (diff)
downloadcoreclr-39130a7580a8f7ce16f425f164c5afd954789615.tar.gz
coreclr-39130a7580a8f7ce16f425f164c5afd954789615.tar.bz2
coreclr-39130a7580a8f7ce16f425f164c5afd954789615.zip
[Tizen] Remove `tizen-release` package dependency for GBS build
`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.
-rwxr-xr-xbuild.sh7
-rwxr-xr-xpackaging/coreclr.spec8
2 files changed, 13 insertions, 2 deletions
diff --git a/build.sh b/build.sh
index 072c5919b2..d5791b026a 100755
--- a/build.sh
+++ b/build.sh
@@ -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