From b3620fa3c832170e14a2dd0e6966f2cbfee5382f Mon Sep 17 00:00:00 2001 From: Felix Stupp Date: Mon, 18 May 2020 17:09:47 +0200 Subject: [PATCH] dns/application: makefile combine: Sort files before combining Ensures 0_main.db is before other files --- roles/dns/application/templates/zones.makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/dns/application/templates/zones.makefile b/roles/dns/application/templates/zones.makefile index cd290c1..9a93b17 100644 --- a/roles/dns/application/templates/zones.makefile +++ b/roles/dns/application/templates/zones.makefile @@ -8,4 +8,4 @@ zones:=$(zone_dirs:/=) all: $(addprefix ${dest}/,$(addsuffix /${dest_name},${zones})) ${dest}/%/${dest_name}: %/*.db - cat $^ | sed '0,/^ 0$$/s// '"$$(($$(date +%s) / 60))"'/' > "$@"; + cat $(sort $^) | sed '0,/^ 0$$/s// '"$$(($$(date +%s) / 60))"'/' > "$@";