summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHyungju Lee <leee.lee@samsung.com>2018-08-27 10:20:56 (GMT)
committerHyungju Lee <leee.lee@samsung.com>2018-08-27 10:20:56 (GMT)
commite5fea0edf806c668ff500c9cf5304c3f1fde9547 (patch)
tree8089cf108ffe52afedcf35621de1e4e5696f3d53
parent9cb828920af6f32756c52da3ea4cc4300183affd (diff)
downloadcoreclr-submit/tizen_4.0_base/20180828.163229.zip
coreclr-submit/tizen_4.0_base/20180828.163229.tar.gz
coreclr-submit/tizen_4.0_base/20180828.163229.tar.bz2
[Tizen] Remove `tizen-release` package dependency for GBS buildsubmit/tizen_4.0_base/20180828.163229
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: I01a50c25a0088f7ed8b5eca29431bb093ba17c00
-rw-r--r--packaging/0001-Tizen-Remove-tizen-release-package-dependency-for-GB.patch39
-rwxr-xr-xpackaging/coreclr.spec11
2 files changed, 48 insertions, 2 deletions
diff --git a/packaging/0001-Tizen-Remove-tizen-release-package-dependency-for-GB.patch b/packaging/0001-Tizen-Remove-tizen-release-package-dependency-for-GB.patch
new file mode 100644
index 0000000..c7e4c15
--- /dev/null
+++ b/packaging/0001-Tizen-Remove-tizen-release-package-dependency-for-GB.patch
@@ -0,0 +1,39 @@
+From 7a2caa7e3b2e065ac2cf4f6db25a0b0bc8797753 Mon Sep 17 00:00:00 2001
+From: Hyungju Lee <leee.lee@samsung.com>
+Date: Mon, 27 Aug 2018 18:54:23 +0900
+Subject: [PATCH] [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 corecle stays at the base.
+So, the local os-release file is introduced.
+
+This patch is partial which comes with coreclr.spec
+See review.tizen.org to fully understand the intention
+---
+ build.sh | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/build.sh b/build.sh
+index 3467387..0ad1523 100755
+--- a/build.sh
++++ b/build.sh
+@@ -59,8 +59,13 @@ initHostDistroRid()
+ {
+ if [ "$__HostOS" == "Linux" ]; then
+ if [ ! -e /etc/os-release ]; then
+- echo "WARNING: Can not determine runtime id for current distro."
+- __HostDistroRid=""
++ if [ ! -e os-release ]; then
++ echo "WARNING: Can not determine runtime id for current distro."
++ __HostDistroRid=""
++ else
++ source os-release
++ __HostDistroRid="$ID.$VERSION_ID-$__HostArch"
++ fi
+ else
+ source /etc/os-release
+ __HostDistroRid="$ID.$VERSION_ID-$__HostArch"
+--
+2.7.4
+
diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec
index 768701a..e643b35 100755
--- a/packaging/coreclr.spec
+++ b/packaging/coreclr.spec
@@ -23,7 +23,7 @@ Source1000: downloaded_files.tar.gz
Source1001: %{name}.manifest
Source1002: libicu.tar.gz
Source1003: dep_libs.tar.gz
-# Gbp-Ignore-Patches: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126
+# Gbp-Ignore-Patches: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127
Patch0: 0001-Add-project.assets.json-files.patch
Patch1: 0001-ARM-Linux-Support-unaligned-struct-read-write-11290.patch
Patch2: 0002-x86-Linux-Thread-safe-UMThunkMarshInfo-RunTimeInit-1.patch
@@ -151,6 +151,7 @@ Patch123: 0046-Remove-ifdef.patch
Patch124: 0047-Launching-the-Memory-Profiler-on-x86-emulator-may-le.patch
Patch125: 0001-Fixed-Bug-with-xmm-registry-on-x86-emulator-183.patch
Patch126: 0002-Fix-unset-ZapRelocationType-for-fixup-18589.patch
+Patch127: 0001-Tizen-Remove-tizen-release-package-dependency-for-GB.patch
ExcludeArch: aarch64
@@ -161,7 +162,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
@@ -379,7 +380,13 @@ cp %{SOURCE1001} .
%patch124 -p1
%patch125 -p1
%patch126 -p1
+%patch127 -p1
+cat > os-release <<EOF
+NAME=Tizen
+ID=tizen
+VERSION_ID=%{tizen_version_major}.%{tizen_version_minor}.%{tizen_version_patch}
+EOF
%if 0%{skipmscorlib}
%else