[openwrt/openwrt] mbedtls: move source modification to patch

LEDE Commits lede-commits at lists.infradead.org
Wed Jan 18 14:39:31 PST 2023


blocktrron pushed a commit to openwrt/openwrt.git, branch openwrt-22.03:
https://git.openwrt.org/9a12afc5e74442290e7b91bc7aff6ace4e9ab4b4

commit 9a12afc5e74442290e7b91bc7aff6ace4e9ab4b4
Author: David Bauer <mail at david-bauer.net>
AuthorDate: Wed Jan 18 22:06:36 2023 +0100

    mbedtls: move source modification to patch
    
    Patch the mbedtls source instead of modifying the compile-targets
    in the prepare buildstep within OpenWrt.
    
    Signed-off-by: David Bauer <mail at david-bauer.net>
    (cherry picked from commit 00f1463df7e690862403208082f71fb4741baf02)
---
 package/libs/mbedtls/Makefile                      |  3 ---
 package/libs/mbedtls/patches/101-remove-test.patch | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile
index ee1a58c7b2..cfaa71c817 100644
--- a/package/libs/mbedtls/Makefile
+++ b/package/libs/mbedtls/Makefile
@@ -111,9 +111,6 @@ define Build/Configure
 	     END { exit(rc) }' $(PKG_BUILD_DIR)/include/mbedtls/config.h \
 	     >$(PKG_BUILD_DIR)/include/mbedtls/config.h.new && \
 	mv $(PKG_BUILD_DIR)/include/mbedtls/config.h.new $(PKG_BUILD_DIR)/include/mbedtls/config.h
-
-	sed -i '/fuzz/d' $(PKG_BUILD_DIR)/programs/CMakeLists.txt
-	sed -i '/test/d' $(PKG_BUILD_DIR)/programs/CMakeLists.txt
 endef
 
 define Build/InstallDev
diff --git a/package/libs/mbedtls/patches/101-remove-test.patch b/package/libs/mbedtls/patches/101-remove-test.patch
new file mode 100644
index 0000000000..e43f8757d7
--- /dev/null
+++ b/package/libs/mbedtls/patches/101-remove-test.patch
@@ -0,0 +1,15 @@
+--- a/programs/CMakeLists.txt
++++ b/programs/CMakeLists.txt
+@@ -1,12 +1,8 @@
+ add_subdirectory(aes)
+-if (NOT WIN32)
+-    add_subdirectory(fuzz)
+-endif()
+ add_subdirectory(hash)
+ add_subdirectory(pkey)
+ add_subdirectory(psa)
+ add_subdirectory(random)
+ add_subdirectory(ssl)
+-add_subdirectory(test)
+ add_subdirectory(util)
+ add_subdirectory(x509)




More information about the lede-commits mailing list