diff options
| -rw-r--r-- | packaging/0001-Tizen-Remove-tizen-release-package-dependency-for-GB.patch | 23 |
1 files changed, 19 insertions, 4 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 index c7e4c15c15..11235e6dc5 100644 --- a/packaging/0001-Tizen-Remove-tizen-release-package-dependency-for-GB.patch +++ b/packaging/0001-Tizen-Remove-tizen-release-package-dependency-for-GB.patch @@ -1,18 +1,19 @@ -From 7a2caa7e3b2e065ac2cf4f6db25a0b0bc8797753 Mon Sep 17 00:00:00 2001 +From adb7b3394ff6d5e5bbd959554c2efb363ce2c148 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. +Therefore, it is about to move to unified while coreclr 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(-) + build.sh | 9 +++++++-- + src/pal/tools/gen-buildsys-clang.sh | 3 +++ + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 3467387..0ad1523 100755 @@ -34,6 +35,20 @@ index 3467387..0ad1523 100755 else source /etc/os-release __HostDistroRid="$ID.$VERSION_ID-$__HostArch" +diff --git a/src/pal/tools/gen-buildsys-clang.sh b/src/pal/tools/gen-buildsys-clang.sh +index c809fb7..dc502a8 100755 +--- a/src/pal/tools/gen-buildsys-clang.sh ++++ b/src/pal/tools/gen-buildsys-clang.sh +@@ -149,6 +149,9 @@ if [ $OS == "Linux" ]; then + if [[ -e $linux_id_file ]]; then + source $linux_id_file + cmake_extra_defines="$cmake_extra_defines -DCLR_CMAKE_LINUX_ID=$ID" ++ elif [[ -e "$1/os-release" ]]; then ++ source $1/os-release ++ cmake_extra_defines="$cmake_extra_defines -DCLR_CMAKE_LINUX_ID=$ID" + fi + fi + if [ "$build_arch" == "armel" ]; then -- 2.7.4 |