diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2014-10-07 10:47:06 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2014-10-07 10:47:06 +0200 |
| commit | 93fac61da535d9329e37567cc8d07bd5305020a5 (patch) | |
| tree | a81bef98d6cfb59e28ecf5223ac2651e6d4d62f6 /testing/scripts | |
| parent | f83215bbdb2e363f733594dbaca639b86a4fd59a (diff) | |
| download | strongswan-93fac61da535d9329e37567cc8d07bd5305020a5.tar.bz2 strongswan-93fac61da535d9329e37567cc8d07bd5305020a5.tar.xz | |
testing: Make TKM related build recipes future-proof
The tkm scenarios recently failed due to a segmentation fault on my host
because I had an old build of the tkm library already built in the build
directory. Because the stamp file was not versioned the new release was
never checked out or built and charon-tkm was linked against the old
version causing a segmentation fault during key derivation.
Diffstat (limited to 'testing/scripts')
| -rw-r--r-- | testing/scripts/recipes/005_anet.mk | 10 | ||||
| -rw-r--r-- | testing/scripts/recipes/006_tkm-rpc.mk | 10 | ||||
| -rw-r--r-- | testing/scripts/recipes/007_x509-ada.mk | 10 | ||||
| -rw-r--r-- | testing/scripts/recipes/008_xfrm-ada.mk | 10 | ||||
| -rw-r--r-- | testing/scripts/recipes/009_xfrm-proxy.mk | 10 | ||||
| -rw-r--r-- | testing/scripts/recipes/010_tkm.mk | 10 |
6 files changed, 36 insertions, 24 deletions
diff --git a/testing/scripts/recipes/005_anet.mk b/testing/scripts/recipes/005_anet.mk index 2a3023c42..2d982d091 100644 --- a/testing/scripts/recipes/005_anet.mk +++ b/testing/scripts/recipes/005_anet.mk @@ -8,14 +8,16 @@ PREFIX = /usr/local/ada all: install -.$(PKG)-cloned: +$(PKG): git clone $(SRC) $(PKG) - cd $(PKG) && git checkout $(REV) + +.$(PKG)-cloned-$(REV): $(PKG) + cd $(PKG) && git fetch && git checkout $(REV) @touch $@ -.$(PKG)-built: .$(PKG)-cloned +.$(PKG)-built-$(REV): .$(PKG)-cloned-$(REV) cd $(PKG) && make LIBRARY_KIND=static @touch $@ -install: .$(PKG)-built +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 9e1d2cfc6..6c4aae0c5 100644 --- a/testing/scripts/recipes/006_tkm-rpc.mk +++ b/testing/scripts/recipes/006_tkm-rpc.mk @@ -10,14 +10,16 @@ export ADA_PROJECT_PATH=$(PREFIX)/lib/gnat all: install -.$(PKG)-cloned: +$(PKG): git clone $(SRC) $(PKG) - cd $(PKG) && git checkout $(REV) + +.$(PKG)-cloned-$(REV): $(PKG) + cd $(PKG) && git fetch && git checkout $(REV) @touch $@ -.$(PKG)-built: .$(PKG)-cloned +.$(PKG)-built-$(REV): .$(PKG)-cloned-$(REV) cd $(PKG) && make @touch $@ -install: .$(PKG)-built +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 4be7c92e4..7899f6dec 100644 --- a/testing/scripts/recipes/007_x509-ada.mk +++ b/testing/scripts/recipes/007_x509-ada.mk @@ -8,14 +8,16 @@ PREFIX = /usr/local/ada all: install -.$(PKG)-cloned: +$(PKG): git clone $(SRC) $(PKG) - cd $(PKG) && git checkout $(REV) + +.$(PKG)-cloned-$(REV): $(PKG) + cd $(PKG) && git fetch && git checkout $(REV) @touch $@ -.$(PKG)-built: .$(PKG)-cloned +.$(PKG)-built-$(REV): .$(PKG)-cloned-$(REV) cd $(PKG) && make tests && make @touch $@ -install: .$(PKG)-built +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 6ad451340..ad1cbb2bc 100644 --- a/testing/scripts/recipes/008_xfrm-ada.mk +++ b/testing/scripts/recipes/008_xfrm-ada.mk @@ -10,14 +10,16 @@ export ADA_PROJECT_PATH=$(PREFIX)/lib/gnat all: install -.$(PKG)-cloned: +$(PKG): git clone $(SRC) $(PKG) - cd $(PKG) && git checkout $(REV) + +.$(PKG)-cloned-$(REV): $(PKG) + cd $(PKG) && git fetch && git checkout $(REV) @touch $@ -.$(PKG)-built: .$(PKG)-cloned +.$(PKG)-built-$(REV): .$(PKG)-cloned-$(REV) cd $(PKG) && make @touch $@ -install: .$(PKG)-built +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 569fbfe3c..a7c9d31cc 100644 --- a/testing/scripts/recipes/009_xfrm-proxy.mk +++ b/testing/scripts/recipes/009_xfrm-proxy.mk @@ -8,14 +8,16 @@ export ADA_PROJECT_PATH=/usr/local/ada/lib/gnat all: install -.$(PKG)-cloned: +$(PKG): git clone $(SRC) $(PKG) - cd $(PKG) && git checkout $(REV) + +.$(PKG)-cloned-$(REV): $(PKG) + cd $(PKG) && git fetch && git checkout $(REV) @touch $@ -.$(PKG)-built: .$(PKG)-cloned +.$(PKG)-built-$(REV): .$(PKG)-cloned-$(REV) cd $(PKG) && make @touch $@ -install: .$(PKG)-built +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 960eba79f..12eafd6c8 100644 --- a/testing/scripts/recipes/010_tkm.mk +++ b/testing/scripts/recipes/010_tkm.mk @@ -8,14 +8,16 @@ export ADA_PROJECT_PATH=/usr/local/ada/lib/gnat all: install -.$(PKG)-cloned: +$(PKG): git clone $(SRC) $(PKG) - cd $(PKG) && git checkout $(REV) + +.$(PKG)-cloned-$(REV): $(PKG) + cd $(PKG) && git fetch && git checkout $(REV) @touch $@ -.$(PKG)-built: .$(PKG)-cloned +.$(PKG)-built-$(REV): .$(PKG)-cloned-$(REV) cd $(PKG) && make @touch $@ -install: .$(PKG)-built +install: .$(PKG)-built-$(REV) cd $(PKG) && make install |