From d78768b8b815b941ee43a1745e9a6d61ed69cab6 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 21 Nov 2018 13:47:38 +0000 Subject: [PATCH] rpmdist.mk, pkg.sh: Fix whitespace handling in HASH file generation Generating the $(TOPDIR)/HASH file produced a warning for every package file containing a whitespace character. Hopefully, this build fixes the problem, by working on zero-delimited lists of file names Signed-off-by: Jan Lindemann --- make/rpmdist.mk | 6 +++--- scripts/pkg.sh | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/make/rpmdist.mk b/make/rpmdist.mk index c2feba15..713398fc 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -21,9 +21,9 @@ LAST_RPM_VERSION ?= $(shell $(PKG_SH_EXE) version \ -p $(OS)/$(RPM_ARCH) $(LAST_RPM_VERSION_FILE) read | $(SED) 's/-dev//') RPMBUILD ?= pkgbuild CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true -HASH = $(shell $(cvs_files) | \ - grep -v "CHANGES\|VERSION\|HASH\|MD5SUMS\|_RPM_RUN" | \ - xargs md5sum | md5sum | $(SED) 's/ .*//') +HASH = $(shell $(cvs_files) -z | \ + grep -vz "CHANGES\|VERSION\|HASH\|MD5SUMS\|_RPM_RUN" | \ + xargs -0 md5sum | md5sum | $(SED) 's/ .*//') LOCAL_REPO ?= /srv/ftp/pub/local/packages/suse/11.4 include $(MODDIR)/make/tag-defs.mk diff --git a/scripts/pkg.sh b/scripts/pkg.sh index 277349e6..6c3ee378 100644 --- a/scripts/pkg.sh +++ b/scripts/pkg.sh @@ -90,7 +90,7 @@ scm_files() { ( cd $TOPDIR - /bin/bash $MOD_SCRIPT_DIR/list-cvs-files.sh -f + /bin/bash $MOD_SCRIPT_DIR/list-cvs-files.sh -f $@ ) } @@ -98,9 +98,9 @@ calculate_hash() { ( cd $TOPDIR - scm_files | \ - grep -v "CHANGES\|VERSION\|HASH\|MD5SUMS\|_RPM_RUN" | \ - xargs md5sum | md5sum | sed 's/ .*//' + scm_files -z | \ + grep -vz "CHANGES\|VERSION\|HASH\|MD5SUMS\|_RPM_RUN" | \ + xargs -0 md5sum | md5sum | sed 's/ .*//' ) }