[openwrt/openwrt] dropbear: simplify rebuild on config changes

LEDE Commits lede-commits at lists.infradead.org
Fri Jul 11 02:23:59 PDT 2025


aparcar pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/3dc05213e0261bb960006c957c32f8f14559abe9

commit 3dc05213e0261bb960006c957c32f8f14559abe9
Author: Konstantin Demin <rockdrilla at gmail.com>
AuthorDate: Tue Jul 8 19:12:26 2025 +0300

    dropbear: simplify rebuild on config changes
    
    It's hard or even impossible to track affected sources
    so it's safe to remove all built objects (if any).
    
    Signed-off-by: Konstantin Demin <rockdrilla at gmail.com>
---
 package/network/services/dropbear/Makefile | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile
index 5bedcc171d..c997798860 100644
--- a/package/network/services/dropbear/Makefile
+++ b/package/network/services/dropbear/Makefile
@@ -233,11 +233,6 @@ define Build/Configure/dropbear_headers
 	))
 endef
 
-define Build/Configure/dropbear_objects
-	grep -ERZl -e '($(subst $(space),|,$(strip $(sort $(patsubst !!%,%,$(foreach s,$(DB_OPT_COMMON) $(DB_OPT_CONFIG),$(word 1,$(subst $(comma),$(space),$(s)))))))))' \
-	$(PKG_BUILD_DIR)/ | sed -zE 's/^(.+)\.[^.]+$$$$/\1.o/' | sort -uV | xargs -0 -r rm -fv || :
-endef
-
 define Build/Configure
 	rm -f $(PKG_BUILD_DIR)/localoptions.h
 	$(Build/Configure/Default)
@@ -245,10 +240,8 @@ define Build/Configure
 	: > $(PKG_BUILD_DIR)/localoptions.h
 	$(Build/Configure/dropbear_headers)
 
-	# Enforce rebuild of files depending on configured options
-	$(Build/Configure/dropbear_objects)
-
-	# Rebuild them on config change
+	# Enforce rebuild
+	rm -rf $(PKG_BUILD_DIR)/obj
 	+$(MAKE) -C $(PKG_BUILD_DIR)/libtomcrypt clean
 	+$(MAKE) -C $(PKG_BUILD_DIR)/libtommath clean
 endef




More information about the lede-commits mailing list