From a3f7797b20ae71a5c695d6d0f088b8b22d376703 Mon Sep 17 00:00:00 2001 From: "beiling.xie" Date: Fri, 16 Dec 2022 17:43:23 +0800 Subject: [PATCH] rename patch for each modules Signed-off-by: beiling.xie --- ...ftbus-build-support-for-embedded-env.patch | 0 ...d-0002-support-hichian-for-openeuler.patch | 0 ...-0003-add-deviceauth-ipc-sdk-compile.patch | 0 ... build-0004-change-set-for-obs-build.patch | 0 ...c-utils-0001-Adaptation-for-dsoftbus.patch | 0 ...0001-add-productdefine-for-openeuler.patch | 0 ...depend-0002-add-depend-for-openeuler.patch | 0 ...ify-dependency-for-dsoftbus-standard.patch | 0 dsoftbus.spec | 77 ++++++++++--------- ...dscheck-0001-Adaptation-for-dsoftbus.patch | 0 ...e-auth-0001-deviceauth-for-openeuler.patch | 0 ...ice-auth-0002-deviceauth-ipc-service.patch | 0 ...y-dependency-on-third-party-packages.patch | 0 ...huks-0001-support-huks-for-openeuler.patch | 0 ...y-dependency-on-third-party-packages.patch | 0 ...apter-cjson-in-openEuler-for-softbus.patch | 0 ...mbedtls-0001-Adaptation-for-dsoftbus.patch | 0 ...arty-mbedtls-0002-fix-CVE-2021-43666.patch | 0 ...arty-mbedtls-0002-fix-CVE-2021-45451.patch | 0 19 files changed, 40 insertions(+), 37 deletions(-) rename 0000-add-dsoftbus-build-support-for-embedded-env.patch => build-0001-add-dsoftbus-build-support-for-embedded-env.patch (100%) rename 0001-support-hichian-for-openeuler.patch => build-0002-support-hichian-for-openeuler.patch (100%) rename 0002-add-deviceauth-ipc-sdk-compile.patch => build-0003-add-deviceauth-ipc-sdk-compile.patch (100%) rename 0011-change-set-for-obs-build.patch => build-0004-change-set-for-obs-build.patch (100%) rename 0003-Adaptation-for-dsoftbus.patch => commonlibrary-c-utils-0001-Adaptation-for-dsoftbus.patch (100%) rename 0013-add-productdefine-for-openeuler.patch => depend-0001-add-productdefine-for-openeuler.patch (100%) rename 0014-add-depend-for-openeuler.patch => depend-0002-add-depend-for-openeuler.patch (100%) rename 0017-simplify-dependency-for-dsoftbus-standard.patch => dsoftbus-standard-0001-simplify-dependency-for-dsoftbus-standard.patch (100%) rename 0012-Adaptation-for-dsoftbus.patch => libboundscheck-0001-Adaptation-for-dsoftbus.patch (100%) rename 0008-support-deviceauth-for-openeuler.patch => security-device-auth-0001-deviceauth-for-openeuler.patch (100%) rename 0009-adapter-deviceauth-ipc-service.patch => security-device-auth-0002-deviceauth-ipc-service.patch (100%) rename 0010-simplify-dependency-on-third-party-packages.patch => security-device-auth-0003-simplify-dependency-on-third-party-packages.patch (100%) rename 0007-support-huks-for-openeuler.patch => security-huks-0001-support-huks-for-openeuler.patch (100%) rename 0015-simplify-dependency-on-third-party-packages.patch => security-huks-0002-simplify-dependency-on-third-party-packages.patch (100%) rename 0016-adapter-cjson-in-openEuler-for-softbus.patch => third-party-cjson-0001-adapter-cjson-in-openEuler-for-softbus.patch (100%) rename 0004-Adaptation-for-dsoftbus-v3.1.2.patch => third-party-mbedtls-0001-Adaptation-for-dsoftbus.patch (100%) rename 0005-fix-CVE-2021-43666.patch => third-party-mbedtls-0002-fix-CVE-2021-43666.patch (100%) rename 0006-fix-CVE-2021-45451.patch => third-party-mbedtls-0002-fix-CVE-2021-45451.patch (100%) diff --git a/0000-add-dsoftbus-build-support-for-embedded-env.patch b/build-0001-add-dsoftbus-build-support-for-embedded-env.patch similarity index 100% rename from 0000-add-dsoftbus-build-support-for-embedded-env.patch rename to build-0001-add-dsoftbus-build-support-for-embedded-env.patch diff --git a/0001-support-hichian-for-openeuler.patch b/build-0002-support-hichian-for-openeuler.patch similarity index 100% rename from 0001-support-hichian-for-openeuler.patch rename to build-0002-support-hichian-for-openeuler.patch diff --git a/0002-add-deviceauth-ipc-sdk-compile.patch b/build-0003-add-deviceauth-ipc-sdk-compile.patch similarity index 100% rename from 0002-add-deviceauth-ipc-sdk-compile.patch rename to build-0003-add-deviceauth-ipc-sdk-compile.patch diff --git a/0011-change-set-for-obs-build.patch b/build-0004-change-set-for-obs-build.patch similarity index 100% rename from 0011-change-set-for-obs-build.patch rename to build-0004-change-set-for-obs-build.patch diff --git a/0003-Adaptation-for-dsoftbus.patch b/commonlibrary-c-utils-0001-Adaptation-for-dsoftbus.patch similarity index 100% rename from 0003-Adaptation-for-dsoftbus.patch rename to commonlibrary-c-utils-0001-Adaptation-for-dsoftbus.patch diff --git a/0013-add-productdefine-for-openeuler.patch b/depend-0001-add-productdefine-for-openeuler.patch similarity index 100% rename from 0013-add-productdefine-for-openeuler.patch rename to depend-0001-add-productdefine-for-openeuler.patch diff --git a/0014-add-depend-for-openeuler.patch b/depend-0002-add-depend-for-openeuler.patch similarity index 100% rename from 0014-add-depend-for-openeuler.patch rename to depend-0002-add-depend-for-openeuler.patch diff --git a/0017-simplify-dependency-for-dsoftbus-standard.patch b/dsoftbus-standard-0001-simplify-dependency-for-dsoftbus-standard.patch similarity index 100% rename from 0017-simplify-dependency-for-dsoftbus-standard.patch rename to dsoftbus-standard-0001-simplify-dependency-for-dsoftbus-standard.patch diff --git a/dsoftbus.spec b/dsoftbus.spec index d4515db..f099bed 100644 --- a/dsoftbus.spec +++ b/dsoftbus.spec @@ -14,7 +14,7 @@ Name: dsoftbus Version: 1.0.0 -Release: 3 +Release: 4 Summary: openEuler embedded softbus capability support License: Apache License 2.0 Url: https://openeuler.gitee.io/yocto-meta-openeuler/features/distributed_softbus.html @@ -27,24 +27,24 @@ Source5: https://gitee.com/openharmony/%{source_third_party_libcoap}/repository/ Source6: https://gitee.com/openharmony/%{source_third_party_mbedtls}/repository/archive/%{openHarmony_source_release}.tar.gz #/%{source_third_party_mbedtls}-%{openHarmony_source_release}.tar.gz Source7: https://gitee.com/openharmony/%{source_build}/repository/archive/%{release_build}.tar.gz #/%{source_build}-%{release_build}.tar.gz -Patch0000: 0000-add-dsoftbus-build-support-for-embedded-env.patch -Patch0001: 0001-support-hichian-for-openeuler.patch -Patch0002: 0002-add-deviceauth-ipc-sdk-compile.patch -Patch0003: 0003-Adaptation-for-dsoftbus.patch -Patch0004: 0004-Adaptation-for-dsoftbus-v3.1.2.patch -Patch0005: 0005-fix-CVE-2021-43666.patch -Patch0006: 0006-fix-CVE-2021-45451.patch -Patch0007: 0007-support-huks-for-openeuler.patch -Patch0008: 0008-support-deviceauth-for-openeuler.patch -Patch0009: 0009-adapter-deviceauth-ipc-service.patch -Patch0010: 0010-simplify-dependency-on-third-party-packages.patch -Patch0011: 0011-change-set-for-obs-build.patch -Patch0012: 0012-Adaptation-for-dsoftbus.patch -Patch0013: 0013-add-productdefine-for-openeuler.patch -Patch0014: 0014-add-depend-for-openeuler.patch -Patch0015: 0015-simplify-dependency-on-third-party-packages.patch -Patch0016: 0016-adapter-cjson-in-openEuler-for-softbus.patch -Patch0017: 0017-simplify-dependency-for-dsoftbus-standard.patch +Patch0000: build-0001-add-dsoftbus-build-support-for-embedded-env.patch +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 +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 +Patch0300: security-huks-0001-support-huks-for-openeuler.patch +Patch0301: security-huks-0002-simplify-dependency-on-third-party-packages.patch +Patch0400: commonlibrary-c-utils-0001-Adaptation-for-dsoftbus.patch +Patch0401: libboundscheck-0001-Adaptation-for-dsoftbus.patch +Patch0402: third-party-cjson-0001-adapter-cjson-in-openEuler-for-softbus.patch +Patch0403: third-party-mbedtls-0001-Adaptation-for-dsoftbus.patch +Patch0404: third-party-mbedtls-0002-fix-CVE-2021-43666.patch +Patch0405: third-party-mbedtls-0002-fix-CVE-2021-45451.patch +Patch0500: depend-0001-add-productdefine-for-openeuler.patch +Patch0501: depend-0002-add-depend-for-openeuler.patch BuildRequires: gcc, g++, cmake, python, zip, unzip, ninja-build, git, libboundscheck, cjson-devel, openssl-devel, gn @@ -109,24 +109,24 @@ mv %{_builddir}/%{source_security_device_auth}-%{openHarmony_source_release} ${d mv %{_builddir}/%{source_commonlibrary_c_utils}-%{openHarmony_source_release} ${dsoftbus_utils}/native # do patch -%patch -p1 -d ${dsoftbus_build_dir}/build +%patch0 -p1 -d ${dsoftbus_build_dir}/build %patch1 -p1 -d ${dsoftbus_build_dir}/build -%patch2 -p1 -d ${dsoftbus_build_dir}/build -%patch3 -p1 -d ${dsoftbus_utils}/native -%patch4 -p1 -d ${dsoftbus_thirdparty}/mbedtls -%patch5 -p1 -d ${dsoftbus_thirdparty}/mbedtls -%patch6 -p1 -d ${dsoftbus_thirdparty}/mbedtls -%patch7 -p1 -d ${dsoftbus_hichain}/huks -%patch8 -p1 -d ${dsoftbus_hichain}/deviceauth -%patch9 -p1 -d ${dsoftbus_hichain}/deviceauth -%patch10 -p1 -d ${dsoftbus_hichain}/deviceauth -%patch11 -p1 -d ${dsoftbus_build_dir}/build -%patch12 -p1 -d ${dsoftbus_thirdparty}/bounds_checking_function -%patch13 -p1 -d ${dsoftbus_productdefine} -%patch14 -p1 -d ${dsoftbus_depend} -%patch15 -p1 -d ${dsoftbus_hichain}/huks -%patch16 -p1 -d ${dsoftbus_thirdparty}/cJSON -%patch17 -p1 -d %{_builddir}/%{source_dsoftbus_standard} +%patch2 -p1 -d ${dsoftbus_build_dir}/build +%patch3 -p1 -d ${dsoftbus_build_dir}/build +%patch100 -p1 -d %{_builddir}/%{source_dsoftbus_standard} +%patch200 -p1 -d ${dsoftbus_hichain}/deviceauth +%patch201 -p1 -d ${dsoftbus_hichain}/deviceauth +%patch202 -p1 -d ${dsoftbus_hichain}/deviceauth +%patch300 -p1 -d ${dsoftbus_hichain}/huks +%patch301 -p1 -d ${dsoftbus_hichain}/huks +%patch400 -p1 -d ${dsoftbus_utils}/native +%patch401 -p1 -d ${dsoftbus_thirdparty}/bounds_checking_function +%patch402 -p1 -d ${dsoftbus_thirdparty}/cJSON +%patch403 -p1 -d ${dsoftbus_thirdparty}/mbedtls +%patch404 -p1 -d ${dsoftbus_thirdparty}/mbedtls +%patch405 -p1 -d ${dsoftbus_thirdparty}/mbedtls +%patch500 -p1 -d ${dsoftbus_productdefine} +%patch501 -p1 -d ${dsoftbus_depend} # init gn root ln -s ${dsoftbus_build_dir}/build/build_scripts/build.sh ${dsoftbus_build_dir}/build.sh @@ -199,6 +199,9 @@ ${dsoftbus_build_dir}/third_party/bounds_checking_function/include/*.h \ /data/data %changelog +* Mon Dec 19 2022 beiling.xie - 1.0.0-4 +- rename patch for each modules + * Wed Nov 30 2022 liheavy - 1.0.0-3 - Disassemble yocto-embedded-tools and replace cjson, ninja, gn, openssl, libboundscheck - with openEuler software package @@ -207,4 +210,4 @@ ${dsoftbus_build_dir}/third_party/bounds_checking_function/include/*.h \ - add URL,change branch of libboundscheck to 22.03-LTS-SP1 * Tue Nov 22 2022 xuchongyu - 1.0.0-1 -- init dsoftbus \ No newline at end of file +- init dsoftbus diff --git a/0012-Adaptation-for-dsoftbus.patch b/libboundscheck-0001-Adaptation-for-dsoftbus.patch similarity index 100% rename from 0012-Adaptation-for-dsoftbus.patch rename to libboundscheck-0001-Adaptation-for-dsoftbus.patch diff --git a/0008-support-deviceauth-for-openeuler.patch b/security-device-auth-0001-deviceauth-for-openeuler.patch similarity index 100% rename from 0008-support-deviceauth-for-openeuler.patch rename to security-device-auth-0001-deviceauth-for-openeuler.patch diff --git a/0009-adapter-deviceauth-ipc-service.patch b/security-device-auth-0002-deviceauth-ipc-service.patch similarity index 100% rename from 0009-adapter-deviceauth-ipc-service.patch rename to security-device-auth-0002-deviceauth-ipc-service.patch diff --git a/0010-simplify-dependency-on-third-party-packages.patch b/security-device-auth-0003-simplify-dependency-on-third-party-packages.patch similarity index 100% rename from 0010-simplify-dependency-on-third-party-packages.patch rename to security-device-auth-0003-simplify-dependency-on-third-party-packages.patch diff --git a/0007-support-huks-for-openeuler.patch b/security-huks-0001-support-huks-for-openeuler.patch similarity index 100% rename from 0007-support-huks-for-openeuler.patch rename to security-huks-0001-support-huks-for-openeuler.patch diff --git a/0015-simplify-dependency-on-third-party-packages.patch b/security-huks-0002-simplify-dependency-on-third-party-packages.patch similarity index 100% rename from 0015-simplify-dependency-on-third-party-packages.patch rename to security-huks-0002-simplify-dependency-on-third-party-packages.patch diff --git a/0016-adapter-cjson-in-openEuler-for-softbus.patch b/third-party-cjson-0001-adapter-cjson-in-openEuler-for-softbus.patch similarity index 100% rename from 0016-adapter-cjson-in-openEuler-for-softbus.patch rename to third-party-cjson-0001-adapter-cjson-in-openEuler-for-softbus.patch diff --git a/0004-Adaptation-for-dsoftbus-v3.1.2.patch b/third-party-mbedtls-0001-Adaptation-for-dsoftbus.patch similarity index 100% rename from 0004-Adaptation-for-dsoftbus-v3.1.2.patch rename to third-party-mbedtls-0001-Adaptation-for-dsoftbus.patch diff --git a/0005-fix-CVE-2021-43666.patch b/third-party-mbedtls-0002-fix-CVE-2021-43666.patch similarity index 100% rename from 0005-fix-CVE-2021-43666.patch rename to third-party-mbedtls-0002-fix-CVE-2021-43666.patch diff --git a/0006-fix-CVE-2021-45451.patch b/third-party-mbedtls-0002-fix-CVE-2021-45451.patch similarity index 100% rename from 0006-fix-CVE-2021-45451.patch rename to third-party-mbedtls-0002-fix-CVE-2021-45451.patch -- Gitee