From 6d3a41a95ced4f5c52ef979ef889885f20e0a79c Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Mon, 2 Jun 2014 11:30:21 +0200 Subject: [PATCH] tool: Sort patches when generating port hashes Issue #1082 --- repos/libports/ports/sdl.hash | 2 +- repos/libports/ports/sdl_net.hash | 2 +- repos/ports/ports/arora.hash | 2 +- repos/ports/ports/e2fsprogs.hash | 2 +- tool/ports/mk/hash.inc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/repos/libports/ports/sdl.hash b/repos/libports/ports/sdl.hash index 0d5550612..c0f558c63 100644 --- a/repos/libports/ports/sdl.hash +++ b/repos/libports/ports/sdl.hash @@ -1 +1 @@ -0f3f665ddc8cd8ce708b1be6f6b6a8cdbd728b68 +a792d3e8dcb7ffa33d4f9499cc91636dc2e01458 diff --git a/repos/libports/ports/sdl_net.hash b/repos/libports/ports/sdl_net.hash index 99f405cbf..b793103cd 100644 --- a/repos/libports/ports/sdl_net.hash +++ b/repos/libports/ports/sdl_net.hash @@ -1 +1 @@ -8dfc085362ce8811499d90a5a71201e367928039 +9785ef8dfeaf78080bc65e261cd44b1941673f6f diff --git a/repos/ports/ports/arora.hash b/repos/ports/ports/arora.hash index 4056f5f4b..83fbcb85c 100644 --- a/repos/ports/ports/arora.hash +++ b/repos/ports/ports/arora.hash @@ -1 +1 @@ -c2079d96ada183f0578e1a22f97ba64381440df2 +30ef50566b10bb50064f0f22eb9f8522bf6bd643 diff --git a/repos/ports/ports/e2fsprogs.hash b/repos/ports/ports/e2fsprogs.hash index 18967c4cc..64a284b1d 100644 --- a/repos/ports/ports/e2fsprogs.hash +++ b/repos/ports/ports/e2fsprogs.hash @@ -1 +1 @@ -32dc58e00888a52dabbc92f261e45ccdcb2ab01f +6bfde968470405032d42e69e8af572a706759b5f diff --git a/tool/ports/mk/hash.inc b/tool/ports/mk/hash.inc index 57e92b5be..caacc2b79 100644 --- a/tool/ports/mk/hash.inc +++ b/tool/ports/mk/hash.inc @@ -17,7 +17,7 @@ _PATCHES_IN_REP_DIR := $(foreach P,$(PATCHES),$(wildcard $(REP_DIR)/$(P))) -HASH_INPUT += $(_PATCHES_IN_REP_DIR) $(PORT) +HASH_INPUT += $(sort $(_PATCHES_IN_REP_DIR)) $(PORT) ifneq ($(STRICT_HASH),no) HASH_INPUT += $(MAKEFILE_LIST) endif