From 4aab84f1580caca1dd8d087b69bdebf8d479054c Mon Sep 17 00:00:00 2001 From: JongHeonChoi Date: Tue, 31 Oct 2023 14:43:36 +0900 Subject: [PATCH] [Build] Modify build error for vconf of runtime_version (#5685) --- packaging/csapi-tizenfx.spec | 8 ++++---- packaging/csapi-tizenfx.spec.in | 10 +++++----- packaging/makespec.sh | 3 --- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/packaging/csapi-tizenfx.spec b/packaging/csapi-tizenfx.spec index 0a84605..3335431 100644 --- a/packaging/csapi-tizenfx.spec +++ b/packaging/csapi-tizenfx.spec @@ -222,10 +222,10 @@ install -p -m 755 packaging/500.tizenfx_upgrade.sh %{buildroot}%{UPGRADE_SCRIPT_ /usr/bin/vconftool set -t string db/dotnet/tizen_rid_version %{TIZEN_NET_RUNTIME_IDENTIFIERS} -f /usr/bin/vconftool set -t string db/dotnet/tizen_tfm_support %{TIZEN_NET_TARGET_FRAMEWORK_MONIKERS} -f /usr/bin/vconftool set -t string db/dotnet/runtime_version %{DOTNET_CORE_RUNTIME_VERSION} -f -touch %{buildroot}%{DOTNET_LIBRARY_PATH}/dotnet_vconf.info -echo "db/dotnet/tizen_rid_version %{TIZEN_NET_RUNTIME_IDENTIFIERS}" > %{buildroot}%{DOTNET_LIBRARY_PATH}/dotnet_vconf.info -echo "db/dotnet/tizen_tfm_support %{TIZEN_NET_TARGET_FRAMEWORK_MONIKERS}" >> %{buildroot}%{DOTNET_LIBRARY_PATH}/dotnet_vconf.info -echo "db/dotnet/runtime_version %{DOTNET_CORE_RUNTIME_VERSION}" >> %{buildroot}%{DOTNET_LIBRARY_PATH}/dotnet_vconf.info +touch %{buildroot}%{DOTNET_LIBRARY_PATH}/dotnet_resolving.info +echo "db/dotnet/tizen_rid_version %{TIZEN_NET_RUNTIME_IDENTIFIERS}" > %{buildroot}%{DOTNET_LIBRARY_PATH}/dotnet_resolving.info +echo "db/dotnet/tizen_tfm_support %{TIZEN_NET_TARGET_FRAMEWORK_MONIKERS}" >> %{buildroot}%{DOTNET_LIBRARY_PATH}/dotnet_resolving.info +echo "db/dotnet/runtime_version %{DOTNET_CORE_RUNTIME_VERSION}" >> %{buildroot}%{DOTNET_LIBRARY_PATH}/dotnet_resolving.info %files %license LICENSE diff --git a/packaging/csapi-tizenfx.spec.in b/packaging/csapi-tizenfx.spec.in index 3b7555a..56962a8 100644 --- a/packaging/csapi-tizenfx.spec.in +++ b/packaging/csapi-tizenfx.spec.in @@ -13,7 +13,7 @@ %define TIZEN_NET_RUNTIME_IDENTIFIERS @rid_version@ %define TIZEN_NET_TARGET_FRAMEWORK_MONIKERS @tfm_support@ -%define DOTNET_CORE_RUNTIME_VERSION @dotnet_core_version@ +%define DOTNET_CORE_RUNTIME_VERSION 6.0 %define UPGRADE_SCRIPT_PATH /usr/share/upgrade/scripts @@ -221,10 +221,10 @@ install -p -m 755 packaging/500.tizenfx_upgrade.sh %{buildroot}%{UPGRADE_SCRIPT_ /usr/bin/vconftool set -t string db/dotnet/tizen_rid_version %{TIZEN_NET_RUNTIME_IDENTIFIERS} -f /usr/bin/vconftool set -t string db/dotnet/tizen_tfm_support %{TIZEN_NET_TARGET_FRAMEWORK_MONIKERS} -f /usr/bin/vconftool set -t string db/dotnet/runtime_version %{DOTNET_CORE_RUNTIME_VERSION} -f -touch %{buildroot}%{DOTNET_LIBRARY_PATH}/dotnet_vconf.info -echo "db/dotnet/tizen_rid_version %{TIZEN_NET_RUNTIME_IDENTIFIERS}" > %{buildroot}%{DOTNET_LIBRARY_PATH}/dotnet_vconf.info -echo "db/dotnet/tizen_tfm_support %{TIZEN_NET_TARGET_FRAMEWORK_MONIKERS}" >> %{buildroot}%{DOTNET_LIBRARY_PATH}/dotnet_vconf.info -echo "db/dotnet/runtime_version %{DOTNET_CORE_RUNTIME_VERSION}" >> %{buildroot}%{DOTNET_LIBRARY_PATH}/dotnet_vconf.info +touch %{buildroot}%{DOTNET_LIBRARY_PATH}/dotnet_resolving.info +echo "db/dotnet/tizen_rid_version %{TIZEN_NET_RUNTIME_IDENTIFIERS}" > %{buildroot}%{DOTNET_LIBRARY_PATH}/dotnet_resolving.info +echo "db/dotnet/tizen_tfm_support %{TIZEN_NET_TARGET_FRAMEWORK_MONIKERS}" >> %{buildroot}%{DOTNET_LIBRARY_PATH}/dotnet_resolving.info +echo "db/dotnet/runtime_version %{DOTNET_CORE_RUNTIME_VERSION}" >> %{buildroot}%{DOTNET_LIBRARY_PATH}/dotnet_resolving.info %files %license LICENSE diff --git a/packaging/makespec.sh b/packaging/makespec.sh index 85f04f8..103b285 100755 --- a/packaging/makespec.sh +++ b/packaging/makespec.sh @@ -30,6 +30,3 @@ python $SCRIPT_DIR/makerid.py # Update TFM python $SCRIPT_DIR/maketfm.py - -# Update Runtime Version -python $SCRIPT_DIR/makeruntimeversion.py -- 2.7.4