testing: Improve building different revisions of Git-recipes

If we check out and build a certain revision of a dependency in a branch and
switch to another that requires a different revision and then switch back,
the previous approach installed the wrong revision as it would incorrectly
assume the required revision was already built and ready to install.

diff --git a/testing/scripts/recipes/005_anet.mk b/testing/scripts/recipes/005_anet.mk
index b311c0a99fe26d05f40ee71b0a105408e9b2cc1a..abb2db4d3a7914b9bbdd8d9a55863b9e2936f0f5 100644 (file)
--- a/testing/scripts/recipes/005_anet.mk
+++ b/testing/scripts/recipes/005_anet.mk
@@ -14,11 +14,11 @@ all: install
 
 .$(PKG)-checkout-$(REV): .$(PKG)-cloned
        cd $(PKG) && git fetch && git checkout $(REV)
-       @touch $@
+       @rm -f .$(PKG)-checkout-* && touch $@
 
 .$(PKG)-built-$(REV): .$(PKG)-checkout-$(REV)
        cd $(PKG) && make LIBRARY_KIND=static
-       @touch $@
+       @rm -f .$(PKG)-built-* && touch $@
 
 install: .$(PKG)-built-$(REV)
        cd $(PKG) && make PREFIX=$(PREFIX) LIBRARY_KIND=static install

diff --git a/testing/scripts/recipes/006_tkm-rpc.mk b/testing/scripts/recipes/006_tkm-rpc.mk
index 22e34fad3931f9bf7085b2f87a577b71c36de279..f80cd6e715f6bbfd1dbd79c1b43b61379eb4094f 100644 (file)
--- a/testing/scripts/recipes/006_tkm-rpc.mk
+++ b/testing/scripts/recipes/006_tkm-rpc.mk
@@ -16,11 +16,11 @@ all: install
 
 .$(PKG)-checkout-$(REV): .$(PKG)-cloned
        cd $(PKG) && git fetch && git checkout $(REV)
-       @touch $@
+       @rm -f .$(PKG)-checkout-* && touch $@
 
 .$(PKG)-built-$(REV): .$(PKG)-checkout-$(REV)
        cd $(PKG) && make
-       @touch $@
+       @rm -f .$(PKG)-built-* && touch $@
 
 install: .$(PKG)-built-$(REV)
        cd $(PKG) && make PREFIX=$(PREFIX) install

diff --git a/testing/scripts/recipes/007_x509-ada.mk b/testing/scripts/recipes/007_x509-ada.mk
index 112f93999c3050c5ed0172c28597c741065f85c5..08e57fc603179555e646e821ff0240c43934df01 100644 (file)
--- a/testing/scripts/recipes/007_x509-ada.mk
+++ b/testing/scripts/recipes/007_x509-ada.mk
@@ -14,11 +14,11 @@ all: install
 
 .$(PKG)-checkout-$(REV): .$(PKG)-cloned
        cd $(PKG) && git fetch && git checkout $(REV)
-       @touch $@
+       @rm -f .$(PKG)-checkout-* && touch $@
 
 .$(PKG)-built-$(REV): .$(PKG)-checkout-$(REV)
        cd $(PKG) && make tests && make
-       @touch $@
+       @rm -f .$(PKG)-built-* && touch $@
 
 install: .$(PKG)-built-$(REV)
        cd $(PKG) && make PREFIX=$(PREFIX) install

diff --git a/testing/scripts/recipes/008_xfrm-ada.mk b/testing/scripts/recipes/008_xfrm-ada.mk
index 64ada0e45e7d90d1e33454bd1678160426913f2f..82590eeb0ae6729cc06ea85ad29cea9567512557 100644 (file)
--- a/testing/scripts/recipes/008_xfrm-ada.mk
+++ b/testing/scripts/recipes/008_xfrm-ada.mk
@@ -16,11 +16,11 @@ all: install
 
 .$(PKG)-checkout-$(REV): .$(PKG)-cloned
        cd $(PKG) && git fetch && git checkout $(REV)
-       @touch $@
+       @rm -f .$(PKG)-checkout-* && touch $@
 
 .$(PKG)-built-$(REV): .$(PKG)-checkout-$(REV)
        cd $(PKG) && make
-       @touch $@
+       @rm -f .$(PKG)-built-* && touch $@
 
 install: .$(PKG)-built-$(REV)
        cd $(PKG) && make PREFIX=$(PREFIX) install

diff --git a/testing/scripts/recipes/009_xfrm-proxy.mk b/testing/scripts/recipes/009_xfrm-proxy.mk
index bdf5b121163b644a5c7efcc812e5290950899c1d..dc42b3673be0f31874e923b9ead719d74bb424b9 100644 (file)
--- a/testing/scripts/recipes/009_xfrm-proxy.mk
+++ b/testing/scripts/recipes/009_xfrm-proxy.mk
@@ -14,11 +14,11 @@ all: install
 
 .$(PKG)-checkout-$(REV): .$(PKG)-cloned
        cd $(PKG) && git fetch && git checkout $(REV)
-       @touch $@
+       @rm -f .$(PKG)-checkout-* && touch $@
 
 .$(PKG)-built-$(REV): .$(PKG)-checkout-$(REV)
        cd $(PKG) && make
-       @touch $@
+       @rm -f .$(PKG)-built-* && touch $@
 
 install: .$(PKG)-built-$(REV)
        cd $(PKG) && make install

diff --git a/testing/scripts/recipes/010_tkm.mk b/testing/scripts/recipes/010_tkm.mk
index 2651660db687b0c598e24297b17656e16b71ca13..863a755d61ab43e3f0e6e4e990d1a363c6bac2dc 100644 (file)
--- a/testing/scripts/recipes/010_tkm.mk
+++ b/testing/scripts/recipes/010_tkm.mk
@@ -14,11 +14,11 @@ all: install
 
 .$(PKG)-checkout-$(REV): .$(PKG)-cloned
        cd $(PKG) && git fetch && git checkout $(REV)
-       @touch $@
+       @rm -f .$(PKG)-checkout-* && touch $@
 
 .$(PKG)-built-$(REV): .$(PKG)-checkout-$(REV)
        cd $(PKG) && make
-       @touch $@
+       @rm -f .$(PKG)-built-* && touch $@
 
 install: .$(PKG)-built-$(REV)
        cd $(PKG) && make install

diff --git a/testing/scripts/recipes/011_botan.mk b/testing/scripts/recipes/011_botan.mk
index 3224f62500490254e541068f4361a78c2859fc52..eea21043b8bf8a49890fc81ddac08e2c13c912cb 100644 (file)
--- a/testing/scripts/recipes/011_botan.mk
+++ b/testing/scripts/recipes/011_botan.mk
@@ -20,11 +20,11 @@ all: install
 
 .$(PKG)-checkout-$(REV): .$(PKG)-cloned
        cd $(PKG) && git fetch && git checkout $(REV)
-       @touch $@
+       @rm -f .$(PKG)-checkout-* && touch $@
 
 .$(PKG)-built-$(REV): .$(PKG)-checkout-$(REV)
        cd $(PKG) && python ./configure.py $(CONFIG_OPTS) && make -j $(NUM_CPUS)
-       @touch $@
+       @rm -f .$(PKG)-built-* && touch $@
 
 install: .$(PKG)-built-$(REV)
        cd $(PKG) && make install && ldconfig