From e479b9e8e85324473514909e93fedc98a13b026e Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Tue, 20 Jan 2015 13:08:40 +0100 Subject: [PATCH] ports: also hash patches with absolute path names Fixes #1305 --- repos/base-fiasco/ports/fiasco.hash | 2 +- repos/base-okl4/ports/okl4.hash | 2 +- repos/base-pistachio/ports/pistachio.hash | 2 +- repos/dde_rump/ports/dde_rump.hash | 2 +- repos/ports-foc/ports/l4android.hash | 2 +- repos/ports/ports/gcc.hash | 2 +- repos/ports/ports/gdb.hash | 2 +- tool/ports/mk/hash.inc | 3 ++- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/repos/base-fiasco/ports/fiasco.hash b/repos/base-fiasco/ports/fiasco.hash index af40b6e66..c9f8558a0 100644 --- a/repos/base-fiasco/ports/fiasco.hash +++ b/repos/base-fiasco/ports/fiasco.hash @@ -1 +1 @@ -fa0ea19bd94fb109dac558e37996b60243eef785 +ac9483f591c9b8dd4ed22b28e3a7e7ee382011bd diff --git a/repos/base-okl4/ports/okl4.hash b/repos/base-okl4/ports/okl4.hash index 577eb2b8e..82dc2840e 100644 --- a/repos/base-okl4/ports/okl4.hash +++ b/repos/base-okl4/ports/okl4.hash @@ -1 +1 @@ -06721926fab2ff7d03d4e4236cd70fe73e0103b5 +008372202d6280ef7eb8866eac7a79d6b5afd2ea diff --git a/repos/base-pistachio/ports/pistachio.hash b/repos/base-pistachio/ports/pistachio.hash index cd240e77c..fb963446d 100644 --- a/repos/base-pistachio/ports/pistachio.hash +++ b/repos/base-pistachio/ports/pistachio.hash @@ -1 +1 @@ -ceb4b1cc933a5caef903680c8723cd6fb73e1b12 +72a9aff6c60b22d2c372c44fea6ff5846c077ad5 diff --git a/repos/dde_rump/ports/dde_rump.hash b/repos/dde_rump/ports/dde_rump.hash index 89ee33e5b..a7a5c52f6 100644 --- a/repos/dde_rump/ports/dde_rump.hash +++ b/repos/dde_rump/ports/dde_rump.hash @@ -1 +1 @@ -d3121f30954b15d2da548e8361dbaf419e6124b5 +fe90aa7ca739eb69c0e0e422756f1d36f3d744ec diff --git a/repos/ports-foc/ports/l4android.hash b/repos/ports-foc/ports/l4android.hash index 567b4d4f8..b5cce0a73 100644 --- a/repos/ports-foc/ports/l4android.hash +++ b/repos/ports-foc/ports/l4android.hash @@ -1 +1 @@ -6f4b3df35e4f917ebbac94bfd6e16ef60f893801 +cc3203080fe5e1c5029c47fd7f73fab76c71b9ed diff --git a/repos/ports/ports/gcc.hash b/repos/ports/ports/gcc.hash index a6a7ee756..21f0bc6af 100644 --- a/repos/ports/ports/gcc.hash +++ b/repos/ports/ports/gcc.hash @@ -1 +1 @@ -e4777031d6e3087020f16e75f4cba0214457db5f +f5f038bc4232d78154248b6ce85b94108ca55255 diff --git a/repos/ports/ports/gdb.hash b/repos/ports/ports/gdb.hash index c93707c44..62b301fe7 100644 --- a/repos/ports/ports/gdb.hash +++ b/repos/ports/ports/gdb.hash @@ -1 +1 @@ -fc1df6347d793d4ebb8c354229413021ae74d955 +cb83a224ef03153433cb1ea03100301e88450f02 diff --git a/tool/ports/mk/hash.inc b/tool/ports/mk/hash.inc index caacc2b79..479113572 100644 --- a/tool/ports/mk/hash.inc +++ b/tool/ports/mk/hash.inc @@ -15,7 +15,8 @@ # STRICT_HASH to 'no', the MAKEFILE_LIST can be exluded. # -_PATCHES_IN_REP_DIR := $(foreach P,$(PATCHES),$(wildcard $(REP_DIR)/$(P))) +_PATCHES_IN_REP_DIR := $(foreach P,$(PATCHES),\ + $(wildcard $(REP_DIR)/$(subst $(REP_DIR)/,,$(P)))) HASH_INPUT += $(sort $(_PATCHES_IN_REP_DIR)) $(PORT) ifneq ($(STRICT_HASH),no)