From 542eab31a60227bd429cb0207199daf83dd6850f Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 15 Feb 2021 18:53:42 +0100 Subject: [PATCH] build: only overwrite ABI version for provided packages when base version changed Should avoid some spurious rebuilds Signed-off-by: Felix Fietkau --- include/package-ipkg.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index eaa80ebc75..a8210f8e31 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -156,12 +156,12 @@ ifeq ($(DUMP),) $(STAGING_DIR_ROOT)/stamp/.$(1)_installed: $(PKG_BUILD_DIR)/.pkgdir/$(1).installed mkdir -p $(STAGING_DIR_ROOT)/stamp - $(if $(ABI_VERSION),echo '$(ABI_VERSION)' | cmp -s - $(PKG_INFO_DIR)/$(1).version || \ - echo '$(ABI_VERSION)' > $(PKG_INFO_DIR)/$(1).version \ - $(foreach pkg,$(filter-out $(1),$(PROVIDES)),; \ - cp $(PKG_INFO_DIR)/$(1).version $(PKG_INFO_DIR)/$(pkg).version \ + $(if $(ABI_VERSION),echo '$(ABI_VERSION)' | cmp -s - $(PKG_INFO_DIR)/$(1).version || { \ + echo '$(ABI_VERSION)' > $(PKG_INFO_DIR)/$(1).version; \ + $(foreach pkg,$(filter-out $(1),$(PROVIDES)), \ + cp $(PKG_INFO_DIR)/$(1).version $(PKG_INFO_DIR)/$(pkg).version; \ ) \ - ) + } ) $(call locked,$(CP) $(PKG_BUILD_DIR)/.pkgdir/$(1)/. $(STAGING_DIR_ROOT)/,root-copy) touch $$@ -- 2.30.2