Fix SKIP_UTILS for hashsums

.github/workflows/CICD.yml

@@ -346,16 +346,17 @@ jobs:
         ! test -f /tmp/usr/local/share/zsh/site-functions/_install
         ! test -f /tmp/usr/local/share/bash-completion/completions/head.bash
         ! test -f /tmp/usr/local/share/fish/vendor_completions.d/cat.fish
-    - name: "`make install MULTICALL=n`"
+    - name: "`make install MULTICALL=n SKIP_UTILS=b3sum`"
       shell: bash
       run: |
         set -x
         DESTDIR=/tmp/ make PROFILE=release MULTICALL=n install
         # Check that the utils are present
         test -f /tmp/usr/local/bin/hashsum
+        # Check that b3sum is not present
+        ! test -e /tmp/usr/local/bin/b3sum
         # Check that hashsum symlinks are present
         test -h /tmp/usr/local/bin/b2sum
-        test -h /tmp/usr/local/bin/b3sum
         test -h /tmp/usr/local/bin/md5sum
         test -h /tmp/usr/local/bin/sha1sum
         test -h /tmp/usr/local/bin/sha224sum

GNUmakefile

@@ -199,23 +199,26 @@ SELINUX_PROGS := \
 	chcon \
 	runcon
 
-HASHSUM_PROGS := \
-	b2sum \
+# Allow to drop hashsums not in GNU coreutils
+EXTRA_HASHSUM_PROGS ?= \
 	b3sum \
-	md5sum \
-	sha1sum \
-	sha224sum \
-	sha256sum \
 	sha3-224sum \
 	sha3-256sum \
 	sha3-384sum \
 	sha3-512sum \
-	sha384sum \
 	sha3sum \
-	sha512sum \
 	shake128sum \
 	shake256sum
 
+HASHSUM_PROGS := $(EXTRA_HASHSUM_PROGS) \
+	b2sum \
+	md5sum \
+	sha1sum \
+	sha224sum \
+	sha256sum \
+	sha384sum \
+	sha512sum
+
 $(info Detected OS = $(OS))
 
 # Don't build the SELinux programs on macOS (Darwin) and FreeBSD
@@ -230,7 +233,9 @@ ifneq ($(OS),Windows_NT)
 endif
 
 UTILS ?= $(filter-out $(SKIP_UTILS),$(PROGS))
-ifneq ($(filter hashsum,$(UTILS)),hashsum)
+ifeq ($(filter hashsum,$(UTILS)),hashsum)
+	HASHSUM_PROGS := $(filter-out $(SKIP_UTILS),$(HASHSUM_PROGS))
+else
 	HASHSUM_PROGS :=
 endif