[openwrt/openwrt] iproute2: Avoid unnecessary package rebuilds

LEDE Commits lede-commits at lists.infradead.org
Tue Nov 2 01:57:10 PDT 2021


nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/4ea0cfe810bd3e0f8c3470eb79a3ec8019b07487

commit 4ea0cfe810bd3e0f8c3470eb79a3ec8019b07487
Author: Eneas U de Queiroz <cotequeiroz at gmail.com>
AuthorDate: Thu Oct 21 10:35:41 2021 -0300

    iproute2: Avoid unnecessary package rebuilds
    
    Build the tc-mod-iptables before the tc-tiny and tc-full packages.
    
    This avoids unnecessary package rebuild when calling make back to back.
    Before this change, tc-mod-iptables will be built after the main tc
    binary packages.
    
    Both tc-tiny and tc-full depend on tc-mod-ipables.  If make is called
    after the packages are already built, it will check the timestamps of
    both packages, and will rebuild the main binaries, since the module
    package will be newer than the tc package.
    
    Calling BuildPackage,mod-iptables first ensures that its variant gets
    built before the other packages' variants.
    
    Signed-off-by: Eneas U de Queiroz <cotequeiroz at gmail.com>
---
 package/network/utils/iproute2/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile
index cfcdb8cc53..ca3cb4753a 100644
--- a/package/network/utils/iproute2/Makefile
+++ b/package/network/utils/iproute2/Makefile
@@ -232,9 +232,11 @@ endef
 
 $(eval $(call BuildPackage,ip-tiny))
 $(eval $(call BuildPackage,ip-full))
+# build tc-mod-iptables before its dependents, to avoid
+# spurious rebuilds when building multiple variants.
+$(eval $(call BuildPackage,tc-mod-iptables))
 $(eval $(call BuildPackage,tc-tiny))
 $(eval $(call BuildPackage,tc-full))
-$(eval $(call BuildPackage,tc-mod-iptables))
 $(eval $(call BuildPackage,genl))
 $(eval $(call BuildPackage,ip-bridge))
 $(eval $(call BuildPackage,ss))



More information about the lede-commits mailing list