aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2021-02-15 18:53:42 +0100
committerFelix Fietkau <nbd@nbd.name>2021-02-15 18:56:50 +0100
commit542eab31a60227bd429cb0207199daf83dd6850f (patch)
treecc054175a87ca647fe306637b020d6d507d275b2
parent075fa4cd9ae2ee5e9715fad2f70b2092ddc9ac2d (diff)
downloadupstream-542eab31a60227bd429cb0207199daf83dd6850f.tar.gz
upstream-542eab31a60227bd429cb0207199daf83dd6850f.tar.bz2
upstream-542eab31a60227bd429cb0207199daf83dd6850f.zip
build: only overwrite ABI version for provided packages when base version changed
Should avoid some spurious rebuilds Signed-off-by: Felix Fietkau <nbd@nbd.name>
-rw-r--r--include/package-ipkg.mk10
1 files 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 $$@