From ae43b1399313083cd7af27f64b8c0fd4e7970c25 Mon Sep 17 00:00:00 2001 From: yanansong Date: Mon, 18 Dec 2023 02:05:36 +0000 Subject: [PATCH 1/3] to build ko and install Signed-off-by: yanansong --- communication_ipc.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/communication_ipc.spec b/communication_ipc.spec index e5af0b7..4579efb 100644 --- a/communication_ipc.spec +++ b/communication_ipc.spec @@ -7,8 +7,8 @@ %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 +%define with_ashmem 1 +%define with_install_ko 1 Name: communication_ipc Version: 1.0.0 -- Gitee From 9790647a6d73cd4f642d3778e60e5d18747d164f Mon Sep 17 00:00:00 2001 From: yanansong Date: Mon, 18 Dec 2023 02:54:13 +0000 Subject: [PATCH 2/3] add changlog Signed-off-by: yanansong --- communication_ipc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/communication_ipc.spec b/communication_ipc.spec index 4579efb..29d44bb 100644 --- a/communication_ipc.spec +++ b/communication_ipc.spec @@ -12,7 +12,7 @@ Name: communication_ipc Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?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 @@ -224,6 +224,9 @@ insmod /%{ashmem_dest_path}/*.ko %endif %changelog +* Mon Dec 18 2023 yanansong - 1.0.0-2 +- enable linux ko building and insmod it + * Sun Oct 08 2023 Peng He - 1.0.0-1 * Thu Nov 22 2023 JiaQi Zhao - 1.0.0-1 - Init package -- Gitee From deb4085b13114c0c17bc19fae2e118626bc8d693 Mon Sep 17 00:00:00 2001 From: heppen Date: Wed, 20 Dec 2023 19:05:37 +0800 Subject: [PATCH 3/3] correct default ethernet interface from enp7s0 to eth0 --- ...adapt-compilation-for-softbus_client.patch | 35 ++++--------------- communication_ipc.spec | 7 ++-- 2 files changed, 11 insertions(+), 31 deletions(-) diff --git a/0004-adapt-compilation-for-softbus_client.patch b/0004-adapt-compilation-for-softbus_client.patch index cfb3ee2..626cd94 100644 --- a/0004-adapt-compilation-for-softbus_client.patch +++ b/0004-adapt-compilation-for-softbus_client.patch @@ -1,7 +1,7 @@ -From 15e2ccf02e15fd6e9ea0e8f86b013ff49b8533e5 Mon Sep 17 00:00:00 2001 +From 618550c53de305101d2bd0946839aa6e57c86e96 Mon Sep 17 00:00:00 2001 From: heppen -Date: Tue, 26 Sep 2023 17:22:20 +0800 -Subject: [PATCH] adapt compilation for softbus_client +Date: Wed, 20 Dec 2023 18:54:05 +0800 +Subject: [PATCH] adapt compilation for softbus client --- adapter/BUILD.gn | 2 +- @@ -22,11 +22,10 @@ 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 | 6 +- + .../softbus_property/softbus_feature_config.c | 4 +- .../common/src/softbus_thread_pool.c | 3 +- core/frame/BUILD.gn | 6 +- .../src/permission_status_change_cb.cpp | 18 +- @@ -34,7 +33,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 +- - 30 files changed, 458 insertions(+), 331 deletions(-) + 29 files changed, 456 insertions(+), 329 deletions(-) create mode 100644 core/authentication/include/auth_config.h create mode 100644 core/authentication/src/auth_config.c @@ -715,19 +714,6 @@ 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 @@ -972,7 +958,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..6fc5cd7 100644 +index 442c8e0..6bf83a7 100644 --- a/core/common/softbus_property/softbus_feature_config.c +++ b/core/common/softbus_property/softbus_feature_config.c @@ -39,10 +39,10 @@ @@ -988,15 +974,6 @@ index 442c8e0..6fc5cd7 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 diff --git a/communication_ipc.spec b/communication_ipc.spec index 29d44bb..460c163 100644 --- a/communication_ipc.spec +++ b/communication_ipc.spec @@ -8,11 +8,11 @@ %global ashmem_dest_path /usr/lib/modules/%(uname -r)/ashmem %define with_ashmem 1 -%define with_install_ko 1 +%define with_install_ko 0 Name: communication_ipc Version: 1.0.0 -Release: 2%{?dist} +Release: 3%{?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 @@ -224,6 +224,9 @@ insmod /%{ashmem_dest_path}/*.ko %endif %changelog +* Wed Dec 20 2023 Peng He - 1.0.0-3 +- correct default ethernet interface from enp7s0 to eth0 + * Mon Dec 18 2023 yanansong - 1.0.0-2 - enable linux ko building and insmod it -- Gitee