Revert "[Tizen] Remove `tizen-release` package dependency for GBS build"
authorHyungju Lee <leee.lee@samsung.com>
Wed, 12 Dec 2018 22:52:58 +0000 (07:52 +0900)
committer이형주/Tizen Platform Lab(SR)/Staff Engineer/삼성전자 <leee.lee@samsung.com>
Fri, 14 Dec 2018 05:10:37 +0000 (14:10 +0900)
This reverts commit 39130a7580a8f7ce16f425f164c5afd954789615.

Change-Id: I77110d9c8d23a97e13cd8e232ca77b94f2865693

build.sh
packaging/coreclr.spec

index d5791b0..072c591 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -83,13 +83,6 @@ 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
index 761785b..5713680 100755 (executable)
@@ -30,7 +30,7 @@ BuildRequires:  pkgconfig(uuid)
 BuildRequires:  pkgconfig(libsystemd-daemon)
 # 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
@@ -108,11 +108,6 @@ The MSCORLIB.DLL for .NET Core Runtime (coreclr)
 %setup -q -n %{name}-%{version}
 cp %{SOURCE1} .
 cp %{SOURCE2} .
-cat > os-release <<EOF
-NAME=Tizen
-ID=tizen
-VERSION_ID=%{tizen_version_major}.%{tizen_version_minor}.%{tizen_version_patch}
-EOF
 
 %if 0%{skipmscorlib}
 %else