CVS commit: src/sys/arch/pmax/tc
Module Name:src
Committed By: maxv
Date: Sun Jun 28 09:15:45 UTC 2015
Modified Files:
src/sys/arch/pmax/tc: dt.c
Log Message:
Use-after-free.
ok christos@
Found by The Brainy Code Scanner.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/pmax/tc/dt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/pmax/tc/dt.c
diff -u src/sys/arch/pmax/tc/dt.c:1.11 src/sys/arch/pmax/tc/dt.c:1.12
--- src/sys/arch/pmax/tc/dt.c:1.11 Sat Jun 4 01:37:36 2011
+++ src/sys/arch/pmax/tc/dt.c Sun Jun 28 09:15:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dt.c,v 1.11 2011/06/04 01:37:36 tsutsui Exp $ */
+/* $NetBSD: dt.c,v 1.12 2015/06/28 09:15:45 maxv Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@ SOFTWARE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dt.c,v 1.11 2011/06/04 01:37:36 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dt.c,v 1.12 2015/06/28 09:15:45 maxv Exp $");
#include
#include
@@ -225,6 +225,7 @@ dt_attach(device_t parent, device_t self
if (sc->sc_sih == NULL) {
printf("%s: memory exhausted\n", device_xname(self));
free(msg, M_DEVBUF);
+ return;
}
SIMPLEQ_INIT(&sc->sc_queue);
CVS commit: src/etc/mtree
Module Name:src
Committed By: martin
Date: Sun Jun 28 09:28:46 UTC 2015
Modified Files:
src/etc/mtree: Makefile
Log Message:
Guard a few $MK... != "no" tests by an additional defined(MK...) clause
and make the emit_dist_file target depend on EXTRA_DIST_FILES.
Part of fixing PR toolchain/50004.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/etc/mtree/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/mtree/Makefile
diff -u src/etc/mtree/Makefile:1.27 src/etc/mtree/Makefile:1.28
--- src/etc/mtree/Makefile:1.27 Sat Jun 27 20:34:11 2015
+++ src/etc/mtree/Makefile Sun Jun 28 09:28:46 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2015/06/27 20:34:11 matt Exp $
+# $NetBSD: Makefile,v 1.28 2015/06/28 09:28:46 martin Exp $
.include
@@ -12,7 +12,7 @@ EXTRA_DIST_FILES= ${.CURDIR}/NetBSD.dist
# XXX these are only used by compat currently, but they could be used
# by something else; this may need to be fixed properly in the future.
-.if ${MKCOMPAT} != "no"
+.if defined(MKCOMPAT) && ${MKCOMPAT} != "no"
.include "${NETBSDSRCDIR}/compat/archdirs.mk"
.if exists(NetBSD.dist.${MACHINE_ARCH})
EXTRA_DIST_FILES+= ${.CURDIR}/NetBSD.dist.${MACHINE_ARCH}
@@ -20,14 +20,15 @@ EXTRA_DIST_FILES+= ${.CURDIR}/NetBSD.dis
EXTRA_DIST_FILES+= ${.CURDIR}/NetBSD.dist.earm
.endif
EXTRA_DIST_FILES+= NetBSD.dist.compat # autogenerated
-.if ${MKCOMPATX11} != "no" && ${MKX11} != "no" && ${X11FLAVOUR} == "Xorg"
+.if defined(MKCOMPATX11) && ${MKCOMPATX11} != "no" && ${MKX11} != "no" \
+ && ${X11FLAVOUR} == "Xorg"
EXTRA_DIST_FILES+= NetBSD.dist.xcompat # autogenerated
.endif
.endif
.if ${MKATF} != "no"
EXTRA_DIST_FILES+= ${.CURDIR}/NetBSD.dist.tests
-.if ${MKCOMPATTESTS} != "no"
+.if defined(MKCOMPATTESTS) && ${MKCOMPATTESTS} != "no"
EXTRA_DIST_FILES+= NetBSD.dist.tests.compat
.endif
.endif
@@ -83,7 +84,7 @@ TOOL_MTREE.unpriv= -W
# /etc/mtree/NetBSD.dist content without duplicating logic from
# the Makefile.
#
-emit_dist_file:
+emit_dist_file: ${EXTRA_DIST_FILES}
@cat ${.CURDIR}/NetBSD.dist.base ${EXTRA_DIST_FILES}
distrib-dirs: .PHONY check_DESTDIR NetBSD.dist
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: martin
Date: Sun Jun 28 09:29:58 UTC 2015
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
Pass AWK to make when invoking emit_dist_file.
Part of fixing PR toolchain/50004.
To generate a diff of this commit:
cvs rdiff -u -r1.192 -r1.193 src/usr.sbin/postinstall/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.192 src/usr.sbin/postinstall/postinstall:1.193
--- src/usr.sbin/postinstall/postinstall:1.192 Sat Jun 27 09:56:54 2015
+++ src/usr.sbin/postinstall/postinstall Sun Jun 28 09:29:58 2015
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.192 2015/06/27 09:56:54 martin Exp $
+# $NetBSD: postinstall,v 1.193 2015/06/28 09:29:58 martin Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1178,7 +1178,7 @@ do_mtree()
if ! $SOURCEMODE; then
MTREE_DIR="${SRC_DIR}/etc/mtree"
else
- ${MAKE} -s -C "${SRC_DIR}/etc/mtree" emit_dist_file > \
+ env AWK={$AWK:Q} ${MAKE} -s -C "${SRC_DIR}/etc/mtree" emit_dist_file > \
"${SCRATCHDIR}/NetBSD.dist"
MTREE_DIR="${SCRATCHDIR}"
fi
CVS commit: src/sys/ufs/ffs
Module Name:src
Committed By: maxv
Date: Sun Jun 28 10:04:32 UTC 2015
Modified Files:
src/sys/ufs/ffs: ffs_snapshot.c
Log Message:
Small fixes.
ok hannken@
To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.140 src/sys/ufs/ffs/ffs_snapshot.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ffs/ffs_snapshot.c
diff -u src/sys/ufs/ffs/ffs_snapshot.c:1.139 src/sys/ufs/ffs/ffs_snapshot.c:1.140
--- src/sys/ufs/ffs/ffs_snapshot.c:1.139 Sat Mar 28 19:24:04 2015
+++ src/sys/ufs/ffs/ffs_snapshot.c Sun Jun 28 10:04:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_snapshot.c,v 1.139 2015/03/28 19:24:04 maxv Exp $ */
+/* $NetBSD: ffs_snapshot.c,v 1.140 2015/06/28 10:04:32 maxv Exp $ */
/*
* Copyright 2000 Marshall Kirk McKusick. All Rights Reserved.
@@ -38,7 +38,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ffs_snapshot.c,v 1.139 2015/03/28 19:24:04 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_snapshot.c,v 1.140 2015/06/28 10:04:32 maxv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -82,7 +82,7 @@ TAILQ_HEAD(inodelst, inode); /* List o
struct snap_info {
kmutex_t si_lock; /* Lock this snapinfo */
kmutex_t si_snaplock; /* Snapshot vnode common lock */
- lwp_t *si_owner; /* Sanplock owner */
+ lwp_t *si_owner; /* Snaplock owner */
struct inodelst si_snapshots; /* List of active snapshots */
daddr_t *si_snapblklist; /* Snapshot block hints list */
uint32_t si_gen; /* Incremented on change */
@@ -198,12 +198,12 @@ ffs_snapshot(struct mount *mp, struct vn
/*
* If the vnode already is a snapshot, return.
*/
- if ((VTOI(vp)->i_flags & SF_SNAPSHOT)) {
- if ((VTOI(vp)->i_flags & SF_SNAPINVAL))
+ if ((ip->i_flags & SF_SNAPSHOT)) {
+ if ((ip->i_flags & SF_SNAPINVAL))
return EINVAL;
if (ctime) {
- ctime->tv_sec = DIP(VTOI(vp), mtime);
- ctime->tv_nsec = DIP(VTOI(vp), mtimensec);
+ ctime->tv_sec = DIP(ip, mtime);
+ ctime->tv_nsec = DIP(ip, mtimensec);
}
return 0;
}
@@ -269,9 +269,9 @@ ffs_snapshot(struct mount *mp, struct vn
* Create a copy of the superblock and its summary information.
*/
error = snapshot_copyfs(mp, vp, &sbbuf);
- copy_fs = (struct fs *)((char *)sbbuf + ffs_blkoff(fs, fs->fs_sblockloc));
if (error)
goto out;
+ copy_fs = (struct fs *)((char *)sbbuf + ffs_blkoff(fs, fs->fs_sblockloc));
/*
* Expunge unlinked files from our view.
*/
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: kiyohara Date: Sun Jun 28 12:58:52 UTC 2015 Modified Files: src/sys/arch/evbarm/conf: OPENBLOCKS_AX3 Log Message: Remove mvsdio. OpenBlocks AX3 not have it. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/OPENBLOCKS_AX3 diff -u src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.14 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.15 --- src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.14 Wed Jun 3 04:31:46 2015 +++ src/sys/arch/evbarm/conf/OPENBLOCKS_AX3 Sun Jun 28 12:58:52 2015 @@ -1,4 +1,4 @@ -# $NetBSD: OPENBLOCKS_AX3,v 1.14 2015/06/03 04:31:46 hsuenaga Exp $ +# $NetBSD: OPENBLOCKS_AX3,v 1.15 2015/06/28 12:58:52 kiyohara Exp $ # # OPENBLOCKS_AX3 -- Plat'Home. OpenBlockS AX3 kernel # @@ -220,10 +220,6 @@ mvpex* at mvsoc? offset ? irq ? # On-chip IDMA Controller gtidmac* at mvsoc? offset ? irq ? -# On-chip SD/MMC Interface -mvsdio* at mvsoc? offset ? irq ? -sdmmc* at mvsdio? - # On-chip Timers mvsoctmr* at mvsoc? offset ? irq ? @@ -268,8 +264,6 @@ cd* at scsibus? target ? lun ? # SCSI CD # USB Generic driver ugen* at uhub? port ? -ld* at sdmmc? - # Pseudo-Devices
CVS commit: src/sys/arch/evbarm/conf
Module Name:src
Committed By: kiyohara
Date: Sun Jun 28 13:10:38 UTC 2015
Modified Files:
src/sys/arch/evbarm/conf: OPENBLOCKS_AX3
Log Message:
Move makphy to after mv{gb,xp}e.
And indents.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/conf/OPENBLOCKS_AX3
diff -u src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.15 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.16
--- src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.15 Sun Jun 28 12:58:52 2015
+++ src/sys/arch/evbarm/conf/OPENBLOCKS_AX3 Sun Jun 28 13:10:38 2015
@@ -1,4 +1,4 @@
-# $NetBSD: OPENBLOCKS_AX3,v 1.15 2015/06/28 12:58:52 kiyohara Exp $
+# $NetBSD: OPENBLOCKS_AX3,v 1.16 2015/06/28 13:10:38 kiyohara Exp $
#
# OPENBLOCKS_AX3 -- Plat'Home. OpenBlockS AX3 kernel
#
@@ -185,14 +185,15 @@ mvsata* at mvsoc? offset ? irq ?
# On-chip Gigabit Ethernet Controller Interface (backward compatible mode)
mvgbec* at mvsoc? offset ?
mvgbe* at mvgbec? port ? irq ?
-makphy* at mii? phy ?
# On-chip Gigabit Ethernet Controller Interface (counter mode)
-#mvxpbm* at mvsoc? offset ?
-#mvxpe* at mvsoc? irq ?
+#mvxpbm* at mvsoc? offset ?
+#mvxpe* at mvsoc? irq ?
#options MVXPE_EVENT_COUNTERS
#options MVXPE_DEBUG=0
+makphy* at mii? phy ?
+
# On-chip USB 2.0 Interface
ehci* at mvsoc? offset ? irq ?
@@ -206,7 +207,7 @@ iic* at gttwsi?
s390rtc* at iic1 addr 0x30
# On-chip Cryptographic Engines and Security Accelerator (DMA)
-#mvxpsec* at mvsoc? offset ? irq ?
+#mvxpsec* at mvsoc? offset ? irq ?
#options MVXPSEC_DEBUG=MVXPSEC_DEBUG_ALL
# On-chip UART Interface
CVS commit: src/sys/arch/arm/xscale
Module Name:src
Committed By: maxv
Date: Sun Jun 28 15:13:29 UTC 2015
Modified Files:
src/sys/arch/arm/xscale: ixp425_if_npe.c
Log Message:
Initialize 'error'.
Can't test, but obvious enough apparently.
Found by Brainy.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/xscale/ixp425_if_npe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/xscale/ixp425_if_npe.c
diff -u src/sys/arch/arm/xscale/ixp425_if_npe.c:1.28 src/sys/arch/arm/xscale/ixp425_if_npe.c:1.29
--- src/sys/arch/arm/xscale/ixp425_if_npe.c:1.28 Mon Apr 13 21:18:41 2015
+++ src/sys/arch/arm/xscale/ixp425_if_npe.c Sun Jun 28 15:13:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp425_if_npe.c,v 1.28 2015/04/13 21:18:41 riastradh Exp $ */
+/* $NetBSD: ixp425_if_npe.c,v 1.29 2015/06/28 15:13:28 maxv Exp $ */
/*-
* Copyright (c) 2006 Sam Leffler. All rights reserved.
@@ -28,7 +28,7 @@
#if 0
__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
#endif
-__KERNEL_RCSID(0, "$NetBSD: ixp425_if_npe.c,v 1.28 2015/04/13 21:18:41 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp425_if_npe.c,v 1.29 2015/06/28 15:13:28 maxv Exp $");
/*
* Intel XScale NPE Ethernet driver.
@@ -602,8 +602,9 @@ npe_activate(struct npe_softc *sc)
return error;
}
- if (bus_dmamap_load(sc->sc_dt, sc->sc_stats_map, sc->sc_stats,
- sizeof(struct npestats), NULL, BUS_DMA_NOWAIT) != 0) {
+ error = bus_dmamap_load(sc->sc_dt, sc->sc_stats_map, sc->sc_stats,
+ sizeof(struct npestats), NULL, BUS_DMA_NOWAIT);
+ if (error) {
aprint_error_dev(sc->sc_dev,
"unable to %s for %s, error %u\n",
"load map", "stats block", error);
CVS commit: src/external/bsd/ntp/dist/ntpq
Module Name:src
Committed By: kardel
Date: Sun Jun 28 15:37:37 UTC 2015
Modified Files:
src/external/bsd/ntp/dist/ntpq: ntpq-subs.c
Log Message:
fix ifstats command by relaxing invalid sanity check - ntp bug #2860
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/ntp/dist/ntpq/ntpq-subs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/dist/ntpq/ntpq-subs.c
diff -u src/external/bsd/ntp/dist/ntpq/ntpq-subs.c:1.9 src/external/bsd/ntp/dist/ntpq/ntpq-subs.c:1.10
--- src/external/bsd/ntp/dist/ntpq/ntpq-subs.c:1.9 Tue Apr 7 17:34:19 2015
+++ src/external/bsd/ntp/dist/ntpq/ntpq-subs.c Sun Jun 28 15:37:37 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ntpq-subs.c,v 1.9 2015/04/07 17:34:19 christos Exp $ */
+/* $NetBSD: ntpq-subs.c,v 1.10 2015/06/28 15:37:37 kardel Exp $ */
/*
* ntpq-subs.c - subroutines which are called to perform ntpq commands.
@@ -3101,7 +3101,7 @@ validate_ifnum(
{
if (prow->ifnum == ifnum)
return;
- if (prow->ifnum + 1 == ifnum) {
+ if (prow->ifnum + 1 <= ifnum) {
if (*pfields < IFSTATS_FIELDS)
fprintf(fp, "Warning: incomplete row with %d (of %d) fields",
*pfields, IFSTATS_FIELDS);
CVS commit: src/bin/cp
Module Name:src Committed By: wiz Date: Sun Jun 28 16:22:54 UTC 2015 Modified Files: src/bin/cp: cp.1 Log Message: Add serial comma, use upper case for abbreviation, and remove apostrophe for plural. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/bin/cp/cp.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/cp/cp.1 diff -u src/bin/cp/cp.1:1.43 src/bin/cp/cp.1:1.44 --- src/bin/cp/cp.1:1.43 Tue Dec 17 09:54:08 2013 +++ src/bin/cp/cp.1 Sun Jun 28 16:22:54 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: cp.1,v 1.43 2013/12/17 09:54:08 apb Exp $ +.\" $NetBSD: cp.1,v 1.44 2015/06/28 16:22:54 wiz Exp $ .\" .\" Copyright (c) 1989, 1990, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -225,8 +225,8 @@ utility had a .Fl r option. This implementation supports that option, however, its use is strongly -discouraged, as it does not correctly copy special files, symbolic links -or fifo's. +discouraged, as it does not correctly copy special files, symbolic links, +or FIFOs. .Sh SEE ALSO .Xr mv 1 , .Xr pax 1 ,
CVS commit: src/sys/arch/mips/rmi
Module Name:src
Committed By: matt
Date: Sun Jun 28 22:14:38 UTC 2015
Modified Files:
src/sys/arch/mips/rmi: rmixl_cpu.c
Log Message:
Print both user and kernel segtabs
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mips/rmi/rmixl_cpu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/rmi/rmixl_cpu.c
diff -u src/sys/arch/mips/rmi/rmixl_cpu.c:1.8 src/sys/arch/mips/rmi/rmixl_cpu.c:1.9
--- src/sys/arch/mips/rmi/rmixl_cpu.c:1.8 Wed Jun 10 22:31:00 2015
+++ src/sys/arch/mips/rmi/rmixl_cpu.c Sun Jun 28 22:14:38 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_cpu.c,v 1.8 2015/06/10 22:31:00 matt Exp $ */
+/* $NetBSD: rmixl_cpu.c,v 1.9 2015/06/28 22:14:38 matt Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -38,7 +38,7 @@
#include "locators.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: rmixl_cpu.c,v 1.8 2015/06/10 22:31:00 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_cpu.c,v 1.9 2015/06/28 22:14:38 matt Exp $");
#include "opt_multiprocessor.h"
#include "opt_ddb.h"
@@ -474,9 +474,11 @@ rmixl_cpuinfo_print(u_int cpuindex)
printf("ci_tlb_slot %d\n", ci->ci_tlb_slot);
printf("ci_pmap_asid_cur %d\n", ci->ci_pmap_asid_cur);
printf("ci_tlb_info %p\n", ci->ci_tlb_info);
- printf("ci_pmap_seg0tab %p\n", ci->ci_pmap_seg0tab);
+ printf("ci_pmap_kern_segtab %p\n", ci->ci_pmap_kern_segtab);
+ printf("ci_pmap_user_segtab %p\n", ci->ci_pmap_user_segtab);
#ifdef _LP64
- printf("ci_pmap_segtab %p\n", ci->ci_pmap_segtab);
+ printf("ci_pmap_kern_seg0tab %p\n", ci->ci_pmap_kern_seg0tab);
+ printf("ci_pmap_user_seg0tab %p\n", ci->ci_pmap_user_seg0tab);
#else
printf("ci_pmap_srcbase %#"PRIxVADDR"\n", ci->ci_pmap_srcbase);
printf("ci_pmap_dstbase %#"PRIxVADDR"\n", ci->ci_pmap_dstbase);
CVS commit: src/distrib/sets
Module Name:src
Committed By: matt
Date: Sun Jun 28 23:49:33 UTC 2015
Modified Files:
src/distrib/sets: sets.subr
Log Message:
Need debug sets if ${MKDEBUGLIB} != "no"
To generate a diff of this commit:
cvs rdiff -u -r1.170 -r1.171 src/distrib/sets/sets.subr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.170 src/distrib/sets/sets.subr:1.171
--- src/distrib/sets/sets.subr:1.170 Sat Jun 27 16:21:07 2015
+++ src/distrib/sets/sets.subr Sun Jun 28 23:49:33 2015
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.170 2015/06/27 16:21:07 matt Exp $
+# $NetBSD: sets.subr,v 1.171 2015/06/28 23:49:33 matt Exp $
#
#
@@ -144,7 +144,7 @@ if [ "${MKATF}" = "no" ]; then
else
testset="tests"
fi
-if [ "${MKDEBUG}" = "no" ]; then
+if [ "${MKDEBUG}" = "no" -a "${MKDEBUGLIB}" = "no" ]; then
debugset=""
xdebugset=""
else
@@ -179,7 +179,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.170 2015/06/27 16:21:07 matt Exp $
+# # $NetBSD: sets.subr,v 1.171 2015/06/28 23:49:33 matt Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
