janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-29 00:02:48 +01:00
Code Activity

rpmdist.mk, pkg.sh: Fix whitespace handling in HASH file generation

Browse source 
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 <jan@janware.com>
This commit is contained in:
Jan Lindemann 2018-11-21 13:47:38 +00:00
commit d78768b8b8
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
make/rpmdist.mk
View file

@ -21,9 +21,9 @@ LAST_RPM_VERSION ?= $(shell $(PKG_SH_EXE) version \
-p $(OS)/$(RPM_ARCH) $(LAST_RPM_VERSION_FILE) read | $(SED) 's/-dev//') -p $(OS)/$(RPM_ARCH) $(LAST_RPM_VERSION_FILE) read | $(SED) 's/-dev//')
RPMBUILD ?= pkgbuild RPMBUILD ?= pkgbuild
CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true
HASH = $(shell $(cvs_files) | \ HASH = $(shell $(cvs_files) -z | \
grep -v "CHANGES\|VERSION\|HASH\|MD5SUMS\|_RPM_RUN" | \ grep -vz "CHANGES\|VERSION\|HASH\|MD5SUMS\|_RPM_RUN" | \
xargs md5sum | md5sum | $(SED) 's/ .*//') xargs -0 md5sum | md5sum | $(SED) 's/ .*//')
LOCAL_REPO ?= /srv/ftp/pub/local/packages/suse/11.4 LOCAL_REPO ?= /srv/ftp/pub/local/packages/suse/11.4
include $(MODDIR)/make/tag-defs.mk include $(MODDIR)/make/tag-defs.mk

8
scripts/pkg.sh
View file

@ -90,7 +90,7 @@ scm_files()
{ {
( (
cd $TOPDIR 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 cd $TOPDIR
scm_files | \ scm_files -z | \
grep -v "CHANGES\|VERSION\|HASH\|MD5SUMS\|_RPM_RUN" | \ grep -vz "CHANGES\|VERSION\|HASH\|MD5SUMS\|_RPM_RUN" | \
xargs md5sum | md5sum | sed 's/ .*//' xargs -0 md5sum | md5sum | sed 's/ .*//'
) )
} }