From e72d2cd82172577bc79f030a774d2806c1c72c71 Mon Sep 17 00:00:00 2001 From: peng-langyuan Date: Tue, 18 Jun 2024 10:41:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E5=A4=B4=E6=96=87=E4=BB=B6=E7=BC=BA?= =?UTF-8?q?=E5=A4=B1=E5=92=8C=E7=B1=BB=E5=9E=8B=E4=B8=8D=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...g-header-file-and-type-compatibility.patch | 34 +++++++++++++++++++ distributed-beget.spec | 9 +++-- 2 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 0008-fix-missing-header-file-and-type-compatibility.patch diff --git a/0008-fix-missing-header-file-and-type-compatibility.patch b/0008-fix-missing-header-file-and-type-compatibility.patch new file mode 100644 index 0000000..75dab6d --- /dev/null +++ b/0008-fix-missing-header-file-and-type-compatibility.patch @@ -0,0 +1,34 @@ +From 710f90bcdd69c9d31a39c13911981a190d17a624 Mon Sep 17 00:00:00 2001 +From: peng-langyuan +Date: Mon, 17 Jun 2024 10:16:18 +0800 +Subject: [PATCH] + fix missing header file and type compatibility warning-issues + +--- + interfaces/innerkits/syspara/param_comm.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/interfaces/innerkits/syspara/param_comm.c b/interfaces/innerkits/syspara/param_comm.c +index c139f4b7..ea5704f4 100644 +--- a/interfaces/innerkits/syspara/param_comm.c ++++ b/interfaces/innerkits/syspara/param_comm.c +@@ -15,6 +15,7 @@ + + #include "param_comm.h" + ++#include + #include + #include + #include +@@ -230,7 +231,7 @@ BEGET_LOCAL_API int GetDeviceName_(char *deviceName, int size) + BEGET_LOCAL_API int GetOsAccount_(int *id) + { + char account[10] = {0}; +- int len = sizeof(account); ++ uint32_t len = sizeof(account); + + int ret = SystemGetParameter("const.default.account", account, &len); + BEGET_CHECK(ret == 0, return ret); +-- +2.43.0 + diff --git a/distributed-beget.spec b/distributed-beget.spec index 5eb254e..4be93d8 100644 --- a/distributed-beget.spec +++ b/distributed-beget.spec @@ -5,7 +5,7 @@ Name: distributed-beget Version: 1.0.0 -Release: 7 +Release: 8 Summary: openEuler embedded softbus capability support License: Apache License 2.0 URL: https://gitee.com/openeuler/distributed-beget.git @@ -19,8 +19,9 @@ Patch4: 0004-refactor-using-the-reactor-framework.patch Patch5: 0005-feat-for-embedded-fix-compile-errors-after-refactor.patch Patch6: 0006-feat-auto-generated-udid-and-add-new-interfaces.patch Patch7: 0007-modify-default-param-read-path.patch +Patch8: 0008-fix-missing-header-file-and-type-compatibility.patch -BuildRequires: distributed-build, hilog, commonlibrary_c_utils, openssl-devel +BuildRequires: distributed-build, hilog, commonlibrary_c_utils, compat-openssl11-devel Requires: commonlibrary_c_utils Requires: hilog @@ -49,6 +50,7 @@ cp -rf %{_builddir}/build/openeuler/compiler_gn/* %{_builddir} %patch -P5 -p1 -d %{_builddir}/base/startup/init %patch -P6 -p1 -d %{_builddir}/base/startup/init %patch -P7 -p1 -d %{_builddir}/base/startup/init +%patch -P8 -p1 -d %{_builddir}/base/startup/init # exit 0 %build @@ -115,6 +117,9 @@ ln -s /usr/include/init %{buildroot}%{build_opt}/openeuler/compiler_gn/%{interfa %{_sysconfdir}/* %changelog +* Mon Jun 17 2024 peng_langyuan - 1.0.0-8 +- Fix missing header file and type compatibility warning + * Tue May 7 2024 peng_langyuan - 1.0.0-7 - Apply the 6th and 7th patch -- Gitee From ff5ccdfbe7b16c76c033e37762f3cca4e8e8a80d Mon Sep 17 00:00:00 2001 From: peng-langyuan Date: Tue, 18 Jun 2024 18:38:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E5=BC=80=E5=90=AFis=5Fdebug=E9=80=89=E9=A1=B9=E6=97=B6?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=89=BE=E5=88=B0=E5=87=BD=E6=95=B0=E9=93=BE?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...not-find-function-link-in-debug-mode.patch | 36 +++++++++++++++++++ distributed-beget.spec | 7 +++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 0009-fix-can-not-find-function-link-in-debug-mode.patch diff --git a/0009-fix-can-not-find-function-link-in-debug-mode.patch b/0009-fix-can-not-find-function-link-in-debug-mode.patch new file mode 100644 index 0000000..2eb1be7 --- /dev/null +++ b/0009-fix-can-not-find-function-link-in-debug-mode.patch @@ -0,0 +1,36 @@ +From 5959bffcee7c9a7cc0e4bf242325ddfc8790b03a Mon Sep 17 00:00:00 2001 +From: peng-langyuan +Date: Tue, 18 Jun 2024 18:32:02 +0800 +Subject: [PATCH] =?UTF-8?q?fix:debug=E6=A8=A1=E5=BC=8F=E4=B8=8B=E6=97=A0?= + =?UTF-8?q?=E6=B3=95=E6=89=BE=E5=88=B0=E5=87=BD=E6=95=B0=E9=93=BE=E6=8E=A5?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + services/param_service/include/trie_queue.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/services/param_service/include/trie_queue.h b/services/param_service/include/trie_queue.h +index 6c96f96..c958761 100644 +--- a/services/param_service/include/trie_queue.h ++++ b/services/param_service/include/trie_queue.h +@@ -19,6 +19,8 @@ typedef struct TrieNodeQueue { + TrieNode* (*pop)(struct TrieNodeQueue*); + } TrieNodeQueue; + ++void TrieQueueFirstStageInit(TrieNodeQueue* tq); ++void TrieQueueSecondStageInit(TrieNodeQueue* tq); + void TrieNodePush(TrieNodeQueue* tq, TrieNode* node); + TrieNode* TrieNodePop(TrieNodeQueue* tq); + +@@ -81,4 +83,4 @@ inline TrieNode* TrieNodePop(TrieNodeQueue* tq) + return node; + } + +-#endif // TRIE_QUEUE_H +\ No newline at end of file ++#endif // TRIE_QUEUE_H +-- +2.43.0 + diff --git a/distributed-beget.spec b/distributed-beget.spec index 4be93d8..cdb049b 100644 --- a/distributed-beget.spec +++ b/distributed-beget.spec @@ -5,7 +5,7 @@ Name: distributed-beget Version: 1.0.0 -Release: 8 +Release: 9 Summary: openEuler embedded softbus capability support License: Apache License 2.0 URL: https://gitee.com/openeuler/distributed-beget.git @@ -20,6 +20,7 @@ Patch5: 0005-feat-for-embedded-fix-compile-errors-after-refactor.patch Patch6: 0006-feat-auto-generated-udid-and-add-new-interfaces.patch Patch7: 0007-modify-default-param-read-path.patch Patch8: 0008-fix-missing-header-file-and-type-compatibility.patch +Patch9: 0009-fix-can-not-find-function-link-in-debug-mode.patch BuildRequires: distributed-build, hilog, commonlibrary_c_utils, compat-openssl11-devel @@ -51,6 +52,7 @@ cp -rf %{_builddir}/build/openeuler/compiler_gn/* %{_builddir} %patch -P6 -p1 -d %{_builddir}/base/startup/init %patch -P7 -p1 -d %{_builddir}/base/startup/init %patch -P8 -p1 -d %{_builddir}/base/startup/init +%patch -P9 -p1 -d %{_builddir}/base/startup/init # exit 0 %build @@ -117,6 +119,9 @@ ln -s /usr/include/init %{buildroot}%{build_opt}/openeuler/compiler_gn/%{interfa %{_sysconfdir}/* %changelog +* Tue Jun 18 2024 peng_langyuan - 1.0.0-9 +- Fix can not find function link in debug mode + * Mon Jun 17 2024 peng_langyuan - 1.0.0-8 - Fix missing header file and type compatibility warning -- Gitee