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

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


blocktrron pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/00f1463df7e690862403208082f71fb4741baf02

commit 00f1463df7e690862403208082f71fb4741baf02
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>
---
 package/libs/mbedtls/Makefile                      |  7 -------
 package/libs/mbedtls/patches/101-remove-test.patch | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile
index b07f0477e4..2ae3fdbe2a 100644
--- a/package/libs/mbedtls/Makefile
+++ b/package/libs/mbedtls/Makefile
@@ -130,13 +130,6 @@ CMAKE_OPTIONS += \
 	-DENABLE_TESTING:Bool=OFF \
 	-DENABLE_PROGRAMS:Bool=ON
 
-define Build/Configure
-	$(call Build/Configure/Default)
-
-	sed -i '/fuzz/d' $(PKG_BUILD_DIR)/programs/CMakeLists.txt
-	sed -i '/test/d' $(PKG_BUILD_DIR)/programs/CMakeLists.txt
-endef
-
 define Build/Prepare
        $(call Build/Prepare/Default)
 
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