From 70225f42dae3cb8e48e0c93b0cae1a9f346011fe Mon Sep 17 00:00:00 2001 From: yykk Date: Mon, 28 Aug 2023 09:10:07 +0800 Subject: [PATCH] =?UTF-8?q?*=20!16=20=E8=A7=A3=E5=86=B323.09=E5=86=85?= =?UTF-8?q?=E6=A0=B8=E7=BC=96=E8=AF=91=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: @yukaii --- ...ex-build-error-for-dsoftbus-standard.patch | 26 +++++++++++++++++++ dsoftbus.spec | 7 ++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 dsoftbus-standard-0002-fix-mutex-build-error-for-dsoftbus-standard.patch diff --git a/dsoftbus-standard-0002-fix-mutex-build-error-for-dsoftbus-standard.patch b/dsoftbus-standard-0002-fix-mutex-build-error-for-dsoftbus-standard.patch new file mode 100644 index 0000000..ca1800c --- /dev/null +++ b/dsoftbus-standard-0002-fix-mutex-build-error-for-dsoftbus-standard.patch @@ -0,0 +1,26 @@ +From 3e2ef1aa3476477c136ec5652a20bea29226854b Mon Sep 17 00:00:00 2001 +From: yukai +Date: Sat, 26 Aug 2023 17:02:49 +0800 +Subject: [PATCH] fix bug2 + +--- + sdk/transmission/session/cpp/src/session_service_impl.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/sdk/transmission/session/cpp/src/session_service_impl.cpp b/sdk/transmission/session/cpp/src/session_service_impl.cpp +index 336c31e..752bb82 100755 +--- a/sdk/transmission/session/cpp/src/session_service_impl.cpp ++++ b/sdk/transmission/session/cpp/src/session_service_impl.cpp +@@ -22,6 +22,8 @@ + #include "softbus_errcode.h" + #include "softbus_log.h" + ++#include ++ + namespace Communication { + namespace SoftBus { + std::shared_mutex ISessionService::instanceMutex_; +-- +2.33.0 + + diff --git a/dsoftbus.spec b/dsoftbus.spec index 0a97a51..179095a 100644 --- a/dsoftbus.spec +++ b/dsoftbus.spec @@ -14,7 +14,7 @@ Name: dsoftbus Version: 1.0.0 -Release: 9 +Release: 10 Summary: openEuler embedded softbus capability support License: Apache License 2.0 Url: https://openeuler.gitee.io/yocto-meta-openeuler/features/distributed_softbus.html @@ -32,6 +32,7 @@ Patch0001: build-0002-support-hichian-for-openeuler.patch Patch0002: build-0003-add-deviceauth-ipc-sdk-compile.patch Patch0003: build-0004-change-set-for-obs-build.patch Patch0100: dsoftbus-standard-0001-simplify-dependency-for-dsoftbus-standard.patch +Patch0101: dsoftbus-standard-0002-fix-mutex-build-error-for-dsoftbus-standard.patch Patch0200: security-device-auth-0001-deviceauth-for-openeuler.patch Patch0201: security-device-auth-0002-deviceauth-ipc-service.patch Patch0202: security-device-auth-0003-simplify-dependency-on-third-party-packages.patch @@ -115,6 +116,7 @@ mv %{_builddir}/%{source_commonlibrary_c_utils}-%{openHarmony_source_release} ${ %patch2 -p1 -d ${dsoftbus_build_dir}/build %patch3 -p1 -d ${dsoftbus_build_dir}/build %patch100 -p1 -d %{_builddir}/%{source_dsoftbus_standard} +%patch101 -p1 -d %{_builddir}/%{source_dsoftbus_standard} %patch200 -p1 -d ${dsoftbus_hichain}/deviceauth %patch201 -p1 -d ${dsoftbus_hichain}/deviceauth %patch202 -p1 -d ${dsoftbus_hichain}/deviceauth @@ -206,6 +208,9 @@ find %{buildroot} -type f -name "softbus_server_main" -exec strip '{}' ';' /data/data %changelog +* Mon Aug 28 2023 yukaii - 1.0.0-10 +- fix 23.09 compile error + * Fri Mar 3 2023 liheavy - 1.0.0-9 - Old rpm package missing file parameter.h, add it to the rpm package -- Gitee