Wed Jan 5 01:46:28 2022 UTC ()
Install the missing sh syntax element in the MKDEBUGKERNEL = no test, so
that "continue" is a command as intended, and not an invalid last arg to
the '[' command (the last arg is required to be ']').

Sometime the proverbial someone should go through this and remove all the
obsolete test -o and -a operators, and probably do something with test's
usage of ! as well.   Not today, or not by me anyway.


(kre)
diff -r1.457 -r1.458 src/etc/Makefile
cvs diff -r1.457 -r1.458 src/etc/Makefile (expand / switch to unified diff)

--- src/etc/Makefile 2022/01/02 20:09:03 1.457
+++ src/etc/Makefile 2022/01/05 01:46:28 1.458
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.457 2022/01/02 20:09:03 christos Exp $ 1# $NetBSD: Makefile,v 1.458 2022/01/05 01:46:28 kre Exp $
2# from: @(#)Makefile 8.7 (Berkeley) 5/25/95 2# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
3 3
4# Environment variables without default values: 4# Environment variables without default values:
5# DESTDIR must be set before anything in this file will work. 5# DESTDIR must be set before anything in this file will work.
6# RELEASEDIR is where the tarred up stuff for a snapshot or 6# RELEASEDIR is where the tarred up stuff for a snapshot or
7# release will be placed. 7# release will be placed.
8# 8#
9# Environment variables with default values: 9# Environment variables with default values:
10# LOCALTIME will set the default local time for the system you 10# LOCALTIME will set the default local time for the system you
11# build; it determines what /etc/localtime is symlink'd to. 11# build; it determines what /etc/localtime is symlink'd to.
12# KERNSRCDIR points to kernel source; it is set by default to ../sys, 12# KERNSRCDIR points to kernel source; it is set by default to ../sys,
13# but can be overridden. 13# but can be overridden.
14# KERNOBJDIR is the kernel build directory, it defaults to 14# KERNOBJDIR is the kernel build directory, it defaults to
@@ -616,27 +616,27 @@ kernset-${configfile}: .PHONY build_kern @@ -616,27 +616,27 @@ kernset-${configfile}: .PHONY build_kern
616 kernsuffixes="${KERNEL_SUFFIXES:S/^/./}"; \ 616 kernsuffixes="${KERNEL_SUFFIXES:S/^/./}"; \
617 kern_tgz=${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets/kern-${configfile}.${TAR_SUFF}; \ 617 kern_tgz=${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets/kern-${configfile}.${TAR_SUFF}; \
618 pax_cmd="GZIP=${GZIP_FLAGS:Q} XZ_OPT=${XZ_OPT:Q} ${TOOL_PAX} ${PAX_TIMESTAMP} --use-compress-program ${COMPRESS_PROGRAM:Q} -O -w -M -N ${NETBSDSRCDIR}/etc -f $${kern_tgz}"; \ 618 pax_cmd="GZIP=${GZIP_FLAGS:Q} XZ_OPT=${XZ_OPT:Q} ${TOOL_PAX} ${PAX_TIMESTAMP} --use-compress-program ${COMPRESS_PROGRAM:Q} -O -w -M -N ${NETBSDSRCDIR}/etc -f $${kern_tgz}"; \
619 cd $${kerndir} && { \ 619 cd $${kerndir} && { \
620 kernels=; newest=; \ 620 kernels=; newest=; \
621 for kernel in $${kernlist}; do \ 621 for kernel in $${kernlist}; do \
622 for s in "" $${kernsuffixes}; do \ 622 for s in "" $${kernsuffixes}; do \
623 ks="$${kernel}$${s}"; \ 623 ks="$${kernel}$${s}"; \
624 [ -f $${ks} ] || continue; \ 624 [ -f $${ks} ] || continue; \
625 kernels="$${kernels} $${ks}"; \ 625 kernels="$${kernels} $${ks}"; \
626 [ -z "$${newest}" -o $${ks} \ 626 [ -z "$${newest}" -o $${ks} \
627 -nt "$${newest}" ] && newest=$${ks}; \ 627 -nt "$${newest}" ] && newest=$${ks}; \
628 [ ${MKDEBUGKERNEL} = "no" -o \ 628 [ ${MKDEBUGKERNEL} = "no" -o \
629 ! -f $${ks}.gdb ] continue; \ 629 ! -f $${ks}.gdb ] && continue; \
630 kernels="$${kernels} $${ks}.gdb"; \ 630 kernels="$${kernels} $${ks}.gdb"; \
631 done; \ 631 done; \
632 done; \ 632 done; \
633 [ $${kern_tgz} -nt "$${newest}" ] || { \ 633 [ $${kern_tgz} -nt "$${newest}" ] || { \
634 echo "echo $${kernels} | $${pax_cmd}"; \ 634 echo "echo $${kernels} | $${pax_cmd}"; \
635 if [ ${KERNEL_DIR} = "yes" ]; then \ 635 if [ ${KERNEL_DIR} = "yes" ]; then \
636 tmpdir=kernel$$; \ 636 tmpdir=kernel$$; \
637 trap "rm -fr $${tmpdir}" 0 1 2 3 15; \ 637 trap "rm -fr $${tmpdir}" 0 1 2 3 15; \
638 mkdir -p $${tmpdir}/netbsd; \ 638 mkdir -p $${tmpdir}/netbsd; \
639 d=./netbsd; \ 639 d=./netbsd; \
640 cd $${tmpdir}; \ 640 cd $${tmpdir}; \
641 else \ 641 else \
642 d=.; \ 642 d=.; \