CVS commit: src/share/mk
Module Name:src Committed By: nia Date: Wed Apr 24 05:20:35 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: USE_XZ_SETS is no longer needed for sparc64 to fit on a standard CD-ROM To generate a diff of this commit: cvs rdiff -u -r1.1368 -r1.1369 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: nia
Date: Wed Apr 24 05:20:35 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
USE_XZ_SETS is no longer needed for sparc64 to fit on a standard CD-ROM
To generate a diff of this commit:
cvs rdiff -u -r1.1368 -r1.1369 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1368 src/share/mk/bsd.own.mk:1.1369
--- src/share/mk/bsd.own.mk:1.1368 Tue Apr 23 03:25:39 2024
+++ src/share/mk/bsd.own.mk Wed Apr 24 05:20:35 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1368 2024/04/23 03:25:39 maya Exp $
+# $NetBSD: bsd.own.mk,v 1.1369 2024/04/24 05:20:35 nia Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1607,7 +1607,6 @@ ${var}?= no
# format if USE_PIGZGZIP is enabled.
.if ${USE_PIGZGZIP} == "no" && \
(${MACHINE} == "amd64" || \
- ${MACHINE} == "sparc64" || \
${MACHINE_ARCH:Maarch64*})
USE_XZ_SETS?= yes
.else
CVS commit: src/distrib/sparc64/cdroms/installcd
Module Name:src Committed By: nia Date: Wed Apr 24 05:16:16 UTC 2024 Modified Files: src/distrib/sparc64/cdroms/installcd: Makefile Log Message: Give lots of room for further expansion of the sparc64 CD image To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/distrib/sparc64/cdroms/installcd/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sparc64/cdroms/installcd
Module Name:src
Committed By: nia
Date: Wed Apr 24 05:16:16 UTC 2024
Modified Files:
src/distrib/sparc64/cdroms/installcd: Makefile
Log Message:
Give lots of room for further expansion of the sparc64 CD image
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/distrib/sparc64/cdroms/installcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sparc64/cdroms/installcd/Makefile
diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.32 src/distrib/sparc64/cdroms/installcd/Makefile:1.33
--- src/distrib/sparc64/cdroms/installcd/Makefile:1.32 Tue Apr 23 12:25:57 2024
+++ src/distrib/sparc64/cdroms/installcd/Makefile Wed Apr 24 05:16:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2024/04/23 12:25:57 nia Exp $
+# $NetBSD: Makefile,v 1.33 2024/04/24 05:16:16 nia Exp $
.include
@@ -6,6 +6,8 @@ CDBASE= sparc64cd # gives ${CDBASE}.is
CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
CDRELEASE_NOCOMPAT= true
+CDRELEASE_NOHTML= true
+CDRELEASE_NOTESTS= true
CDKERNELS= ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-GENERIC.gz netbsd
CD_SETS= base etc
.if ${MKKMOD} != "no"
CVS commit: src/sys/kern
Module Name:src Committed By: thorpej Date: Wed Apr 24 02:08:03 UTC 2024 Modified Files: src/sys/kern: subr_vmem.c Log Message: vmem_init(): Ensure that the quantum is a power of 2, and that if private tags are being used, they are added to the arena before the first span is added. To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.116 src/sys/kern/subr_vmem.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: thorpej
Date: Wed Apr 24 02:31:26 UTC 2024
Modified Files:
src/sys/dev/pci: btvmeii.c
Log Message:
b3_2706_map_vme(): Use VM_BESTFIT.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/btvmeii.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/dev/pci/btvmeii.c
diff -u src/sys/dev/pci/btvmeii.c:1.27 src/sys/dev/pci/btvmeii.c:1.28
--- src/sys/dev/pci/btvmeii.c:1.27 Tue Dec 5 15:58:32 2023
+++ src/sys/dev/pci/btvmeii.c Wed Apr 24 02:31:26 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: btvmeii.c,v 1.27 2023/12/05 15:58:32 thorpej Exp $ */
+/* $NetBSD: btvmeii.c,v 1.28 2024/04/24 02:31:26 thorpej Exp $ */
/*
* Copyright (c) 1999
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: btvmeii.c,v 1.27 2023/12/05 15:58:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btvmeii.c,v 1.28 2024/04/24 02:31:26 thorpej Exp $");
#include
#include
@@ -328,7 +328,7 @@ b3_2706_map_vme(void *vsc, vme_addr_t vm
0, /* boundary */
VMEM_ADDR_MIN, /* minaddr */
VMEM_ADDR_MAX, /* maxaddr */
- VM_NOSLEEP,
+ VM_BESTFIT | VM_NOSLEEP,
)) {
sc->windowused[wnd] = 0;
return (ENOMEM);
CVS commit: src/sys/dev/pci
Module Name:src Committed By: thorpej Date: Wed Apr 24 02:31:26 UTC 2024 Modified Files: src/sys/dev/pci: btvmeii.c Log Message: b3_2706_map_vme(): Use VM_BESTFIT. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/btvmeii.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/vme
Module Name:src Committed By: thorpej Date: Wed Apr 24 02:27:33 UTC 2024 Modified Files: src/sys/dev/vme: vme.c Log Message: _vme_space_get(): Use VM_BESTFIT. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/dev/vme/vme.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/vme
Module Name:src Committed By: thorpej Date: Wed Apr 24 02:27:33 UTC 2024 Modified Files: src/sys/dev/vme: vme.c Log Message: _vme_space_get(): Use VM_BESTFIT. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/dev/vme/vme.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/dev/vme/vme.c diff -u src/sys/dev/vme/vme.c:1.30 src/sys/dev/vme/vme.c:1.31 --- src/sys/dev/vme/vme.c:1.30 Mon Dec 4 01:49:29 2023 +++ src/sys/dev/vme/vme.c Wed Apr 24 02:27:33 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: vme.c,v 1.30 2023/12/04 01:49:29 thorpej Exp $ */ +/* $NetBSD: vme.c,v 1.31 2024/04/24 02:27:33 thorpej Exp $ */ /* * Copyright (c) 1999 @@ -29,7 +29,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.30 2023/12/04 01:49:29 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.31 2024/04/24 02:27:33 thorpej Exp $"); #include #include @@ -336,7 +336,7 @@ _vme_space_get(struct vmebus_softc *sc, 0, /* nocross */ VMEM_ADDR_MIN, /* minaddr */ VMEM_ADDR_MAX, /* maxaddr */ - VM_NOSLEEP, + VM_BESTFIT | VM_NOSLEEP, ); if (!res) *addr = help;
CVS commit: src/sys/kern
Module Name:src Committed By: thorpej Date: Wed Apr 24 02:08:03 UTC 2024 Modified Files: src/sys/kern: subr_vmem.c Log Message: vmem_init(): Ensure that the quantum is a power of 2, and that if private tags are being used, they are added to the arena before the first span is added. To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.116 src/sys/kern/subr_vmem.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/kern/subr_vmem.c diff -u src/sys/kern/subr_vmem.c:1.115 src/sys/kern/subr_vmem.c:1.116 --- src/sys/kern/subr_vmem.c:1.115 Sun Dec 3 19:34:08 2023 +++ src/sys/kern/subr_vmem.c Wed Apr 24 02:08:03 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_vmem.c,v 1.115 2023/12/03 19:34:08 thorpej Exp $ */ +/* $NetBSD: subr_vmem.c,v 1.116 2024/04/24 02:08:03 thorpej Exp $ */ /*- * Copyright (c)2006,2007,2008,2009 YAMAMOTO Takashi, @@ -46,7 +46,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: subr_vmem.c,v 1.115 2023/12/03 19:34:08 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_vmem.c,v 1.116 2024/04/24 02:08:03 thorpej Exp $"); #if defined(_KERNEL) && defined(_KERNEL_OPT) #include "opt_ddb.h" @@ -971,6 +971,14 @@ vmem_init(vmem_t *vm, const char *name, KASSERT((flags & (VM_SLEEP|VM_NOSLEEP)) != 0); KASSERT((~flags & (VM_SLEEP|VM_NOSLEEP)) != 0); KASSERT(quantum > 0); + KASSERT(powerof2(quantum)); + + /* + * If private tags are going to be used, they must + * be added to the arena before the first span is + * added. + */ + KASSERT((flags & VM_PRIVTAGS) == 0 || size == 0); #if defined(_KERNEL) /* XXX: SMP, we get called early... */
CVS commit: src/usr.sbin/mtree
Module Name:src
Committed By: christos
Date: Wed Apr 24 01:44:51 UTC 2024
Modified Files:
src/usr.sbin/mtree: create.c
Log Message:
For the NetBSD tools build we provide our own fts.h not FreeBSD's so the
comparator should have the NetBSD signature.
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/usr.sbin/mtree/create.c
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/mtree/create.c
diff -u src/usr.sbin/mtree/create.c:1.77 src/usr.sbin/mtree/create.c:1.78
--- src/usr.sbin/mtree/create.c:1.77 Sat Dec 2 08:34:48 2023
+++ src/usr.sbin/mtree/create.c Tue Apr 23 21:44:51 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: create.c,v 1.77 2023/12/02 13:34:48 christos Exp $ */
+/* $NetBSD: create.c,v 1.78 2024/04/24 01:44:51 christos Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)create.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: create.c,v 1.77 2023/12/02 13:34:48 christos Exp $");
+__RCSID("$NetBSD: create.c,v 1.78 2024/04/24 01:44:51 christos Exp $");
#endif
#endif /* not lint */
@@ -84,7 +84,7 @@ static uid_t uid;
static mode_t mode;
static u_long flags;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) && !defined(HAVE_NBTOOL_CONFIG_H)
#define FTS_CONST const
#else
#define FTS_CONST
CVS commit: src/usr.sbin/mtree
Module Name:src Committed By: christos Date: Wed Apr 24 01:44:51 UTC 2024 Modified Files: src/usr.sbin/mtree: create.c Log Message: For the NetBSD tools build we provide our own fts.h not FreeBSD's so the comparator should have the NetBSD signature. To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/usr.sbin/mtree/create.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Tue Apr 23 22:51:28 UTC 2024
Modified Files:
src/usr.bin/make: cond.c make.h parse.c var.c
src/usr.bin/make/unit-tests: cmd-errors-jobs.exp cmd-errors-jobs.mk
cmd-errors-lint.exp cmd-errors-lint.mk cmd-errors.exp cmd-errors.mk
cmdline-undefined.mk cmdline.mk comment.mk cond-cmp-string.mk
cond-func-defined.exp cond-func-defined.mk varmod-ifelse.mk
varmod-match.exp varmod-match.mk
Log Message:
make: clean up comments, code and tests
To generate a diff of this commit:
cvs rdiff -u -r1.362 -r1.363 src/usr.bin/make/cond.c
cvs rdiff -u -r1.330 -r1.331 src/usr.bin/make/make.h
cvs rdiff -u -r1.720 -r1.721 src/usr.bin/make/parse.c
cvs rdiff -u -r1.1104 -r1.1105 src/usr.bin/make/var.c
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/cmd-errors-jobs.exp \
src/usr.bin/make/unit-tests/cmd-errors-lint.exp \
src/usr.bin/make/unit-tests/cmd-errors.mk
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/cmd-errors-jobs.mk
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/cmd-errors-lint.mk
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/cmd-errors.exp \
src/usr.bin/make/unit-tests/cond-func-defined.exp
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/cmdline-undefined.mk \
src/usr.bin/make/unit-tests/cmdline.mk
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/comment.mk
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/make/unit-tests/cond-cmp-string.mk
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/make/unit-tests/cond-func-defined.mk
cvs rdiff -u -r1.27 -r1.28 src/usr.bin/make/unit-tests/varmod-ifelse.mk
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/make/unit-tests/varmod-match.exp
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/make/unit-tests/varmod-match.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/cond.c
diff -u src/usr.bin/make/cond.c:1.362 src/usr.bin/make/cond.c:1.363
--- src/usr.bin/make/cond.c:1.362 Wed Feb 7 07:21:22 2024
+++ src/usr.bin/make/cond.c Tue Apr 23 22:51:28 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.362 2024/02/07 07:21:22 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.363 2024/04/23 22:51:28 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -91,7 +91,7 @@
#include "dir.h"
/* "@(#)cond.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: cond.c,v 1.362 2024/02/07 07:21:22 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.363 2024/04/23 22:51:28 rillig Exp $");
/*
* Conditional expressions conform to this grammar:
@@ -424,13 +424,12 @@ CondParser_StringExpr(CondParser *par, c
* Parse a string from an expression or an optionally quoted string,
* on the left-hand and right-hand sides of comparisons.
*
- * Results:
- * Returns the string without any enclosing quotes, or NULL on error.
- * Sets out_quoted if the leaf was a quoted string literal.
+ * Return the string without any enclosing quotes, or NULL on error.
+ * Sets out_quoted if the leaf was a quoted string literal.
*/
-static void
+static FStr
CondParser_Leaf(CondParser *par, bool doEval, bool unquotedOK,
- FStr *out_str, bool *out_quoted)
+ bool *out_quoted)
{
Buffer buf;
FStr str;
@@ -492,7 +491,7 @@ return_buf:
buf.data = NULL;
return_str:
Buf_Done();
- *out_str = str;
+ return str;
}
/*
@@ -602,7 +601,7 @@ CondParser_Comparison(CondParser *par, b
ComparisonOp op;
bool lhsQuoted, rhsQuoted;
- CondParser_Leaf(par, doEval, par->leftUnquotedOK, , );
+ lhs = CondParser_Leaf(par, doEval, par->leftUnquotedOK, );
if (lhs.str == NULL)
goto done_lhs;
@@ -622,7 +621,7 @@ CondParser_Comparison(CondParser *par, b
goto done_lhs;
}
- CondParser_Leaf(par, doEval, true, , );
+ rhs = CondParser_Leaf(par, doEval, true, );
t = rhs.str == NULL ? TOK_ERROR
: !doEval ? TOK_FALSE
: EvalCompare(par, lhs.str, lhsQuoted, op, rhs.str, rhsQuoted);
Index: src/usr.bin/make/make.h
diff -u src/usr.bin/make/make.h:1.330 src/usr.bin/make/make.h:1.331
--- src/usr.bin/make/make.h:1.330 Sat Apr 20 10:18:55 2024
+++ src/usr.bin/make/make.h Tue Apr 23 22:51:28 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.330 2024/04/20 10:18:55 rillig Exp $ */
+/* $NetBSD: make.h,v 1.331 2024/04/23 22:51:28 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -399,7 +399,7 @@ typedef struct SearchPath {
/*
* A graph node represents a target that can possibly be made, including its
- * relation to other targets and a lot of other details.
+ * relation to other targets.
*/
typedef struct GNode {
/* The target's name, such as "clean" or "make.c" */
@@ -581,8 +581,8 @@ extern GNode *SCOPE_GLOBAL;
extern GNode *SCOPE_CMDLINE;
/*
- * Value returned by Var_Parse when an error is encountered. It actually
- * points to an empty string, so naive callers needn't worry about it.
+ * Value returned by Var_Parse when an error is
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Tue Apr 23 22:51:28 UTC 2024 Modified Files: src/usr.bin/make: cond.c make.h parse.c var.c src/usr.bin/make/unit-tests: cmd-errors-jobs.exp cmd-errors-jobs.mk cmd-errors-lint.exp cmd-errors-lint.mk cmd-errors.exp cmd-errors.mk cmdline-undefined.mk cmdline.mk comment.mk cond-cmp-string.mk cond-func-defined.exp cond-func-defined.mk varmod-ifelse.mk varmod-match.exp varmod-match.mk Log Message: make: clean up comments, code and tests To generate a diff of this commit: cvs rdiff -u -r1.362 -r1.363 src/usr.bin/make/cond.c cvs rdiff -u -r1.330 -r1.331 src/usr.bin/make/make.h cvs rdiff -u -r1.720 -r1.721 src/usr.bin/make/parse.c cvs rdiff -u -r1.1104 -r1.1105 src/usr.bin/make/var.c cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/cmd-errors-jobs.exp \ src/usr.bin/make/unit-tests/cmd-errors-lint.exp \ src/usr.bin/make/unit-tests/cmd-errors.mk cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/cmd-errors-jobs.mk cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/cmd-errors-lint.mk cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/cmd-errors.exp \ src/usr.bin/make/unit-tests/cond-func-defined.exp cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/cmdline-undefined.mk \ src/usr.bin/make/unit-tests/cmdline.mk cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/comment.mk cvs rdiff -u -r1.18 -r1.19 src/usr.bin/make/unit-tests/cond-cmp-string.mk cvs rdiff -u -r1.11 -r1.12 src/usr.bin/make/unit-tests/cond-func-defined.mk cvs rdiff -u -r1.27 -r1.28 src/usr.bin/make/unit-tests/varmod-ifelse.mk cvs rdiff -u -r1.15 -r1.16 src/usr.bin/make/unit-tests/varmod-match.exp cvs rdiff -u -r1.21 -r1.22 src/usr.bin/make/unit-tests/varmod-match.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/makefs
Module Name:src
Committed By: christos
Date: Tue Apr 23 22:18:56 UTC 2024
Modified Files:
src/usr.sbin/makefs: walk.c
Log Message:
pass lint, simplify
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/usr.sbin/makefs/walk.c
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/makefs/walk.c
diff -u src/usr.sbin/makefs/walk.c:1.35 src/usr.sbin/makefs/walk.c:1.36
--- src/usr.sbin/makefs/walk.c:1.35 Tue Apr 23 18:12:48 2024
+++ src/usr.sbin/makefs/walk.c Tue Apr 23 18:18:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: walk.c,v 1.35 2024/04/23 22:12:48 christos Exp $ */
+/* $NetBSD: walk.c,v 1.36 2024/04/23 22:18:56 christos Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -41,7 +41,7 @@
#include
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: walk.c,v 1.35 2024/04/23 22:12:48 christos Exp $");
+__RCSID("$NetBSD: walk.c,v 1.36 2024/04/23 22:18:56 christos Exp $");
#endif /* !__lint */
#include
@@ -73,16 +73,17 @@ static fsinode *link_check(fsinode *);
* as compared by `strcmp()`.
*/
static int
-fsnode_cmp (const void *_left, const void *_right)
+fsnode_cmp(const void *vleft, const void *vright)
{
- const fsnode * const left = *(const fsnode * const *)_left;
- const fsnode * const right = *(const fsnode * const *)_right;
+ const fsnode * const *left = vleft;
+ const fsnode * const *right = vright;
+ const char *lname = (*left)->name, *rname = (*right)->name;
- if (strcmp (left->name, ".") == 0)
+ if (strcmp(lname, ".") == 0)
return -1;
- if (strcmp (right->name, ".") == 0)
+ if (strcmp(rname, ".") == 0)
return 1;
- return strcmp (left->name, right->name);
+ return strcmp(lname, rname);
}
/*
@@ -249,14 +250,14 @@ walk_dir(const char *root, const char *d
cur->inode = curino;
cur->inode->nlink++;
if (debug & DEBUG_WALK_DIR_LINKCHECK)
- printf("link_check: found [%llu, %llu]\n",
- (unsigned long long)curino->st.st_dev,
- (unsigned long long)curino->st.st_ino);
+ printf("link_check: found [%ju, %ju]\n",
+ (uintmax_t)curino->st.st_dev,
+ (uintmax_t)curino->st.st_ino);
}
}
if (S_ISLNK(cur->type)) {
char slink[PATH_MAX+1];
- int llen;
+ ssize_t llen;
llen = readlink(path, slink, sizeof(slink) - 1);
if (llen == -1)
@@ -594,9 +595,9 @@ apply_specentry(const char *dir, NODE *s
}
/* XXX: ignoring F_NLINK for now */
if (specnode->flags & F_SIZE) {
- ASEPRINT("size", "%lld",
- (long long)dirnode->inode->st.st_size,
- (long long)specnode->st_size);
+ ASEPRINT("size", "%jd",
+ (intmax_t)dirnode->inode->st.st_size,
+ (intmax_t)specnode->st_size);
dirnode->inode->st.st_size = specnode->st_size;
}
if (specnode->flags & F_SLINK) {
@@ -629,13 +630,13 @@ apply_specentry(const char *dir, NODE *s
ASEPRINT("flags", "%#lX",
(unsigned long)dirnode->inode->st.st_flags,
(unsigned long)specnode->st_flags);
- dirnode->inode->st.st_flags = specnode->st_flags;
+ dirnode->inode->st.st_flags = (unsigned int)specnode->st_flags;
}
#endif
if (specnode->flags & F_DEV) {
- ASEPRINT("rdev", "%#llx",
- (unsigned long long)dirnode->inode->st.st_rdev,
- (unsigned long long)specnode->st_rdev);
+ ASEPRINT("rdev", "%#jx",
+ (uintmax_t)dirnode->inode->st.st_rdev,
+ (uintmax_t)specnode->st_rdev);
dirnode->inode->st.st_rdev = specnode->st_rdev;
}
#undef ASEPRINT
@@ -712,16 +713,16 @@ link_check(fsinode *entry)
static struct entry {
fsinode *data;
} *htable;
- static int htshift; /* log(allocated size) */
- static int htmask; /* allocated size - 1 */
- static int htused; /* 2*number of insertions */
- int h, h2;
+ static size_t htshift; /* log(allocated size) */
+ static size_t htmask; /* allocated size - 1 */
+ static size_t htused; /* 2*number of insertions */
+ size_t h, h2;
uint64_t tmp;
/* this constant is (1<<64)/((1+sqrt(5))/2)
* aka (word size)/(golden ratio)
*/
const uint64_t HTCONST = 11400714819323198485ULL;
- const int HTBITS = 64;
+ const size_t HTBITS = 64;
/* Never store zero in hashtable */
assert(entry);
@@ -742,8 +743,7 @@ link_check(fsinode *entry)
htable = ecalloc(htmask+1, sizeof(*htable));
/* populate newly allocated hashtable */
if (ohtable) {
- int i;
- for (i = 0; i <= htmask>>1; i++)
+ for (size_t i = 0; i <= htmask>>1; i++)
if (ohtable[i].data)
link_check(ohtable[i].data);
free(ohtable);
CVS commit: src/usr.sbin/makefs
Module Name:src Committed By: christos Date: Tue Apr 23 22:18:56 UTC 2024 Modified Files: src/usr.sbin/makefs: walk.c Log Message: pass lint, simplify To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/usr.sbin/makefs/walk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/makefs
Module Name:src Committed By: christos Date: Tue Apr 23 22:12:48 UTC 2024 Modified Files: src/usr.sbin/makefs: walk.c Log Message: makefs: Fix symlink permission bits Permission bits for symlinks are taken straight from `lstat()`. However, the actual bits presented to the user are filesystem/kernel specific. For example, Linux with ext2/3/4 will use 0777 for symlinks, whereas NetBSD/FFS will show 0755. As far as `makefs` is in the loop, the target filesystem will likely be FFS, so use 0755. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/usr.sbin/makefs/walk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/makefs
Module Name:src
Committed By: christos
Date: Tue Apr 23 22:12:48 UTC 2024
Modified Files:
src/usr.sbin/makefs: walk.c
Log Message:
makefs: Fix symlink permission bits
Permission bits for symlinks are taken straight from `lstat()`. However, the
actual bits presented to the user are filesystem/kernel specific. For example,
Linux with ext2/3/4 will use 0777 for symlinks, whereas NetBSD/FFS will
show 0755. As far as `makefs` is in the loop, the target filesystem will likely
be FFS, so use 0755.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/usr.sbin/makefs/walk.c
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/makefs/walk.c
diff -u src/usr.sbin/makefs/walk.c:1.34 src/usr.sbin/makefs/walk.c:1.35
--- src/usr.sbin/makefs/walk.c:1.34 Tue Apr 23 18:12:16 2024
+++ src/usr.sbin/makefs/walk.c Tue Apr 23 18:12:48 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: walk.c,v 1.34 2024/04/23 22:12:16 christos Exp $ */
+/* $NetBSD: walk.c,v 1.35 2024/04/23 22:12:48 christos Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -41,7 +41,7 @@
#include
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: walk.c,v 1.34 2024/04/23 22:12:16 christos Exp $");
+__RCSID("$NetBSD: walk.c,v 1.35 2024/04/23 22:12:48 christos Exp $");
#endif /* !__lint */
#include
@@ -154,6 +154,15 @@ walk_dir(const char *root, const char *d
} else {
if (lstat(path, ) == -1)
err(EXIT_FAILURE, "Can't lstat `%s'", path);
+ /* As symlink permission bits vary between filesystems
+ (ie. 0755 on FFS/NetBSD, 0777 for ext[234]/Linux),
+ force them to 0755. */
+ if (S_ISLNK(stbuf.st_mode)) {
+stbuf.st_mode &= ~(S_IRWXU | S_IRWXG | S_IRWXO);
+stbuf.st_mode |= S_IRWXU
+ | S_IRGRP | S_IXGRP
+ | S_IROTH | S_IXOTH;
+ }
}
#ifdef S_ISSOCK
if (S_ISSOCK(stbuf.st_mode & S_IFMT)) {
CVS commit: src/usr.sbin/makefs
Module Name:src Committed By: christos Date: Tue Apr 23 22:12:16 UTC 2024 Modified Files: src/usr.sbin/makefs: walk.c Log Message: makefs: Sort directory contents by name (Jan-Benedict Glaw) `makefs` inserts nodes into its internal data structures in the order as returned by `readdir()` calls. As this is unpredictable, sort entries by name before creating the target filesystem. This is done by first converting the (per-directory) linked list into a plain array, sort it, finally re-link the list. Special case for the sorting function: The "." directory entry seems to be ment to be always at the front, so always check that first. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/usr.sbin/makefs/walk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/makefs
Module Name:src
Committed By: christos
Date: Tue Apr 23 22:12:16 UTC 2024
Modified Files:
src/usr.sbin/makefs: walk.c
Log Message:
makefs: Sort directory contents by name (Jan-Benedict Glaw)
`makefs` inserts nodes into its internal data structures in the order as
returned by `readdir()` calls. As this is unpredictable, sort entries by
name before creating the target filesystem.
This is done by first converting the (per-directory) linked list into
a plain array, sort it, finally re-link the list. Special case for the
sorting function: The "." directory entry seems to be ment to be always
at the front, so always check that first.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/usr.sbin/makefs/walk.c
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/makefs/walk.c
diff -u src/usr.sbin/makefs/walk.c:1.33 src/usr.sbin/makefs/walk.c:1.34
--- src/usr.sbin/makefs/walk.c:1.33 Thu Dec 28 07:13:55 2023
+++ src/usr.sbin/makefs/walk.c Tue Apr 23 18:12:16 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: walk.c,v 1.33 2023/12/28 12:13:55 tsutsui Exp $ */
+/* $NetBSD: walk.c,v 1.34 2024/04/23 22:12:16 christos Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -41,7 +41,7 @@
#include
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: walk.c,v 1.33 2023/12/28 12:13:55 tsutsui Exp $");
+__RCSID("$NetBSD: walk.c,v 1.34 2024/04/23 22:12:16 christos Exp $");
#endif /* !__lint */
#include
@@ -66,6 +66,24 @@ static fsnode *create_fsnode(const char
struct stat *);
static fsinode *link_check(fsinode *);
+/*
+ * fsnode_cmp --
+ * This function is used by `qsort` so sort one directory's
+ * entries. `.` is always first, sollowed by anything else
+ * as compared by `strcmp()`.
+ */
+static int
+fsnode_cmp (const void *_left, const void *_right)
+{
+ const fsnode * const left = *(const fsnode * const *)_left;
+ const fsnode * const right = *(const fsnode * const *)_right;
+
+ if (strcmp (left->name, ".") == 0)
+ return -1;
+ if (strcmp (right->name, ".") == 0)
+ return 1;
+ return strcmp (left->name, right->name);
+}
/*
* walk_dir --
@@ -87,6 +105,9 @@ walk_dir(const char *root, const char *d
char *name, *rp;
int dot, len;
+ fsnode **list, **listptr;
+ int num = 0;
+
assert(root != NULL);
assert(dir != NULL);
@@ -241,7 +262,36 @@ walk_dir(const char *root, const char *d
cur->first = first;
if (closedir(dirp) == -1)
err(EXIT_FAILURE, "Can't closedir `%s/%s'", root, dir);
- return (first);
+
+ /*
+ * Sort entries.
+ */
+ /* Create a plain list: Count, alloc, add. */
+ for (fsnode *tmp = first; tmp; tmp = tmp->next) {
+ num++;
+ if (debug & DEBUG_DUMP_FSNODES_VERBOSE)
+ printf ("pre sort: %s %s %s\n", root, dir, tmp->name);
+ }
+ list = listptr = ecalloc (num, sizeof (*list));
+ for (fsnode *tmp = first; tmp; tmp = tmp->next)
+ *listptr++ = tmp;
+ /* Sort plain list. */
+ qsort (list, num, sizeof (*list), _cmp);
+ /* Rewire. */
+ for (int i = 0; i < num - 1; ++i)
+ list[i]->next = list[i+1];
+ list[num - 1]->next = NULL;
+ first = list[0];
+ /* Check `first` to be ".". */
+ assert (strcmp (first->name, ".") == 0);
+ /* Free. */
+ free (list);
+ /* Dump sorted state. */
+ if (debug & DEBUG_DUMP_FSNODES_VERBOSE)
+ for (fsnode *tmp = first; tmp; tmp = tmp->next)
+ printf ("post sort: %s %s %s\n", root, dir, tmp->name);
+
+ return first;
}
static fsnode *
CVS commit: src/distrib/vax/floppy
Module Name:src
Committed By: christos
Date: Tue Apr 23 22:00:37 UTC 2024
Modified Files:
src/distrib/vax/floppy: Makefile
Log Message:
VAX boot.fs: Fix owner/group/permissions for VAX's boot.fs (Jan-Benedict Glaw)
(Initial patch from Christos Zoulas.) Don't create an archive based on local
permission bits and owner/group. Instead, feed a small manifest into `pax`
and let it to its work.
NB: Don't also feed in an entry for the current directory ".", as `pax` will
then archive all files in the current directory, in `readdir()` order.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/distrib/vax/floppy/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/vax/floppy/Makefile
diff -u src/distrib/vax/floppy/Makefile:1.14 src/distrib/vax/floppy/Makefile:1.15
--- src/distrib/vax/floppy/Makefile:1.14 Fri Feb 10 22:07:06 2017
+++ src/distrib/vax/floppy/Makefile Tue Apr 23 18:00:37 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2017/02/11 03:07:06 christos Exp $
+# $NetBSD: Makefile,v 1.15 2024/04/23 22:00:37 christos Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -29,7 +29,10 @@ boot.vax: ${DESTDIR}/usr/mdec/boot
${IMAGE}: ${IMAGEDEPENDS}
cat ${XXBOOT} > ${IMAGE}.tmp
- ${TOOL_PAX} ${PAX_TIMESTAMP} -O -w -x ustar boot.vax netbsd.gz | dd of=${IMAGE}.tmp seek=16
+ (echo "./boot.vax type=file uname=root gname=wheel mode=0755"; \
+ echo "./netbsd.gz type=file uname=root gname=wheel mode=0644") | \
+ ${TOOL_PAX} ${PAX_TIMESTAMP} -O -w -x ustar -M | \
+ dd of=${IMAGE}.tmp seek=16
dd if=${IMAGE}.tmp of=${IMAGE} bs=${IMAGESIZE} conv=sync
release: check_RELEASEDIR .WAIT ${IMAGE}
CVS commit: src/distrib/vax/floppy
Module Name:src Committed By: christos Date: Tue Apr 23 22:00:37 UTC 2024 Modified Files: src/distrib/vax/floppy: Makefile Log Message: VAX boot.fs: Fix owner/group/permissions for VAX's boot.fs (Jan-Benedict Glaw) (Initial patch from Christos Zoulas.) Don't create an archive based on local permission bits and owner/group. Instead, feed a small manifest into `pax` and let it to its work. NB: Don't also feed in an entry for the current directory ".", as `pax` will then archive all files in the current directory, in `readdir()` order. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/distrib/vax/floppy/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/common
Module Name:src
Committed By: christos
Date: Tue Apr 23 21:58:57 UTC 2024
Modified Files:
src/distrib/common: Makefile.mdset
Log Message:
`nm`: Generate a stable symbol table (Jan-Benedict Glaw)
Release artifacts may contain symbol lists. Binutils's `nm` sorts them by
symbol name, locale based. Inserting a plain `sort` (with `LC_ALL=C`) here
sorts them by address, and (with several symbols pointing to the same address)
sorting by name is also stable (think of embedded '_'.)
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/distrib/common/Makefile.mdset
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.mdset
diff -u src/distrib/common/Makefile.mdset:1.46 src/distrib/common/Makefile.mdset:1.47
--- src/distrib/common/Makefile.mdset:1.46 Mon Aug 12 04:04:28 2019
+++ src/distrib/common/Makefile.mdset Tue Apr 23 17:58:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mdset,v 1.46 2019/08/12 08:04:28 martin Exp $
+# $NetBSD: Makefile.mdset,v 1.47 2024/04/23 21:58:57 christos Exp $
#
# Makefile snippet to ${TOOL_MDSETIMAGE} file system images into kernels
#
@@ -149,7 +149,7 @@ ${_KERNEL.${_K}.${_F}}: .NOTMAIN ${_KERN
${TOOL_MDSETIMAGE} ${MDSETIMAGEFLAGS} ${.TARGET}.tmp ${_I}
.endif
.if !defined(MDSET_NOSYMBOLS.${_FILENAME}) && !defined(MDSET_NOSYMBOLS)
- ${NM} ${.TARGET}.tmp | ${TOOL_GZIP_N} -9 > ${.TARGET}.symbols.gz
+ ${NM} ${.TARGET}.tmp | LC_ALL=C sort | ${TOOL_GZIP_N} -9 > ${.TARGET}.symbols.gz
.endif
.if !defined(MDSET_NOSTRIP.${_FILENAME}) && !defined(MDSET_NOSTRIP)
${STRIP} -R .eh_frame -R .eh_frame_hdr -R .comment -R .ident ${MDSET_STRIPSECTIONS} ${.TARGET}.tmp
CVS commit: src/distrib/common
Module Name:src Committed By: christos Date: Tue Apr 23 21:58:57 UTC 2024 Modified Files: src/distrib/common: Makefile.mdset Log Message: `nm`: Generate a stable symbol table (Jan-Benedict Glaw) Release artifacts may contain symbol lists. Binutils's `nm` sorts them by symbol name, locale based. Inserting a plain `sort` (with `LC_ALL=C`) here sorts them by address, and (with several symbols pointing to the same address) sorting by name is also stable (think of embedded '_'.) To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/distrib/common/Makefile.mdset Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib
Module Name:src
Committed By: nia
Date: Tue Apr 23 20:37:08 UTC 2024
Modified Files:
src/distrib/common: Makefile.bootcd
src/distrib/i386/cdroms/installcd: Makefile
Log Message:
Reduce the size of the i386 ISO to help it fit on a CD-ROM
Exclude tests and html man pages.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.10 -r1.11 src/distrib/i386/cdroms/installcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.45 src/distrib/common/Makefile.bootcd:1.46
--- src/distrib/common/Makefile.bootcd:1.45 Tue Apr 23 12:25:57 2024
+++ src/distrib/common/Makefile.bootcd Tue Apr 23 20:37:07 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.45 2024/04/23 12:25:57 nia Exp $
+# $NetBSD: Makefile.bootcd,v 1.46 2024/04/23 20:37:07 nia Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -58,6 +58,7 @@ CDRELEASE_EXCLUDE= -s ',./installation/c
.if defined(CDRELEASE_NOCOMPAT)
. for sufx in tgz tar.xz
CDRELEASE_EXCLUDE+= -s ',./binary/sets/base32.${sufx},,gp'
+CDRELEASE_EXCLUDE+= -s ',./binary/sets/base64.${sufx},,gp'
. endfor
.endif
.if defined(CDRELEASE_NODEBUG)
@@ -68,6 +69,16 @@ CDRELEASE_EXCLUDE+= -s ',./binary/sets/d
CDRELEASE_EXCLUDE+= -s ',./binary/sets/xdebug.${sufx},,gp'
. endfor
.endif
+.if defined(CDRELEASE_NOHTML)
+. for sufx in tgz tar.xz
+CDRELEASE_EXCLUDE+= -s ',./binary/sets/manhtml.${sufx},,gp'
+. endfor
+.endif
+.if defined(CDRELEASE_NOTESTS)
+. for sufx in tgz tar.xz
+CDRELEASE_EXCLUDE+= -s ',./binary/sets/tests.${sufx},,gp'
+. endfor
+.endif
.if !defined(CDRELEASE_LIVEIMAGE)
CDRELEASE_EXCLUDE+= -s ',./installation/liveimage.*,,gp'
.endif
Index: src/distrib/i386/cdroms/installcd/Makefile
diff -u src/distrib/i386/cdroms/installcd/Makefile:1.10 src/distrib/i386/cdroms/installcd/Makefile:1.11
--- src/distrib/i386/cdroms/installcd/Makefile:1.10 Mon Sep 23 13:42:33 2019
+++ src/distrib/i386/cdroms/installcd/Makefile Tue Apr 23 20:37:08 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/09/23 13:42:33 christos Exp $
+# $NetBSD: Makefile,v 1.11 2024/04/23 20:37:08 nia Exp $
#
# Install CD, to be made after 'build.sh release'
@@ -10,6 +10,8 @@
CDBASE= i386cd # gives ${CDBASE}.iso
CDRELEASE= true# include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
+CDRELEASE_NOHTML= true
+CDRELEASE_NOTESTS= true
CDBUILDEXTRA+= boot.cfg # Add boot.cfg file
CLEANFILES+= boot.cfg
CVS commit: src/distrib
Module Name:src Committed By: nia Date: Tue Apr 23 20:37:08 UTC 2024 Modified Files: src/distrib/common: Makefile.bootcd src/distrib/i386/cdroms/installcd: Makefile Log Message: Reduce the size of the i386 ISO to help it fit on a CD-ROM Exclude tests and html man pages. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/distrib/common/Makefile.bootcd cvs rdiff -u -r1.10 -r1.11 src/distrib/i386/cdroms/installcd/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/MesaLib/dist/src/util
Module Name:xsrc Committed By: martin Date: Tue Apr 23 16:16:44 UTC 2024 Modified Files: xsrc/external/mit/MesaLib/dist/src/util: macros.h Log Message: Do not re-define CACHE_LINE_SIZE To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/MesaLib/dist/src/util/macros.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/MesaLib/dist/src/util/macros.h diff -u xsrc/external/mit/MesaLib/dist/src/util/macros.h:1.1.1.4 xsrc/external/mit/MesaLib/dist/src/util/macros.h:1.2 --- xsrc/external/mit/MesaLib/dist/src/util/macros.h:1.1.1.4 Mon May 9 01:23:43 2022 +++ xsrc/external/mit/MesaLib/dist/src/util/macros.h Tue Apr 23 16:16:44 2024 @@ -478,6 +478,8 @@ typedef int lock_cap_t; #endif /* TODO: this could be different on non-x86 architectures. */ +#ifndef CACHE_LINE_SIZE #define CACHE_LINE_SIZE 64 +#endif #endif /* UTIL_MACROS_H */
CVS commit: xsrc/external/mit/MesaLib/dist/src/util
Module Name:xsrc Committed By: martin Date: Tue Apr 23 16:16:44 UTC 2024 Modified Files: xsrc/external/mit/MesaLib/dist/src/util: macros.h Log Message: Do not re-define CACHE_LINE_SIZE To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/MesaLib/dist/src/util/macros.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: hans
Date: Tue Apr 23 15:34:07 UTC 2024
Modified Files:
src/sys/dev/pci: if_bnx.c
Log Message:
Sync the statistics DMA memory correctly before it is accessed.
To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/sys/dev/pci/if_bnx.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/dev/pci/if_bnx.c
diff -u src/sys/dev/pci/if_bnx.c:1.113 src/sys/dev/pci/if_bnx.c:1.114
--- src/sys/dev/pci/if_bnx.c:1.113 Fri Feb 9 22:08:35 2024
+++ src/sys/dev/pci/if_bnx.c Tue Apr 23 15:34:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bnx.c,v 1.113 2024/02/09 22:08:35 andvar Exp $ */
+/* $NetBSD: if_bnx.c,v 1.114 2024/04/23 15:34:07 hans Exp $ */
/* $OpenBSD: if_bnx.c,v 1.101 2013/03/28 17:21:44 brad Exp $ */
/*-
@@ -35,7 +35,7 @@
#if 0
__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.3 2006/04/13 14:12:26 ru Exp $");
#endif
-__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.113 2024/02/09 22:08:35 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.114 2024/04/23 15:34:07 hans Exp $");
/*
* The following controllers are supported by this driver:
@@ -5667,7 +5667,7 @@ bnx_stats_update(struct bnx_softc *sc)
struct statistics_block *stats;
DBPRINT(sc, BNX_EXCESSIVE, "Entering %s()\n", __func__);
- bus_dmamap_sync(sc->bnx_dmatag, sc->status_map, 0, BNX_STATUS_BLK_SZ,
+ bus_dmamap_sync(sc->bnx_dmatag, sc->stats_map, 0, BNX_STATS_BLK_SZ,
BUS_DMASYNC_POSTREAD);
stats = (struct statistics_block *)sc->stats_block;
@@ -6257,7 +6257,7 @@ void
bnx_dump_stats_block(struct bnx_softc *sc)
{
struct statistics_block *sblk;
- bus_dmamap_sync(sc->bnx_dmatag, sc->status_map, 0, BNX_STATUS_BLK_SZ,
+ bus_dmamap_sync(sc->bnx_dmatag, sc->stats_map, 0, BNX_STATS_BLK_SZ,
BUS_DMASYNC_POSTREAD);
sblk = sc->stats_block;
CVS commit: src/sys/dev/pci
Module Name:src Committed By: hans Date: Tue Apr 23 15:34:07 UTC 2024 Modified Files: src/sys/dev/pci: if_bnx.c Log Message: Sync the statistics DMA memory correctly before it is accessed. To generate a diff of this commit: cvs rdiff -u -r1.113 -r1.114 src/sys/dev/pci/if_bnx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib
Module Name:src Committed By: nia Date: Tue Apr 23 12:25:57 UTC 2024 Modified Files: src/distrib/amd64/cdroms/installcd: Makefile src/distrib/common: Makefile.bootcd src/distrib/sparc64/cdroms/installcd: Makefile Log Message: Exclude compat sets from ISO images that struggle to fit on a CD-ROM When debug is excluded, also exclude the compat debug sets. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/distrib/amd64/cdroms/installcd/Makefile cvs rdiff -u -r1.44 -r1.45 src/distrib/common/Makefile.bootcd cvs rdiff -u -r1.31 -r1.32 src/distrib/sparc64/cdroms/installcd/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib
Module Name:src
Committed By: nia
Date: Tue Apr 23 12:25:57 UTC 2024
Modified Files:
src/distrib/amd64/cdroms/installcd: Makefile
src/distrib/common: Makefile.bootcd
src/distrib/sparc64/cdroms/installcd: Makefile
Log Message:
Exclude compat sets from ISO images that struggle to fit on a CD-ROM
When debug is excluded, also exclude the compat debug sets.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/amd64/cdroms/installcd/Makefile
cvs rdiff -u -r1.44 -r1.45 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.31 -r1.32 src/distrib/sparc64/cdroms/installcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/cdroms/installcd/Makefile
diff -u src/distrib/amd64/cdroms/installcd/Makefile:1.6 src/distrib/amd64/cdroms/installcd/Makefile:1.7
--- src/distrib/amd64/cdroms/installcd/Makefile:1.6 Mon Sep 23 13:42:30 2019
+++ src/distrib/amd64/cdroms/installcd/Makefile Tue Apr 23 12:25:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/09/23 13:42:30 christos Exp $
+# $NetBSD: Makefile,v 1.7 2024/04/23 12:25:57 nia Exp $
#
# Install CD, to be made after 'build.sh release'
@@ -10,6 +10,7 @@
CDBASE= amd64cd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
+CDRELEASE_NOCOMPAT= true
CDBUILDEXTRA= boot.cfg # Add boot.cfg file
CLEANFILES+= boot.cfg
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.44 src/distrib/common/Makefile.bootcd:1.45
--- src/distrib/common/Makefile.bootcd:1.44 Sun Oct 11 14:10:04 2020
+++ src/distrib/common/Makefile.bootcd Tue Apr 23 12:25:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.44 2020/10/11 14:10:04 jmcneill Exp $
+# $NetBSD: Makefile.bootcd,v 1.45 2024/04/23 12:25:57 nia Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -55,11 +55,18 @@ CDROMS_RELEASEDIR?= images
.if defined(CDRELEASE_NOISOS)
CDRELEASE_EXCLUDE= -s ',./installation/cdrom.*,,gp'
.endif
+.if defined(CDRELEASE_NOCOMPAT)
+. for sufx in tgz tar.xz
+CDRELEASE_EXCLUDE+= -s ',./binary/sets/base32.${sufx},,gp'
+. endfor
+.endif
.if defined(CDRELEASE_NODEBUG)
-CDRELEASE_EXCLUDE+= -s ',./binary/sets/debug.tgz,,gp'
-CDRELEASE_EXCLUDE+= -s ',./binary/sets/xdebug.tgz,,gp'
-CDRELEASE_EXCLUDE+= -s ',./binary/sets/debug.tar.xz,,gp'
-CDRELEASE_EXCLUDE+= -s ',./binary/sets/xdebug.tar.xz,,gp'
+. for sufx in tgz tar.xz
+CDRELEASE_EXCLUDE+= -s ',./binary/sets/debug.${sufx},,gp'
+CDRELEASE_EXCLUDE+= -s ',./binary/sets/debug32.${sufx},,gp'
+CDRELEASE_EXCLUDE+= -s ',./binary/sets/debug64.${sufx},,gp'
+CDRELEASE_EXCLUDE+= -s ',./binary/sets/xdebug.${sufx},,gp'
+. endfor
.endif
.if !defined(CDRELEASE_LIVEIMAGE)
CDRELEASE_EXCLUDE+= -s ',./installation/liveimage.*,,gp'
Index: src/distrib/sparc64/cdroms/installcd/Makefile
diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.31 src/distrib/sparc64/cdroms/installcd/Makefile:1.32
--- src/distrib/sparc64/cdroms/installcd/Makefile:1.31 Mon Sep 23 13:42:35 2019
+++ src/distrib/sparc64/cdroms/installcd/Makefile Tue Apr 23 12:25:57 2024
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.31 2019/09/23 13:42:35 christos Exp $
+# $NetBSD: Makefile,v 1.32 2024/04/23 12:25:57 nia Exp $
.include
CDBASE= sparc64cd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
+CDRELEASE_NOCOMPAT= true
CDKERNELS= ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-GENERIC.gz netbsd
CD_SETS= base etc
.if ${MKKMOD} != "no"
CVS commit: src
Module Name:src Committed By: martin Date: Tue Apr 23 07:47:36 UTC 2024 Modified Files: src: build.sh Log Message: For consistency, check MKREPRO_TIMESTAMP always numerically (not as string) To generate a diff of this commit: cvs rdiff -u -r1.376 -r1.377 src/build.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/build.sh diff -u src/build.sh:1.376 src/build.sh:1.377 --- src/build.sh:1.376 Sat Apr 20 12:25:46 2024 +++ src/build.sh Tue Apr 23 07:47:36 2024 @@ -1,5 +1,5 @@ #! /usr/bin/env sh -# $NetBSD: build.sh,v 1.376 2024/04/20 12:25:46 rillig Exp $ +# $NetBSD: build.sh,v 1.377 2024/04/23 07:47:36 martin Exp $ # # Copyright (c) 2001-2023 The NetBSD Foundation, Inc. # All rights reserved. @@ -2031,7 +2031,7 @@ createmakewrapper() eval cat <
CVS commit: src
Module Name:src Committed By: martin Date: Tue Apr 23 07:47:36 UTC 2024 Modified Files: src: build.sh Log Message: For consistency, check MKREPRO_TIMESTAMP always numerically (not as string) To generate a diff of this commit: cvs rdiff -u -r1.376 -r1.377 src/build.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: martin Date: Tue Apr 23 07:33:24 UTC 2024 Modified Files: src/distrib/sets/lists/debug: mi Log Message: Add new test program To generate a diff of this commit: cvs rdiff -u -r1.431 -r1.432 src/distrib/sets/lists/debug/mi 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/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.431 src/distrib/sets/lists/debug/mi:1.432 --- src/distrib/sets/lists/debug/mi:1.431 Tue Apr 9 15:17:23 2024 +++ src/distrib/sets/lists/debug/mi Tue Apr 23 07:33:24 2024 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.431 2024/04/09 15:17:23 nia Exp $ +# $NetBSD: mi,v 1.432 2024/04/23 07:33:24 martin Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib @@ -1821,6 +1821,7 @@ ./usr/libdata/debug/usr/tests/kernel/t_pty.debug tests-kernel-tests debug,atf,compattestfile ./usr/libdata/debug/usr/tests/kernel/t_rnd.debug tests-kernel-tests debug,atf,rump ./usr/libdata/debug/usr/tests/kernel/t_sigaction.debug tests-obsolete obsolete,compattestfile +./usr/libdata/debug/usr/tests/kernel/t_signal_and_sp.debug tests-kernel-tests debug,atf,compattestfile ./usr/libdata/debug/usr/tests/kernel/t_subr_prf.debug tests-kernel-tests debug,atf,compattestfile ./usr/libdata/debug/usr/tests/kernel/t_sysctl.debug tests-kernel-tests debug,atf,compattestfile ./usr/libdata/debug/usr/tests/kernel/t_sysv.debug tests-kernel-tests debug,atf,compattestfile
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: martin Date: Tue Apr 23 07:33:24 UTC 2024 Modified Files: src/distrib/sets/lists/debug: mi Log Message: Add new test program To generate a diff of this commit: cvs rdiff -u -r1.431 -r1.432 src/distrib/sets/lists/debug/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
