diff --git a/0015_fixbug_fd_leak_for_init.patch b/0015_fixbug_fd_leak_for_init.patch deleted file mode 100644 index 3bb9379678c9837975ebb97f7e4127aca381ea55..0000000000000000000000000000000000000000 --- a/0015_fixbug_fd_leak_for_init.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/services/param/linux/param_request.c b/services/param/linux/param_request.c -index 460486d..6bcd72d 100644 ---- a/services/param/linux/param_request.c -+++ b/services/param/linux/param_request.c -@@ -50,6 +50,7 @@ static int GetClientSocket() - serverAddr.sun_family = PF_UNIX; - strncpy(serverAddr.sun_path, PIPE_NAME, strlen(PIPE_NAME)); - if (connect(cfd, (struct sockaddr*)&serverAddr, sizeof(serverAddr)) < 0) { -+ close(cfd); - perror("Failed to connect"); - return -1; - } diff --git a/distributed-beget.tar.gz b/distributed-beget.tar.gz index 1e8fb7f3d073c41cf1b2ff9331f828a37d014500..f92edc6ce3146c207b435fb8c3cfe23789bfc45c 100644 Binary files a/distributed-beget.tar.gz and b/distributed-beget.tar.gz differ diff --git a/distributed-utils.spec b/distributed-utils.spec index 3d29b8c96b6194c58ce2874008f3402d0219346f..a3acf0ca1e91bcfc67e074ee742aebe73f0345f4 100644 --- a/distributed-utils.spec +++ b/distributed-utils.spec @@ -60,7 +60,6 @@ Patch11: 0011-remove-dependency-and-adapt-for-build-device_manager.patch Patch12: 0012-remove-dependency-and-adapt-for-build-device_security_level.patch Patch13: 0013-increase-the-pthread-stack-size-of-x86-and-other-env-dsoftbus.patch Patch14: 0014-fixbug-metaDescriptor-for-ipc.patch -Patch15: 0015_fixbug_fd_leak_for_init.patch BuildRequires: python3-jinja2 python3-pyyaml cjson cjson-devel BuildRequires: libatomic libicu-devel libxml2-devel openssl-devel @@ -118,7 +117,6 @@ rm -rf %{_builddir}/third_party/mbedtls/* %patch12 -p1 -d %{device_security_level_dir} %patch13 -p1 -d %{dsoftbus_dir} %patch14 -p1 -d %{ipc_dir} -%patch15 -p1 -d %{init_dir} # build all components with build.sh %build @@ -136,6 +134,7 @@ rm -rf %{_builddir}/out %install install -d -m 0755 %{buildroot}/system/lib64 install -d -m 0755 %{buildroot}/system/bin +install -d -m 0755 %{buildroot}/system/etc/param install -d -m 0755 %{buildroot}/usr/lib64 install -d -m 0755 %{buildroot}/usr/bin install -d -m 0755 %{buildroot}%{_includedir}/c_utils @@ -182,6 +181,7 @@ popd # copy executable file. install -m 755 %{_builddir}/out/openeuler/packages/phone/system/bin/* %{buildroot}/system/bin/ install -m 755 %{_builddir}/out/openeuler/packages/phone/system/bin/* %{buildroot}/usr/bin/ +install -m 755 %{_builddir}/out/openeuler/packages/phone/system/etc/param/* %{buildroot}/system/etc/param/ # copy header files of component to includedir. pushd %{_builddir}/${header_out_path} @@ -212,6 +212,7 @@ cp -rvf single_include/nlohmann %{buildroot}/%{_includedir}/nlohmann_json/single %files /system/lib64/* /system/bin/* +/system/etc/param/* /%{_includedir}/* /usr/lib64/* /usr/bin/*