From: Konstantin Demin Date: Tue, 8 Jul 2025 16:12:26 +0000 (+0300) Subject: dropbear: simplify rebuild on config changes X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=3dc05213e0261bb960006c957c32f8f14559abe9;p=openwrt%2Fstaging%2Fnbd.git 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 --- 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