From bf22f5b0a420a961d032a0529079b8ca092788b7 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 30 Jul 2014 23:13:41 +0200 Subject: Simplify Makefile: Drop checksumfiles (sign each profile directly instead. --- Makefile | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index b123cc5..e443d08 100644 --- a/Makefile +++ b/Makefile @@ -11,13 +11,10 @@ mainlcgroupfiles = $(patsubst %,content/desktop/%/preseed.cfg,$(lcgroups)) profiles-di = $(mainfiles) $(mainlcgroupfiles) profiles-script = $(patsubst %/preseed.cfg,%/script.sh,$(profiles-di)) profiles = $(profiles-di) $(profiles-script) -mdfiles = content/MD5SUMS -shafiles = $(patsubst %,content/SHA%SUMS,1 256 512) -checksumfiles = $(mdfiles) $(shafiles) -signfiles = $(patsubst %,%.sig,$(checksumfiles)) +signfiles = $(patsubst %,%.sig,$(profiles)) info = content/NEWS content/TODO -all: $(checksumfiles) $(info) +all: $(profiles) $(info) sign: $(signfiles) $(mainfiles): content/%/preseed.cfg : skel/preseed.cfg.in profiles/% $(desktoptopiclists) profiles/%-z $(desktoptweaks) @@ -28,16 +25,6 @@ $(mainlcgroupfiles): content/desktop/%/preseed.cfg : skel/preseed.cfg.in profile $(profiles-script): %script.sh : %preseed.cfg -$(mdfiles): content/MD%SUMS: $(profiles) - cd content && md$*sum $(profiles:content/%=%) > MD$*SUMS~ - rm -f $@.sig - mv -f $@~ $@ - -$(shafiles): content/SHA%SUMS: $(profiles) - cd content && sha$*sum $(profiles:content/%=%) > SHA$*SUMS~ - rm -f $@.sig - mv -f $@~ $@ - $(signfiles): %.sig: % rm -f $@ gpg --detach-sign -a -o $@ $< @@ -47,4 +34,4 @@ $(info): content/% : % cp -f $< $@ clean: - rm -f $(profiles) $(info) $(checksumfiles) $(signfiles) + rm -f $(profiles) $(info) $(signfiles) -- cgit v1.2.3