From: Konstantin Demin <rockdrilla@gmail.com>
Date: Tue, 9 Jan 2024 00:40:01 +0000 (+0300)
Subject: dropbear: better object cleanup
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fa849fd41150d375017ebe7add34824b62f4cdd4;p=openwrt%2Fstaging%2Fjow.git

dropbear: better object cleanup

improves b78aae79

Signed-off-by: Konstantin Demin <rockdrilla@gmail.com>
---

diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile
index 1859aab7f4..75dee77af0 100644
--- a/package/network/services/dropbear/Makefile
+++ b/package/network/services/dropbear/Makefile
@@ -165,6 +165,11 @@ 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)
@@ -172,8 +177,8 @@ define Build/Configure
 	: > $(PKG_BUILD_DIR)/localoptions.h
 	$(Build/Configure/dropbear_headers)
 
-	# Enforce rebuild of svr-chansession.c
-	rm -f $(PKG_BUILD_DIR)/svr-chansession.o
+	# Enforce rebuild of files depending on configured options
+	$(Build/Configure/dropbear_objects)
 
 	# Rebuild them on config change
 	+$(MAKE) -C $(PKG_BUILD_DIR)/libtomcrypt clean