From 5086175f29021e3bebb7d9f5d83c4a796d96ebbd Mon Sep 17 00:00:00 2001 From: Peter Jin Date: Fri, 6 Mar 2020 23:12:57 -0500 Subject: [PATCH] allow sha1 hash checking command to be configured --- Makefile | 5 +++-- config.mak.dist | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e1d4c8e..6444ec0 100644 --- a/Makefile +++ b/Makefile @@ -25,6 +25,7 @@ LINUX_SITE = https://cdn.kernel.org/pub/linux/kernel LINUX_HEADERS_SITE = http://ftp.barfooze.de/pub/sabotage/tarballs/ DL_CMD = wget -c -O +SHA1_CMD = sha1sum -c COWPATCH = $(CURDIR)/cowpatch.sh @@ -76,7 +77,7 @@ $(SOURCES)/config.sub: | $(SOURCES) mkdir -p $@.tmp cd $@.tmp && $(DL_CMD) $(notdir $@) "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=$(CONFIG_SUB_REV)" cd $@.tmp && touch $(notdir $@) - cd $@.tmp && sha1sum -c $(CURDIR)/hashes/$(notdir $@).$(CONFIG_SUB_REV).sha1 + cd $@.tmp && $(SHA1_CMD) $(CURDIR)/hashes/$(notdir $@).$(CONFIG_SUB_REV).sha1 mv $@.tmp/$(notdir $@) $@ rm -rf $@.tmp @@ -84,7 +85,7 @@ $(SOURCES)/%: hashes/%.sha1 | $(SOURCES) mkdir -p $@.tmp cd $@.tmp && $(DL_CMD) $(notdir $@) $(SITE)/$(notdir $@) cd $@.tmp && touch $(notdir $@) - cd $@.tmp && sha1sum -c $(CURDIR)/hashes/$(notdir $@).sha1 + cd $@.tmp && $(SHA1_CMD) $(CURDIR)/hashes/$(notdir $@).sha1 mv $@.tmp/$(notdir $@) $@ rm -rf $@.tmp diff --git a/config.mak.dist b/config.mak.dist index dcf2ca5..181976c 100644 --- a/config.mak.dist +++ b/config.mak.dist @@ -46,6 +46,13 @@ # DL_CMD = wget -c -O # DL_CMD = curl -C - -L -o +# Check sha-1 hashes of downloaded source archives. On gnu systems this is +# usually done with sha1sum. + +# SHA1_CMD = sha1sum -c +# SHA1_CMD = sha1 -c +# SHA1_CMD = shasum -a 1 -c + # Something like the following can be used to produce a static-linked # toolchain that's deployable to any system with matching arch, using # an existing musl-targeted cross compiler. This only works if the