Compare commits
No commits in common. "a8f4c0d8926934413450c74f6b9cae185353338b" and "a10775c300b151f8229b5fa1bf3448f2865cee6b" have entirely different histories.
a8f4c0d892
...
a10775c300
@ -1,7 +1,7 @@
|
||||
From 618550c53de305101d2bd0946839aa6e57c86e96 Mon Sep 17 00:00:00 2001
|
||||
From 15e2ccf02e15fd6e9ea0e8f86b013ff49b8533e5 Mon Sep 17 00:00:00 2001
|
||||
From: heppen <hepeng68@huawei.com>
|
||||
Date: Wed, 20 Dec 2023 18:54:05 +0800
|
||||
Subject: [PATCH] adapt compilation for softbus client
|
||||
Date: Tue, 26 Sep 2023 17:22:20 +0800
|
||||
Subject: [PATCH] adapt compilation for softbus_client
|
||||
|
||||
---
|
||||
adapter/BUILD.gn | 2 +-
|
||||
@ -22,10 +22,11 @@ Subject: [PATCH] adapt compilation for softbus client
|
||||
core/authentication/src/auth_session_key.c | 2 +-
|
||||
.../lane_manager/src/lnn_lane_link_proc.c | 2 +-
|
||||
.../lane_manager/src/lnn_select_rule.c | 2 +-
|
||||
.../net_buscenter/src/lnn_network_manager.c | 2 +-
|
||||
core/common/include/softbus_def.h | 4 +-
|
||||
core/common/message_handler/message_handler.c | 8 -
|
||||
.../standard/softbus_permission.cpp | 151 +++++-----
|
||||
.../softbus_property/softbus_feature_config.c | 4 +-
|
||||
.../softbus_property/softbus_feature_config.c | 6 +-
|
||||
.../common/src/softbus_thread_pool.c | 3 +-
|
||||
core/frame/BUILD.gn | 6 +-
|
||||
.../src/permission_status_change_cb.cpp | 18 +-
|
||||
@ -33,7 +34,7 @@ Subject: [PATCH] adapt compilation for softbus client
|
||||
.../standard/init/src/softbus_server_stub.cpp | 137 ++++-----
|
||||
.../tcp_direct/src/trans_tcp_direct_manager.c | 2 +-
|
||||
.../tcp_direct/src/trans_tcp_direct_wifi.c | 2 +-
|
||||
29 files changed, 456 insertions(+), 329 deletions(-)
|
||||
30 files changed, 458 insertions(+), 331 deletions(-)
|
||||
create mode 100644 core/authentication/include/auth_config.h
|
||||
create mode 100644 core/authentication/src/auth_config.c
|
||||
|
||||
@ -714,6 +715,19 @@ index 79712a6..ec66978 100644
|
||||
|
||||
#define LNN_LINK_DEFAULT_SCORE 60 /* Indicates that scoring is not supported */
|
||||
|
||||
diff --git a/core/bus_center/lnn/net_buscenter/src/lnn_network_manager.c b/core/bus_center/lnn/net_buscenter/src/lnn_network_manager.c
|
||||
index 91856d8..36ea248 100644
|
||||
--- a/core/bus_center/lnn/net_buscenter/src/lnn_network_manager.c
|
||||
+++ b/core/bus_center/lnn/net_buscenter/src/lnn_network_manager.c
|
||||
@@ -34,7 +34,7 @@
|
||||
#define LNN_DELIMITER_INSIDE ":"
|
||||
|
||||
#define LNN_DEFAULT_IF_NAME_WLAN "wlan0"
|
||||
-#define LNN_DEFAULT_IF_NAME_ETH "eth0"
|
||||
+#define LNN_DEFAULT_IF_NAME_ETH "enp7s0"
|
||||
#define LNN_DEFAULT_IF_NAME_BR "br0"
|
||||
#define LNN_DEFAULT_IF_NAME_BLE "ble0"
|
||||
|
||||
diff --git a/core/common/include/softbus_def.h b/core/common/include/softbus_def.h
|
||||
index 2edb7f5..a34aa50 100644
|
||||
--- a/core/common/include/softbus_def.h
|
||||
@ -958,7 +972,7 @@ index e2b3ac7..5016dec 100644
|
||||
+ return SOFTBUS_OK;
|
||||
}
|
||||
diff --git a/core/common/softbus_property/softbus_feature_config.c b/core/common/softbus_property/softbus_feature_config.c
|
||||
index 442c8e0..6bf83a7 100644
|
||||
index 442c8e0..6fc5cd7 100644
|
||||
--- a/core/common/softbus_property/softbus_feature_config.c
|
||||
+++ b/core/common/softbus_property/softbus_feature_config.c
|
||||
@@ -39,10 +39,10 @@
|
||||
@ -974,6 +988,15 @@ index 442c8e0..6bf83a7 100644
|
||||
#define LNN_SUPPORT_CAPBILITY 62
|
||||
#define AUTH_ABILITY_COLLECTION 0
|
||||
#define ADAPTER_LOG_LEVEL 0
|
||||
@@ -50,7 +50,7 @@
|
||||
#define DEFAULT_STORAGE_PATH "/data/service/el1/public"
|
||||
#endif
|
||||
#define LNN_UDID_INIT_DELAY_LEN 1000
|
||||
-#define LNN_NET_IF_NAME "0:eth0,1:wlan0,2:br0,3:ble0"
|
||||
+#define LNN_NET_IF_NAME "0:enp7s0,1:wlan0,2:br0,3:ble0"
|
||||
#define LNN_MAX_CONCURENT_NUM 2
|
||||
#define DEFAULT_DISC_FREQ_LOW ((5 << 16) | 12)
|
||||
#define DEFAULT_DISC_FREQ_MID ((5 << 16) | 24)
|
||||
diff --git a/core/connection/common/src/softbus_thread_pool.c b/core/connection/common/src/softbus_thread_pool.c
|
||||
index 854cfbb..71dad93 100644
|
||||
--- a/core/connection/common/src/softbus_thread_pool.c
|
||||
|
||||
@ -7,12 +7,9 @@
|
||||
%global binder_dest_path /usr/lib/modules/%(uname -r)/binder
|
||||
%global ashmem_dest_path /usr/lib/modules/%(uname -r)/ashmem
|
||||
|
||||
%define with_ashmem 0
|
||||
%define with_install_ko 0
|
||||
|
||||
Name: communication_ipc
|
||||
Version: 1.0.0
|
||||
Release: 4%{?dist}
|
||||
Release: 1%{?dist}
|
||||
Summary: Inter-process communication (IPC) and Remote Procedure Call (RPC)
|
||||
License: Apache-2.0 and GPL-2.0
|
||||
URL: https://gitee.com/openharmony/communication_ipc
|
||||
@ -85,9 +82,6 @@ mv %{third_party_path}/third_party_mbedtls-%{oh_version} %{third_party_path}/mbe
|
||||
%setup -q -D -T -a 6 -c -n %{_builddir}
|
||||
%patch -P3 -p1 -d %{_builddir}/binder
|
||||
|
||||
%setup -q -D -T -a 16 -c -n %{_builddir}
|
||||
|
||||
|
||||
%build
|
||||
|
||||
%ifarch x86_64
|
||||
@ -102,10 +96,8 @@ mv %{third_party_path}/third_party_mbedtls-%{oh_version} %{third_party_path}/mbe
|
||||
cd %{_builddir}/binder
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%if 0%{?with_ashmem}
|
||||
cd %{_builddir}/ashmem/src
|
||||
make %{?_smp_mflags}
|
||||
%endif
|
||||
|
||||
%install
|
||||
install -d -m 0755 %{buildroot}/%{_includedir}/ipc
|
||||
@ -181,11 +173,9 @@ install -m 0755 %{SOURCE15} %{buildroot}/%{build_opt}/openeuler/compiler_gn/foun
|
||||
install -d %{buildroot}/%{binder_dest_path}/
|
||||
install -d %{buildroot}/%{ashmem_dest_path}/
|
||||
install -m 0755 %{_builddir}/binder/binder_linux.ko %{buildroot}/%{binder_dest_path}/
|
||||
%if 0%{?with_ashmem}
|
||||
install -m 0755 %{_builddir}/ashmem/src/ashmem_linux.ko %{buildroot}/%{ashmem_dest_path}/
|
||||
%endif
|
||||
mkdir -p %{buildroot}/usr/share/pp
|
||||
install -m 0755 %{SOURCE17} %{buildroot}/usr/share/pp/binder.pp
|
||||
cp -pdf %{_builddir}/binder.pp %{buildroot}/usr/share/pp
|
||||
|
||||
#create soft link
|
||||
ln -s /usr/mbedtls/include %{buildroot}%{build_opt}/openeuler/compiler_gn/third_party/mbedtls/include
|
||||
@ -207,32 +197,14 @@ ln -s /usr/include/dsoftbus %{buildroot}%{build_opt}/openeuler/compiler_gn/found
|
||||
%{_includedir}/dsoftbus/*
|
||||
/system/*
|
||||
/%{binder_dest_path}/*.ko
|
||||
%if 0%{?with_ashmem}
|
||||
/%{ashmem_dest_path}/*.ko
|
||||
%endif
|
||||
%{build_opt}/*
|
||||
/usr/share/pp
|
||||
|
||||
%post
|
||||
semodule -X 300 -i /usr/share/pp/binder.pp
|
||||
|
||||
%if 0%{?with_install_ko}
|
||||
insmod /%{binder_dest_path}/*.ko
|
||||
%if 0%{?with_ashmem}
|
||||
insmod /%{ashmem_dest_path}/*.ko
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
# Wed Jun 05 2024 Hong Xu Ming <2298061238@qq.com> - 1.0.0-4
|
||||
- modify the definition with_ashmem from 1 to 0
|
||||
|
||||
* Wed Dec 20 2023 Peng He <hepeng68@huawei.com> - 1.0.0-3
|
||||
- correct default ethernet interface from enp7s0 to eth0
|
||||
|
||||
* Mon Dec 18 2023 yanansong <songyanan5@huawei.com> - 1.0.0-2
|
||||
- enable linux ko building and insmod it
|
||||
|
||||
* Sun Oct 08 2023 Peng He <hepeng68@huawei.com> - 1.0.0-1
|
||||
* Thu Nov 22 2023 JiaQi Zhao <zhaojiaqi18@huawei.com> - 1.0.0-1
|
||||
- Init package
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user