CVS commit: xsrc/local/programs/bdfload
Module Name:xsrc Committed By: uwe Date: Sun May 8 22:29:55 UTC 2022 Modified Files: xsrc/local/programs/bdfload: Makefile Log Message: Define NOMAN. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/local/programs/bdfload/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/local/programs/bdfload/Makefile diff -u xsrc/local/programs/bdfload/Makefile:1.2 xsrc/local/programs/bdfload/Makefile:1.3 --- xsrc/local/programs/bdfload/Makefile:1.2 Sun May 8 22:29:36 2022 +++ xsrc/local/programs/bdfload/Makefile Sun May 8 22:29:55 2022 @@ -1,4 +1,5 @@ PROG = bdfload SRCS = bdfload.c +NOMAN= .include
CVS commit: xsrc/local/programs/bdfload
Module Name:xsrc Committed By: uwe Date: Sun May 8 22:29:55 UTC 2022 Modified Files: xsrc/local/programs/bdfload: Makefile Log Message: Define NOMAN. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/local/programs/bdfload/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/local/programs/bdfload
Module Name:xsrc Committed By: uwe Date: Sun May 8 22:29:36 UTC 2022 Modified Files: xsrc/local/programs/bdfload: Makefile Log Message: Add final newline. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 xsrc/local/programs/bdfload/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/local/programs/bdfload/Makefile diff -u xsrc/local/programs/bdfload/Makefile:1.1 xsrc/local/programs/bdfload/Makefile:1.2 --- xsrc/local/programs/bdfload/Makefile:1.1 Wed Jan 2 22:05:24 2019 +++ xsrc/local/programs/bdfload/Makefile Sun May 8 22:29:36 2022 @@ -1,4 +1,4 @@ PROG = bdfload SRCS = bdfload.c -.include \ No newline at end of file +.include
CVS commit: xsrc/local/programs/bdfload
Module Name:xsrc Committed By: uwe Date: Sun May 8 22:29:36 UTC 2022 Modified Files: xsrc/local/programs/bdfload: Makefile Log Message: Add final newline. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 xsrc/local/programs/bdfload/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/uvm/pmap
Module Name:src
Committed By: rin
Date: Sun May 8 22:03:02 UTC 2022
Modified Files:
src/sys/uvm/pmap: pmap_pvt.c
Log Message:
Oops, correct misleading #endif comment.
It seems I need a cup of coffee...
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/uvm/pmap/pmap_pvt.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/uvm/pmap/pmap_pvt.c
diff -u src/sys/uvm/pmap/pmap_pvt.c:1.14 src/sys/uvm/pmap/pmap_pvt.c:1.15
--- src/sys/uvm/pmap/pmap_pvt.c:1.14 Sun May 8 22:00:06 2022
+++ src/sys/uvm/pmap/pmap_pvt.c Sun May 8 22:03:02 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_pvt.c,v 1.14 2022/05/08 22:00:06 rin Exp $ */
+/* $NetBSD: pmap_pvt.c,v 1.15 2022/05/08 22:03:02 rin Exp $ */
/*-
* Copyright (c) 2014, 2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: pmap_pvt.c,v 1.14 2022/05/08 22:00:06 rin Exp $");
+__RCSID("$NetBSD: pmap_pvt.c,v 1.15 2022/05/08 22:03:02 rin Exp $");
#include
#include
@@ -219,4 +219,4 @@ pmap_pv_untrack(paddr_t start, psize_t s
}
#endif /* notdef */
-#endif /* !PMAP_PV_TRACK_ONLY_STUBS */
+#endif /* PMAP_PV_TRACK_ONLY_STUBS */
CVS commit: src/sys/uvm/pmap
Module Name:src Committed By: rin Date: Sun May 8 22:03:02 UTC 2022 Modified Files: src/sys/uvm/pmap: pmap_pvt.c Log Message: Oops, correct misleading #endif comment. It seems I need a cup of coffee... To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/uvm/pmap/pmap_pvt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/uvm/pmap
Module Name:src
Committed By: rin
Date: Sun May 8 22:00:06 UTC 2022
Modified Files:
src/sys/uvm/pmap: pmap_pvt.c
Log Message:
Improve wording a bit in a comment for the previous.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/uvm/pmap/pmap_pvt.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/uvm/pmap/pmap_pvt.c
diff -u src/sys/uvm/pmap/pmap_pvt.c:1.13 src/sys/uvm/pmap/pmap_pvt.c:1.14
--- src/sys/uvm/pmap/pmap_pvt.c:1.13 Sun May 8 21:55:34 2022
+++ src/sys/uvm/pmap/pmap_pvt.c Sun May 8 22:00:06 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_pvt.c,v 1.13 2022/05/08 21:55:34 rin Exp $ */
+/* $NetBSD: pmap_pvt.c,v 1.14 2022/05/08 22:00:06 rin Exp $ */
/*-
* Copyright (c) 2014, 2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: pmap_pvt.c,v 1.13 2022/05/08 21:55:34 rin Exp $");
+__RCSID("$NetBSD: pmap_pvt.c,v 1.14 2022/05/08 22:00:06 rin Exp $");
#include
#include
@@ -201,8 +201,8 @@ pmap_pv_tracked(paddr_t pa)
* pmap_pv_{,un}track() are intentionally commented out. If modules
* call these functions, the result should be an inconsistent state.
*
- * Such modules require real PV-tracking support. Let us make two
- * symbols undefined, and prevent these modules from loaded.
+ * Such modules require real PV-tracking support. Let us make the
+ * two symbols undefined, and prevent these modules from loaded.
*/
void
pmap_pv_track(paddr_t start, psize_t size)
CVS commit: src/sys/uvm/pmap
Module Name:src Committed By: rin Date: Sun May 8 22:00:06 UTC 2022 Modified Files: src/sys/uvm/pmap: pmap_pvt.c Log Message: Improve wording a bit in a comment for the previous. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/uvm/pmap/pmap_pvt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/uvm/pmap
Module Name:src
Committed By: rin
Date: Sun May 8 21:55:35 UTC 2022
Modified Files:
src/sys/uvm/pmap: pmap_pvt.c
Log Message:
For PMAP_PV_TRACK_ONLY_STUBS, comment out pmap_pv_{,un}track().
If modules call these functions, the result should be an
inconsistent state.
Such modules require real PV-tracking support, anyway.
The best we can do should be to make two symbols undefined, and
prevent these modules from loaded.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/uvm/pmap/pmap_pvt.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/uvm/pmap/pmap_pvt.c
diff -u src/sys/uvm/pmap/pmap_pvt.c:1.12 src/sys/uvm/pmap/pmap_pvt.c:1.13
--- src/sys/uvm/pmap/pmap_pvt.c:1.12 Sat May 7 06:53:16 2022
+++ src/sys/uvm/pmap/pmap_pvt.c Sun May 8 21:55:34 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_pvt.c,v 1.12 2022/05/07 06:53:16 rin Exp $ */
+/* $NetBSD: pmap_pvt.c,v 1.13 2022/05/08 21:55:34 rin Exp $ */
/*-
* Copyright (c) 2014, 2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: pmap_pvt.c,v 1.12 2022/05/07 06:53:16 rin Exp $");
+__RCSID("$NetBSD: pmap_pvt.c,v 1.13 2022/05/08 21:55:34 rin Exp $");
#include
#include
@@ -189,22 +189,34 @@ pmap_pv_init(void)
}
-void
-pmap_pv_track(paddr_t start, psize_t size)
+struct pmap_page *
+pmap_pv_tracked(paddr_t pa)
{
+ return NULL;
}
+#if notdef
+/*
+ * pmap_pv_{,un}track() are intentionally commented out. If modules
+ * call these functions, the result should be an inconsistent state.
+ *
+ * Such modules require real PV-tracking support. Let us make two
+ * symbols undefined, and prevent these modules from loaded.
+ */
void
-pmap_pv_untrack(paddr_t start, psize_t size)
+pmap_pv_track(paddr_t start, psize_t size)
{
+ panic("PV-tracking not supported");
}
-struct pmap_page *
-pmap_pv_tracked(paddr_t pa)
+void
+pmap_pv_untrack(paddr_t start, psize_t size)
{
- return NULL;
+ panic("PV-tracking not supported");
}
-#endif
+#endif /* notdef */
+
+#endif /* !PMAP_PV_TRACK_ONLY_STUBS */
CVS commit: src/sys/uvm/pmap
Module Name:src
Committed By: rin
Date: Sun May 8 21:55:35 UTC 2022
Modified Files:
src/sys/uvm/pmap: pmap_pvt.c
Log Message:
For PMAP_PV_TRACK_ONLY_STUBS, comment out pmap_pv_{,un}track().
If modules call these functions, the result should be an
inconsistent state.
Such modules require real PV-tracking support, anyway.
The best we can do should be to make two symbols undefined, and
prevent these modules from loaded.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/uvm/pmap/pmap_pvt.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: reinoud Date: Sun May 8 21:29:20 UTC 2022 Modified Files: src/usr.sbin/makefs: makefs.h Log Message: Revert, sorry this was not intended to be committed. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/usr.sbin/makefs/makefs.h 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/makefs.h diff -u src/usr.sbin/makefs/makefs.h:1.39 src/usr.sbin/makefs/makefs.h:1.40 --- src/usr.sbin/makefs/makefs.h:1.39 Sat May 7 08:54:02 2022 +++ src/usr.sbin/makefs/makefs.h Sun May 8 21:29:20 2022 @@ -44,7 +44,7 @@ #define HAVE_STRUCT_STAT_ST_FLAGS 1 #define HAVE_STRUCT_STAT_ST_GEN 1 #define HAVE_STRUCT_STAT_ST_MTIMENSEC 1 -//#define HAVE_STRUCT_STATVFS_F_IOSIZE 1 +#define HAVE_STRUCT_STATVFS_F_IOSIZE 1 #define HAVE_STRUCT_STAT_BIRTHTIME 1 #define HAVE_FSTATVFS 1 #endif
CVS commit: src/usr.sbin/makefs
Module Name:src Committed By: reinoud Date: Sun May 8 21:29:20 UTC 2022 Modified Files: src/usr.sbin/makefs: makefs.h Log Message: Revert, sorry this was not intended to be committed. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/usr.sbin/makefs/makefs.h 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: Sun May 8 19:19:11 UTC 2022 Modified Files: src/usr.bin/make: test-variants.mk Log Message: make: remove test variant without GMAKEEXPORT Undefining GMAKEEXPORT on the command line had no effect, since that macro is defined unconditionally in config.h. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/test-variants.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/test-variants.mk diff -u src/usr.bin/make/test-variants.mk:1.3 src/usr.bin/make/test-variants.mk:1.4 --- src/usr.bin/make/test-variants.mk:1.3 Tue May 3 19:05:34 2022 +++ src/usr.bin/make/test-variants.mk Sun May 8 19:19:11 2022 @@ -1,4 +1,4 @@ -# $NetBSD: test-variants.mk,v 1.3 2022/05/03 19:05:34 rillig Exp $ +# $NetBSD: test-variants.mk,v 1.4 2022/05/08 19:19:11 rillig Exp $ # # Build several variants of make and run the tests on them. # @@ -74,12 +74,6 @@ TESTS+= debug-src CPPFLAGS.debug-src= -DDEBUG_SRC SKIP.debug-src= yes -# In this variant, the tests for 'export VAR=value' fail, as expected. -# -TESTS+= no-gmake-export -CPPFLAGS.no-gmake-export= -UGMAKEEXPORT -SKIP.no-gmake-export= yes - # NetBSD 8.0 x86_64 # In file included from arch.c:135:0: # /usr/include/sys/param.h:357:0: error: "MAXPATHLEN" redefined [-Werror]
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Sun May 8 19:19:11 UTC 2022 Modified Files: src/usr.bin/make: test-variants.mk Log Message: make: remove test variant without GMAKEEXPORT Undefining GMAKEEXPORT on the command line had no effect, since that macro is defined unconditionally in config.h. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/test-variants.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/elftoolchain/dist/common/sys
Module Name:src Committed By: jkoshy Date: Sun May 8 17:28:14 UTC 2022 Modified Files: src/external/bsd/elftoolchain/dist/common/sys: elfdefinitions.m4 Log Message: Merge from upstream [r3984]: allow the use of the generated 'elfdefinitions.h' file in compilation environments lacking C99 headers. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4 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/elftoolchain/dist/common/sys/elfdefinitions.m4 diff -u src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4:1.4 src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4:1.5 --- src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4:1.4 Mon May 2 20:27:43 2022 +++ src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4 Sun May 8 17:28:14 2022 @@ -1,4 +1,4 @@ -dnl $NetBSD: elfdefinitions.m4,v 1.4 2022/05/02 20:27:43 jkoshy Exp $ +dnl $NetBSD: elfdefinitions.m4,v 1.5 2022/05/08 17:28:14 jkoshy Exp $ /*- * Copyright (c) 2010,2021 Joseph Koshy * All rights reserved. @@ -26,7 +26,7 @@ dnl $NetBSD: elfdefinitions.m4,v 1.4 20 */ divert(-1) define(`VCSID_ELFDEFINITIONS_M4', - `Id: elfdefinitions.m4 3980 2022-05-02 19:50:00Z jkoshy') + `Id: elfdefinitions.m4 3984 2022-05-06 11:22:42Z jkoshy') include(`elfconstants.m4')dnl define(`_',`ifelse(eval(len($1) <= 7),1, @@ -55,8 +55,6 @@ divert(0)dnl #ifndef _SYS_ELFDEFINITIONS_H_ #define _SYS_ELFDEFINITIONS_H_ -#include - /* * Types of capabilities. */
CVS commit: src/external/bsd/elftoolchain/dist/common/sys
Module Name:src Committed By: jkoshy Date: Sun May 8 17:28:14 UTC 2022 Modified Files: src/external/bsd/elftoolchain/dist/common/sys: elfdefinitions.m4 Log Message: Merge from upstream [r3984]: allow the use of the generated 'elfdefinitions.h' file in compilation environments lacking C99 headers. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: rillig Date: Sun May 8 10:20:50 UTC 2022 Modified Files: src/distrib/sets/lists/tests: mi src/usr.bin/make/unit-tests: Makefile Removed Files: src/usr.bin/make/unit-tests: varquote.exp varquote.mk Log Message: tests/make: remove test varquote The test varmod-quote-dollar covers the same topic. To generate a diff of this commit: cvs rdiff -u -r1.1202 -r1.1203 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.314 -r1.315 src/usr.bin/make/unit-tests/Makefile cvs rdiff -u -r1.2 -r0 src/usr.bin/make/unit-tests/varquote.exp cvs rdiff -u -r1.5 -r0 src/usr.bin/make/unit-tests/varquote.mk 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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.1202 src/distrib/sets/lists/tests/mi:1.1203 --- src/distrib/sets/lists/tests/mi:1.1202 Sun May 8 06:51:27 2022 +++ src/distrib/sets/lists/tests/mi Sun May 8 10:20:49 2022 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1202 2022/05/08 06:51:27 rillig Exp $ +# $NetBSD: mi,v 1.1203 2022/05/08 10:20:49 rillig Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -6201,8 +6201,8 @@ ./usr/tests/usr.bin/make/unit-tests/varparse-mod.mktests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/make/unit-tests/varparse-undef-partial.exp tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/make/unit-tests/varparse-undef-partial.mk tests-usr.bin-tests compattestfile,atf -./usr/tests/usr.bin/make/unit-tests/varquote.exptests-usr.bin-tests compattestfile,atf -./usr/tests/usr.bin/make/unit-tests/varquote.mk tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/make/unit-tests/varquote.exptests-obsolete obsolete,atf +./usr/tests/usr.bin/make/unit-tests/varquote.mk tests-obsolete obsolete,atf ./usr/tests/usr.bin/make/unit-tests/varshell.exptests-obsolete obsolete ./usr/tests/usr.bin/make/unit-tests/varshell.mk tests-obsolete obsolete ./usr/tests/usr.bin/mixerctltests-usr.bin-tests compattestfile,atf Index: src/usr.bin/make/unit-tests/Makefile diff -u src/usr.bin/make/unit-tests/Makefile:1.314 src/usr.bin/make/unit-tests/Makefile:1.315 --- src/usr.bin/make/unit-tests/Makefile:1.314 Sun May 8 06:51:27 2022 +++ src/usr.bin/make/unit-tests/Makefile Sun May 8 10:20:49 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.314 2022/05/08 06:51:27 rillig Exp $ +# $NetBSD: Makefile,v 1.315 2022/05/08 10:20:49 rillig Exp $ # # Unit tests for make(1) # @@ -437,7 +437,6 @@ TESTS+= varparse-dynamic TESTS+= varparse-errors TESTS+= varparse-mod TESTS+= varparse-undef-partial -TESTS+= varquote # Some tests just do not work on some platforms or environments # so allow for some filtering.
CVS commit: src
Module Name:src Committed By: rillig Date: Sun May 8 10:20:50 UTC 2022 Modified Files: src/distrib/sets/lists/tests: mi src/usr.bin/make/unit-tests: Makefile Removed Files: src/usr.bin/make/unit-tests: varquote.exp varquote.mk Log Message: tests/make: remove test varquote The test varmod-quote-dollar covers the same topic. To generate a diff of this commit: cvs rdiff -u -r1.1202 -r1.1203 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.314 -r1.315 src/usr.bin/make/unit-tests/Makefile cvs rdiff -u -r1.2 -r0 src/usr.bin/make/unit-tests/varquote.exp cvs rdiff -u -r1.5 -r0 src/usr.bin/make/unit-tests/varquote.mk 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/unit-tests
Module Name:src
Committed By: rillig
Date: Sun May 8 10:14:41 UTC 2022
Modified Files:
src/usr.bin/make/unit-tests: varmod-quote-dollar.exp
varmod-quote-dollar.mk
Log Message:
tests/make: explain that assignments ignore leading spaces
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/varmod-quote-dollar.exp
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/varmod-quote-dollar.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/unit-tests/varmod-quote-dollar.exp
diff -u src/usr.bin/make/unit-tests/varmod-quote-dollar.exp:1.2 src/usr.bin/make/unit-tests/varmod-quote-dollar.exp:1.3
--- src/usr.bin/make/unit-tests/varmod-quote-dollar.exp:1.2 Sat Jan 22 17:10:51 2022
+++ src/usr.bin/make/unit-tests/varmod-quote-dollar.exp Sun May 8 10:14:40 2022
@@ -1,2 +1,4 @@
!"#$$%&'()*+,-./09:;<=>?@AZ[\]^_`az{|}~
+!"#$$%&'()*+,-./09:;<=>?@AZ[\]^_`az{|}~
+ !"#$$%&'()*+,-./09:;<=>?@AZ[\]^_`az{|}~
exit status 0
Index: src/usr.bin/make/unit-tests/varmod-quote-dollar.mk
diff -u src/usr.bin/make/unit-tests/varmod-quote-dollar.mk:1.3 src/usr.bin/make/unit-tests/varmod-quote-dollar.mk:1.4
--- src/usr.bin/make/unit-tests/varmod-quote-dollar.mk:1.3 Sat Jan 22 17:10:51 2022
+++ src/usr.bin/make/unit-tests/varmod-quote-dollar.mk Sun May 8 10:14:40 2022
@@ -1,10 +1,17 @@
-# $NetBSD: varmod-quote-dollar.mk,v 1.3 2022/01/22 17:10:51 rillig Exp $
+# $NetBSD: varmod-quote-dollar.mk,v 1.4 2022/05/08 10:14:40 rillig Exp $
#
# Tests for the :q variable modifier, which quotes the string for the shell
# and doubles dollar signs, to prevent them from being interpreted by a
# child process of make.
+# The newline and space characters at the beginning of this string are passed
+# to the child make. When the child make parses the variable assignment, it
+# discards the leading space characters.
ASCII_CHARS= ${.newline} !"\#$$%&'()*+,-./09:;<=>?@AZ[\]^_`az{|}~
all:
- @${MAKE} -r -f /dev/null CHARS=${ASCII_CHARS:q} -V CHARS
+ @${MAKE} -r -f /dev/null \
+ CHARS=${ASCII_CHARS:q} \
+ TWICE=${ASCII_CHARS:q}${ASCII_CHARS:q} \
+ -V CHARS \
+ -V TWICE
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Sun May 8 10:14:41 UTC 2022 Modified Files: src/usr.bin/make/unit-tests: varmod-quote-dollar.exp varmod-quote-dollar.mk Log Message: tests/make: explain that assignments ignore leading spaces To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/varmod-quote-dollar.exp cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/varmod-quote-dollar.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: nia Date: Sun May 8 09:09:58 UTC 2022 Modified Files: xsrc/external/mit/xdm/dist/config: Xsession.in xsrc/external/mit/xinit/dist: xinitrc.cpp Log Message: Make the xterm font size selection menu work in a reasonably expected way To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xdm/dist/config/Xsession.in cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/xinit/dist/xinitrc.cpp 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/xdm/dist/config/Xsession.in diff -u xsrc/external/mit/xdm/dist/config/Xsession.in:1.11 xsrc/external/mit/xdm/dist/config/Xsession.in:1.12 --- xsrc/external/mit/xdm/dist/config/Xsession.in:1.11 Sun May 8 08:17:06 2022 +++ xsrc/external/mit/xdm/dist/config/Xsession.in Sun May 8 09:09:58 2022 @@ -1,6 +1,6 @@ XCOMM!SHELL_CMD XCOMM -XHASH $NetBSD: Xsession.in,v 1.11 2022/05/08 08:17:06 nia Exp $ +XHASH $NetBSD: Xsession.in,v 1.12 2022/05/08 09:09:58 nia Exp $ XCOMM redirect errors to a file in user's home directory if we can @@ -79,7 +79,23 @@ else *VT100.background: black *VT100.allowBoldFonts: false *VT100.font:-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +*VT100.fontdefault: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* *VT100.utf8Fonts.font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +*VT100.utf8Fonts.fontdefault: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +*VT100.font1: -*-spleen-medium-r-*-*-6-*-*-*-*-*-*-* +*VT100.font2: -*-spleen-medium-r-*-*-8-*-*-*-*-*-*-* +*VT100.font3: -*-spleen-medium-r-*-*-12-*-*-*-*-*-*-* +*VT100.font4: -*-spleen-medium-r-*-*-16-*-*-*-*-*-*-* +*VT100.font5: -*-spleen-medium-r-*-*-24-*-*-*-*-*-*-* +*VT100.font6: -*-spleen-medium-r-*-*-32-*-*-*-*-*-*-* +*VT100.font7: -*-spleen-medium-r-*-*-64-*-*-*-*-*-*-* +*VT100.utf8Fonts.font1: -*-spleen-medium-r-*-*-6-*-*-*-*-*-*-* +*VT100.utf8Fonts.font2: -*-spleen-medium-r-*-*-8-*-*-*-*-*-*-* +*VT100.utf8Fonts.font3: -*-spleen-medium-r-*-*-12-*-*-*-*-*-*-* +*VT100.utf8Fonts.font4: -*-spleen-medium-r-*-*-16-*-*-*-*-*-*-* +*VT100.utf8Fonts.font5: -*-spleen-medium-r-*-*-24-*-*-*-*-*-*-* +*VT100.utf8Fonts.font6: -*-spleen-medium-r-*-*-32-*-*-*-*-*-*-* +*VT100.utf8Fonts.font7: -*-spleen-medium-r-*-*-64-*-*-*-*-*-*-* Bitmap*font:-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* Editres*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* Viewres*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* Index: xsrc/external/mit/xinit/dist/xinitrc.cpp diff -u xsrc/external/mit/xinit/dist/xinitrc.cpp:1.14 xsrc/external/mit/xinit/dist/xinitrc.cpp:1.15 --- xsrc/external/mit/xinit/dist/xinitrc.cpp:1.14 Sun May 8 08:17:06 2022 +++ xsrc/external/mit/xinit/dist/xinitrc.cpp Sun May 8 09:09:58 2022 @@ -1,5 +1,5 @@ XCOMM!SHELL_CMD -XHASH $NetBSD: xinitrc.cpp,v 1.14 2022/05/08 08:17:06 nia Exp $ +XHASH $NetBSD: xinitrc.cpp,v 1.15 2022/05/08 09:09:58 nia Exp $ userresources=$HOME/.Xresources usermodmap=$HOME/.Xmodmap @@ -48,7 +48,25 @@ XHASH endif *VT100.background: black *VT100.allowBoldFonts: false *VT100.font:-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +*VT100.fontdefault: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* *VT100.utf8Fonts.font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +*VT100.utf8Fonts.fontdefault: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +*VT100.font1: -*-spleen-medium-r-*-*-6-*-*-*-*-*-*-* +*VT100.font2: -*-spleen-medium-r-*-*-8-*-*-*-*-*-*-* +*VT100.font3: -*-spleen-medium-r-*-*-12-*-*-*-*-*-*-* +*VT100.font4: -*-spleen-medium-r-*-*-16-*-*-*-*-*-*-* +*VT100.font5: -*-spleen-medium-r-*-*-24-*-*-*-*-*-*-* +*VT100.font6: -*-spleen-medium-r-*-*-32-*-*-*-*-*-*-* +*VT100.font7: -*-spleen-medium-r-*-*-64-*-*-*-*-*-*-* +*VT100.utf8Fonts.font1: -*-spleen-medium-r-*-*-6-*-*-*-*-*-*-* +*VT100.utf8Fonts.font2: -*-spleen-medium-r-*-*-8-*-*-*-*-*-*-* +*VT100.utf8Fonts.font3: -*-spleen-medium-r-*-*-12-*-*-*-*-*-*-* +*VT100.utf8Fonts.font4: -*-spleen-medium-r-*-*-16-*-*-*-*-*-*-* +*VT100.utf8Fonts.font5: -*-spleen-medium-r-*-*-24-*-*-*-*-*-*-* +*VT100.utf8Fonts.font6: -*-spleen-medium-r-*-*-32-*-*-*-*-*-*-* +*VT100.utf8Fonts.font7: -*-spleen-medium-r-*-*-64-*-*-*-*-*-*-* +*SimpleMenu*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +*SimpleMenu*menuLabel.font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* Bitmap*font:-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* Editres*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* Viewres*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: nia Date: Sun May 8 09:09:58 UTC 2022 Modified Files: xsrc/external/mit/xdm/dist/config: Xsession.in xsrc/external/mit/xinit/dist: xinitrc.cpp Log Message: Make the xterm font size selection menu work in a reasonably expected way To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xdm/dist/config/Xsession.in cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/xinit/dist/xinitrc.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/ctwm/etc
Module Name:src
Committed By: nia
Date: Sun May 8 08:20:16 UTC 2022
Modified Files:
src/external/mit/ctwm/etc: system.ctwmrc
Log Message:
ctwmrc: make menus more fun, accomodate clock being spawned on startup
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/mit/ctwm/etc/system.ctwmrc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/ctwm/etc/system.ctwmrc
diff -u src/external/mit/ctwm/etc/system.ctwmrc:1.14 src/external/mit/ctwm/etc/system.ctwmrc:1.15
--- src/external/mit/ctwm/etc/system.ctwmrc:1.14 Thu Dec 9 07:33:24 2021
+++ src/external/mit/ctwm/etc/system.ctwmrc Sun May 8 08:20:16 2022
@@ -1,5 +1,5 @@
#
-# $NetBSD: system.ctwmrc,v 1.14 2021/12/09 07:33:24 nia Exp $
+# $NetBSD: system.ctwmrc,v 1.15 2022/05/08 08:20:16 nia Exp $
#
# ctwmrc by nia
#
@@ -260,16 +260,50 @@ Monochrome
MapWindowBackground "white"
}
+menu "deskutils"
+{
+"Desktop utilities" f.title
+" Calculator" !"xcalc &"
+" Clipboard" !"xclipboard &"
+" Text editor" !"xedit &"
+""f.separator
+" XEyes" !"xeyes &"
+" OpenGL Gears" !"glxgears &"
+" Icosahedron" !"ico -sleep 0.016 &"
+""f.separator
+" Compositor (shadows)" !"pkill xcompmgr; xcompmgr -c &"
+" Compositor (simple)" !"pkill xcompmgr; xcompmgr -n &"
+""f.separator
+" Magnify" !"xmag -source 100x100 &"
+" Kill window" !"xkill &"
+}
+
+menu "termutils"
+{
+"Terminal utilities" f.title
+""f.separator
+" VIsual Editor" !"xterm -class UXTerm -e vi &"
+" Tetris" !"xterm -class UXTerm -e tetris &"
+""f.separator
+" Audio mixer" !"xterm -class UXTerm -e aiomixer &"
+" System setup" !"xterm -class UXTerm -e sysinst &"
+""f.separator
+" Top processes" !"xterm -class UXTerm -e top &"
+" I/O stats" !"xterm -class UXTerm -e 'sysstat iostat' &"
+" Network stats" !"xterm -class UXTerm -e 'sysstat ifstat' &"
+" Disk usage" !"xterm -class UXTerm -e 'sysstat df' &"
+}
+
menu "NetBSD"
{
"NetBSD" f.title
""f.separator
" Terminal" !"uxterm &"
-" Calculator" !"xcalc &"
-" Clock" !"xclock -digital &"
-" XEyes" !"xeyes &"
+" Manual pages" !"LC_ALL=C xman -notopbox &"
""f.separator
" Applications" f.menu "appmenu"
+" Desktop utilities" f.menu "deskutils"
+" Terminal utilities" f.menu "termutils"
""f.separator
" Restart CTWM" f.twmrc
" Quit" f.quit
@@ -313,7 +347,6 @@ OccupyAll
AlwaysOnTop
{
- "xclock"
"XEyes"
"XVidCap"
}
@@ -322,6 +355,7 @@ NoTitle
{
"TWM Icon Manager"
"WorkSpaceManager"
+ "XClock"
}
WindowRingExclude
@@ -339,7 +373,6 @@ StartIconified
NoBorder
{
- "TWM Icon Manager"
}
Function "raise-move" { f.raise f.deltastop f.forcemove }
CVS commit: src/external/mit/ctwm/etc
Module Name:src Committed By: nia Date: Sun May 8 08:20:16 UTC 2022 Modified Files: src/external/mit/ctwm/etc: system.ctwmrc Log Message: ctwmrc: make menus more fun, accomodate clock being spawned on startup To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/external/mit/ctwm/etc/system.ctwmrc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: nia Date: Sun May 8 08:17:06 UTC 2022 Modified Files: xsrc/external/mit/xdm/dist/config: Xsession.in xsrc/external/mit/xinit/dist: xinitrc.cpp Log Message: want more default xorg font resource definitions, and a clock on ctwm startup To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xdm/dist/config/Xsession.in cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/xinit/dist/xinitrc.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: nia Date: Sun May 8 08:17:06 UTC 2022 Modified Files: xsrc/external/mit/xdm/dist/config: Xsession.in xsrc/external/mit/xinit/dist: xinitrc.cpp Log Message: want more default xorg font resource definitions, and a clock on ctwm startup To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xdm/dist/config/Xsession.in cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/xinit/dist/xinitrc.cpp 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/xdm/dist/config/Xsession.in diff -u xsrc/external/mit/xdm/dist/config/Xsession.in:1.10 xsrc/external/mit/xdm/dist/config/Xsession.in:1.11 --- xsrc/external/mit/xdm/dist/config/Xsession.in:1.10 Sat Dec 25 11:37:25 2021 +++ xsrc/external/mit/xdm/dist/config/Xsession.in Sun May 8 08:17:06 2022 @@ -1,5 +1,6 @@ XCOMM!SHELL_CMD XCOMM +XHASH $NetBSD: Xsession.in,v 1.11 2022/05/08 08:17:06 nia Exp $ XCOMM redirect errors to a file in user's home directory if we can @@ -93,10 +94,17 @@ Xgc*font: -*-spleen-medium-r-*-*-$ Xmag*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* Xmessage*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* Xmh*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +Xman*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +Xman*manualFontNormal: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +Xman*manualFontBold: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +Xman*manualFontItalic: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +Xman*directoryFontNormal: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* EOF fi BINDIR/xsetroot -cursor_name left_ptr BINDIR/xsetroot -solid 'rgb:00/22/44' BINDIR/uxterm & + BINDIR/xclock -digital -strftime '%a %Y-%m-%d %H:%M' \ + -face "spleen:pixelsize=$fontsize" -g +0+0 & exec BINDIR/ctwm -W fi Index: xsrc/external/mit/xinit/dist/xinitrc.cpp diff -u xsrc/external/mit/xinit/dist/xinitrc.cpp:1.13 xsrc/external/mit/xinit/dist/xinitrc.cpp:1.14 --- xsrc/external/mit/xinit/dist/xinitrc.cpp:1.13 Wed Dec 29 16:01:58 2021 +++ xsrc/external/mit/xinit/dist/xinitrc.cpp Sun May 8 08:17:06 2022 @@ -1,4 +1,5 @@ XCOMM!SHELL_CMD +XHASH $NetBSD: xinitrc.cpp,v 1.14 2022/05/08 08:17:06 nia Exp $ userresources=$HOME/.Xresources usermodmap=$HOME/.Xmodmap @@ -62,6 +63,11 @@ Xgc*font: -*-spleen-medium-r-*-*-$ Xmag*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* Xmessage*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* Xmh*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +Xman*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +Xman*manualFontNormal: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +Xman*manualFontBold: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +Xman*manualFontItalic: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +Xman*directoryFontNormal: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* EOF fi @@ -80,5 +86,7 @@ fi XSETROOT -cursor_name left_ptr XSETROOT -solid 'rgb:00/22/44' +XCLOCK -digital -strftime '%a %Y-%m-%d %H:%M' \ + -face "spleen:pixelsize=$fontsize" -g +0+0 & UXTERM & exec CTWM -W
CVS commit: src/distrib/amd64
Module Name:src Committed By: mrg Date: Sun May 8 08:12:45 UTC 2022 Modified Files: src/distrib/amd64/installimage: Makefile src/distrib/amd64/installimage-bios: Makefile Added Files: src/distrib/amd64/installimage: installimage.mk Log Message: fix building amd64 with USE_XZ_SETS=no. bump the size of images if USE_XZ_SETS != no. consolidate a lot of the code between installimage/Makefile and installimage-bios/Makefile into installimage/installimage.mk. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/distrib/amd64/installimage/Makefile cvs rdiff -u -r0 -r1.1 src/distrib/amd64/installimage/installimage.mk cvs rdiff -u -r1.5 -r1.6 src/distrib/amd64/installimage-bios/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/amd64
Module Name:src
Committed By: mrg
Date: Sun May 8 08:12:45 UTC 2022
Modified Files:
src/distrib/amd64/installimage: Makefile
src/distrib/amd64/installimage-bios: Makefile
Added Files:
src/distrib/amd64/installimage: installimage.mk
Log Message:
fix building amd64 with USE_XZ_SETS=no.
bump the size of images if USE_XZ_SETS != no. consolidate a lot of
the code between installimage/Makefile and installimage-bios/Makefile
into installimage/installimage.mk.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/amd64/installimage/installimage.mk
cvs rdiff -u -r1.5 -r1.6 src/distrib/amd64/installimage-bios/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/installimage/Makefile
diff -u src/distrib/amd64/installimage/Makefile:1.21 src/distrib/amd64/installimage/Makefile:1.22
--- src/distrib/amd64/installimage/Makefile:1.21 Mon Jan 3 12:10:17 2022
+++ src/distrib/amd64/installimage/Makefile Sun May 8 08:12:45 2022
@@ -1,14 +1,11 @@
-# $NetBSD: Makefile,v 1.21 2022/01/03 12:10:17 martin Exp $
+# $NetBSD: Makefile,v 1.22 2022/05/08 08:12:45 mrg Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-install # gives ${IMGBASE}.img
-INSTIMAGEMB?= 2250 # for all installation binaries
+.include "installimage.mk"
-PRIMARY_BOOT= bootxx_ffsv1
-SECONDARY_BOOT= boot
-SECONDARY_BOOT_ARG= # unnecessary
EFIBOOT= ${WORKDIR}/usr/mdec/bootx64.efi
EFIBOOT+= ${WORKDIR}/usr/mdec/bootia32.efi
#EFIBOOT= ${.OBJDIR}/../../../sys/arch/i386/stand/efiboot/bootx64/bootx64.efi
@@ -17,22 +14,3 @@ EFIBOOT+= ${WORKDIR}/usr/mdec/bootia32.
USE_MBR= yes
USE_GPT= yes
USE_GPTMBR= yes
-
-CLEANFILES+= boot.cfg
-
-prepare_md_post:
- ${TOOL_SED} \
- -e "s/@@MACHINE@@/${MACHINE}/"\
- -e "s/@@VERSION@@/${DISTRIBVER}/"\
- < ${.CURDIR}/boot.cfg.in > boot.cfg
-
-DISTRIBDIR!= cd ${.CURDIR}/../.. ; pwd
-
-SPEC_EXTRA= ${.CURDIR}/spec.inst
-IMGFILE_EXTRA=\
- ${.CURDIR}/etc.ttys etc/ttys \
- ${.CURDIR}/etc.rc etc/rc\
- ${.CURDIR}/install.sh .\
- ${.OBJDIR}/boot.cfg .
-
-.include "${NETBSDSRCDIR}/distrib/common/bootimage//Makefile.installimage"
Index: src/distrib/amd64/installimage-bios/Makefile
diff -u src/distrib/amd64/installimage-bios/Makefile:1.5 src/distrib/amd64/installimage-bios/Makefile:1.6
--- src/distrib/amd64/installimage-bios/Makefile:1.5 Mon Jan 3 12:10:17 2022
+++ src/distrib/amd64/installimage-bios/Makefile Sun May 8 08:12:45 2022
@@ -1,32 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2022/01/03 12:10:17 martin Exp $
+# $NetBSD: Makefile,v 1.6 2022/05/08 08:12:45 mrg Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-bios-install # gives ${IMGBASE}.img
-INSTIMAGEMB?= 2250 # for all installation binaries
-
-PRIMARY_BOOT= bootxx_ffsv1
-SECONDARY_BOOT= boot
-SECONDARY_BOOT_ARG= # unnecessary
+.include "../installimage/installimage.mk"
USE_MBR= yes
-
-CLEANFILES+= boot.cfg
-
-prepare_md_post:
- ${TOOL_SED} \
- -e "s/@@MACHINE@@/${MACHINE}/"\
- -e "s/@@VERSION@@/${DISTRIBVER}/"\
- < ${.CURDIR}/boot.cfg.in > boot.cfg
-
-DISTRIBDIR!= cd ${.CURDIR}/../.. ; pwd
-
-SPEC_EXTRA= ${.CURDIR}/spec.inst
-IMGFILE_EXTRA=\
- ${.CURDIR}/etc.ttys etc/ttys \
- ${.CURDIR}/etc.rc etc/rc\
- ${.CURDIR}/install.sh .\
- ${.OBJDIR}/boot.cfg .
-
-.include "${NETBSDSRCDIR}/distrib/common/bootimage//Makefile.installimage"
Added files:
Index: src/distrib/amd64/installimage/installimage.mk
diff -u /dev/null src/distrib/amd64/installimage/installimage.mk:1.1
--- /dev/null Sun May 8 08:12:45 2022
+++ src/distrib/amd64/installimage/installimage.mk Sun May 8 08:12:45 2022
@@ -0,0 +1,33 @@
+# $NetBSD: installimage.mk,v 1.1 2022/05/08 08:12:45 mrg Exp $
+
+# common code between distrib/amd64/installimage/Makefile and
+# distrib/amd64/installimage-bios/Makefile.
+
+.if ${USE_XZ_SETS:Uno} != "no"
+INSTIMAGEMB?= 2250 # for all installation binaries
+.else
+INSTIMAGEMB?= 3500 # for all installation binaries
+.endif
+
+PRIMARY_BOOT= bootxx_ffsv1
+SECONDARY_BOOT= boot
+SECONDARY_BOOT_ARG= # unnecessary
+
+CLEANFILES+= boot.cfg
+
+prepare_md_post:
+ ${TOOL_SED} \
+ -e "s/@@MACHINE@@/${MACHINE}/"\
+ -e "s/@@VERSION@@/${DISTRIBVER}/"\
+ < ${.CURDIR}/boot.cfg.in > boot.cfg
+
+DISTRIBDIR!= cd ${.CURDIR}/../.. ; pwd
+
+SPEC_EXTRA= ${.CURDIR}/spec.inst
+IMGFILE_EXTRA=\
+ ${.CURDIR}/etc.ttys etc/ttys \
+ ${.CURDIR}/etc.rc etc/rc\
+ ${.CURDIR}/install.sh .\
+ ${.OBJDIR}/boot.cfg .
+
+.include "${NETBSDSRCDIR}/distrib/common/bootimage/Makefile.installimage"
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Sun May 8 07:27:50 UTC 2022
Modified Files:
src/usr.bin/make/unit-tests: hanoi-include.mk opt-version.mk
opt-x-reduce-exported.exp opt-x-reduce-exported.mk
Log Message:
tests/make: add test for option '-X', clean up comments
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/hanoi-include.mk \
src/usr.bin/make/unit-tests/opt-x-reduce-exported.mk
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/opt-version.mk \
src/usr.bin/make/unit-tests/opt-x-reduce-exported.exp
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/unit-tests/hanoi-include.mk
diff -u src/usr.bin/make/unit-tests/hanoi-include.mk:1.2 src/usr.bin/make/unit-tests/hanoi-include.mk:1.3
--- src/usr.bin/make/unit-tests/hanoi-include.mk:1.2 Sat Jan 8 22:13:43 2022
+++ src/usr.bin/make/unit-tests/hanoi-include.mk Sun May 8 07:27:50 2022
@@ -1,19 +1,20 @@
-# $NetBSD: hanoi-include.mk,v 1.2 2022/01/08 22:13:43 rillig Exp $
+# $NetBSD: hanoi-include.mk,v 1.3 2022/05/08 07:27:50 rillig Exp $
#
-# Implements the Towers of Hanoi puzzle, thereby demonstrating a bunch of
-# more or less useful programming techniques:
+# Implements the Towers of Hanoi puzzle, demonstrating a bunch of more or less
+# useful programming techniques:
#
-# * default assignment using the ?= assignment operator
-# * including the same file recursively (rather unusual)
-# * extracting the current value of a variable using the .for loop
-# * using shell commands for calculations since make is a text processor
-# * using the :: dependency operator for adding commands to a target
-# * on-the-fly variable assignment expressions using the ::= modifier
+# * default assignment using the ?= assignment operator
+# * including the same file recursively (rather unusual)
+# * extracting the current value of a variable using the .for loop
+# * using shell commands for calculations since make is a text processor
+# * using the :: dependency operator for adding commands to a target
+# * on-the-fly variable assignment expressions using the ::= modifier
#
# usage:
-# env N=3 make -f hanoi-include.mk
-# endless loop:
-# make -f hanoi-include.mk N=3
+# env N=3 make -r -f hanoi-include.mk
+#
+# endless loop, since command line variables cannot be overridden:
+# make -r -f hanoi-include.mk N=3
N?= 5 # Move this number of disks ...
FROM?= A # ... from this stack ...
Index: src/usr.bin/make/unit-tests/opt-x-reduce-exported.mk
diff -u src/usr.bin/make/unit-tests/opt-x-reduce-exported.mk:1.2 src/usr.bin/make/unit-tests/opt-x-reduce-exported.mk:1.3
--- src/usr.bin/make/unit-tests/opt-x-reduce-exported.mk:1.2 Sun Aug 16 14:25:16 2020
+++ src/usr.bin/make/unit-tests/opt-x-reduce-exported.mk Sun May 8 07:27:50 2022
@@ -1,8 +1,20 @@
-# $NetBSD: opt-x-reduce-exported.mk,v 1.2 2020/08/16 14:25:16 rillig Exp $
+# $NetBSD: opt-x-reduce-exported.mk,v 1.3 2022/05/08 07:27:50 rillig Exp $
#
-# Tests for the -x command line option.
+# Tests for the -X command line option, which prevents variables passed on the
+# command line from being exported to the environment of child commands.
-# TODO: Implementation
+# The variable 'BEFORE' is exported, the variable 'AFTER' isn't.
+.MAKEFLAGS: BEFORE=before -X AFTER=after
-all:
- @:;
+all: .PHONY ordinary submake
+
+ordinary: .PHONY
+ @echo 'ordinary:'
+ @env | sort | grep -e '^BEFORE' -e '^AFTER'
+
+submake: .PHONY
+ @echo 'submake:'
+ @${MAKE} -r -f ${MAKEFILE} show-env
+
+show-env: .PHONY
+ @env | sort | grep -e '^BEFORE' -e '^AFTER'
Index: src/usr.bin/make/unit-tests/opt-version.mk
diff -u src/usr.bin/make/unit-tests/opt-version.mk:1.1 src/usr.bin/make/unit-tests/opt-version.mk:1.2
--- src/usr.bin/make/unit-tests/opt-version.mk:1.1 Thu Dec 23 11:05:59 2021
+++ src/usr.bin/make/unit-tests/opt-version.mk Sun May 8 07:27:50 2022
@@ -1,8 +1,8 @@
-# $NetBSD: opt-version.mk,v 1.1 2021/12/23 11:05:59 rillig Exp $
+# $NetBSD: opt-version.mk,v 1.2 2022/05/08 07:27:50 rillig Exp $
#
-# Tests for the command line option '--version', which outputs the version
-# number of make. NetBSD's make does not have a version number, but the bmake
-# distribution created from it has.
+# Tests for the command line option '--version', which may be expected to
+# output the version number of make. NetBSD's make does not have a version
+# number, but the bmake distribution created from it has.
# As of 2021-12-23, the output is a single empty line since the '--' does not
# end the command line options. Command line parsing then continues as if
Index: src/usr.bin/make/unit-tests/opt-x-reduce-exported.exp
diff -u src/usr.bin/make/unit-tests/opt-x-reduce-exported.exp:1.1 src/usr.bin/make/unit-tests/opt-x-reduce-exported.exp:1.2
--- src/usr.bin/make/unit-tests/opt-x-reduce-exported.exp:1.1 Sun Aug 16 12:07:51 2020
+++
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Sun May 8 07:27:50 UTC 2022 Modified Files: src/usr.bin/make/unit-tests: hanoi-include.mk opt-version.mk opt-x-reduce-exported.exp opt-x-reduce-exported.mk Log Message: tests/make: add test for option '-X', clean up comments To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/hanoi-include.mk \ src/usr.bin/make/unit-tests/opt-x-reduce-exported.mk cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/opt-version.mk \ src/usr.bin/make/unit-tests/opt-x-reduce-exported.exp 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/unit-tests
Module Name:src
Committed By: rillig
Date: Sun May 8 06:57:00 UTC 2022
Modified Files:
src/usr.bin/make/unit-tests: cond-token-string.exp cond-token-string.mk
Log Message:
tests/make: fix typo in variable name
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/cond-token-string.exp
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/cond-token-string.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/unit-tests/cond-token-string.exp
diff -u src/usr.bin/make/unit-tests/cond-token-string.exp:1.8 src/usr.bin/make/unit-tests/cond-token-string.exp:1.9
--- src/usr.bin/make/unit-tests/cond-token-string.exp:1.8 Sun May 8 06:51:27 2022
+++ src/usr.bin/make/unit-tests/cond-token-string.exp Sun May 8 06:57:00 2022
@@ -13,8 +13,7 @@ CondParser_Eval: "${:Uvalue}"
make: "cond-token-string.mk" line 68: A nonempty variable expression evaluates to true.
CondParser_Eval: "${:U}"
make: "cond-token-string.mk" line 76: An empty variable evaluates to false.
-CondParser_Eval: ("${VALUE}")
-make: "cond-token-string.mk" line 84: Missing argument for ".error"
+CondParser_Eval: ("${VAR}")
CondParser_Eval: "quoted" == quoted
Comparing "quoted" == "quoted"
make: Fatal errors encountered -- cannot continue
Index: src/usr.bin/make/unit-tests/cond-token-string.mk
diff -u src/usr.bin/make/unit-tests/cond-token-string.mk:1.5 src/usr.bin/make/unit-tests/cond-token-string.mk:1.6
--- src/usr.bin/make/unit-tests/cond-token-string.mk:1.5 Sun May 8 06:51:27 2022
+++ src/usr.bin/make/unit-tests/cond-token-string.mk Sun May 8 06:57:00 2022
@@ -1,4 +1,4 @@
-# $NetBSD: cond-token-string.mk,v 1.5 2022/05/08 06:51:27 rillig Exp $
+# $NetBSD: cond-token-string.mk,v 1.6 2022/05/08 06:57:00 rillig Exp $
#
# Tests for quoted string literals in .if conditions.
#
@@ -77,9 +77,11 @@
.endif
# A non-empty string evaluates to true, no matter if it's a literal string or
-# if it contains variable expressions.
+# if it contains variable expressions. The parentheses are not necessary for
+# the parser, in this case their only purpose is to make the code harder to
+# read for humans.
VAR= value
-.if ("${VALUE}")
+.if ("${VAR}")
.else
. error
.endif
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Sun May 8 06:57:00 UTC 2022 Modified Files: src/usr.bin/make/unit-tests: cond-token-string.exp cond-token-string.mk Log Message: tests/make: fix typo in variable name To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/cond-token-string.exp cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/cond-token-string.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: rillig Date: Sun May 8 06:51:27 UTC 2022 Modified Files: src/distrib/sets/lists/tests: mi src/usr.bin/make/unit-tests: Makefile comment.mk compat-error.mk cond-cmp-string.mk cond-func-defined.mk cond-token-string.exp cond-token-string.mk directive-for-lines.mk directive-for-null.mk directive-info.mk opt-jobs-no-action.mk varmod-ifelse.mk varmod-match.mk Removed Files: src/usr.bin/make/unit-tests: cond1.exp cond1.mk Log Message: tests/make: migrate cond1 test to other, more specific tests The tests in cond1 were a mixture of "everything related to conditions", and the test cases were heavily dependent on each other, which made them hard to understand. Move each test case to its corresponding special-purpose test. To generate a diff of this commit: cvs rdiff -u -r1.1201 -r1.1202 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.313 -r1.314 src/usr.bin/make/unit-tests/Makefile cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/comment.mk \ src/usr.bin/make/unit-tests/compat-error.mk \ src/usr.bin/make/unit-tests/cond-token-string.mk cvs rdiff -u -r1.15 -r1.16 src/usr.bin/make/unit-tests/cond-cmp-string.mk cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/cond-func-defined.mk \ src/usr.bin/make/unit-tests/varmod-match.mk cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/cond-token-string.exp cvs rdiff -u -r1.5 -r0 src/usr.bin/make/unit-tests/cond1.exp cvs rdiff -u -r1.3 -r0 src/usr.bin/make/unit-tests/cond1.mk cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/directive-for-lines.mk cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/directive-for-null.mk cvs rdiff -u -r1.9 -r1.10 src/usr.bin/make/unit-tests/directive-info.mk \ src/usr.bin/make/unit-tests/opt-jobs-no-action.mk cvs rdiff -u -r1.18 -r1.19 src/usr.bin/make/unit-tests/varmod-ifelse.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: rillig
Date: Sun May 8 06:51:27 UTC 2022
Modified Files:
src/distrib/sets/lists/tests: mi
src/usr.bin/make/unit-tests: Makefile comment.mk compat-error.mk
cond-cmp-string.mk cond-func-defined.mk cond-token-string.exp
cond-token-string.mk directive-for-lines.mk directive-for-null.mk
directive-info.mk opt-jobs-no-action.mk varmod-ifelse.mk
varmod-match.mk
Removed Files:
src/usr.bin/make/unit-tests: cond1.exp cond1.mk
Log Message:
tests/make: migrate cond1 test to other, more specific tests
The tests in cond1 were a mixture of "everything related to conditions",
and the test cases were heavily dependent on each other, which made them
hard to understand. Move each test case to its corresponding
special-purpose test.
To generate a diff of this commit:
cvs rdiff -u -r1.1201 -r1.1202 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.313 -r1.314 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/comment.mk \
src/usr.bin/make/unit-tests/compat-error.mk \
src/usr.bin/make/unit-tests/cond-token-string.mk
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/make/unit-tests/cond-cmp-string.mk
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/cond-func-defined.mk \
src/usr.bin/make/unit-tests/varmod-match.mk
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/cond-token-string.exp
cvs rdiff -u -r1.5 -r0 src/usr.bin/make/unit-tests/cond1.exp
cvs rdiff -u -r1.3 -r0 src/usr.bin/make/unit-tests/cond1.mk
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/directive-for-lines.mk
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/directive-for-null.mk
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/make/unit-tests/directive-info.mk \
src/usr.bin/make/unit-tests/opt-jobs-no-action.mk
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/make/unit-tests/varmod-ifelse.mk
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/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1201 src/distrib/sets/lists/tests/mi:1.1202
--- src/distrib/sets/lists/tests/mi:1.1201 Fri Apr 29 22:17:50 2022
+++ src/distrib/sets/lists/tests/mi Sun May 8 06:51:27 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1201 2022/04/29 22:17:50 pgoyette Exp $
+# $NetBSD: mi,v 1.1202 2022/05/08 06:51:27 rillig Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5459,8 +5459,8 @@
./usr/tests/usr.bin/make/unit-tests/cond-token-var.mktests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/cond-undef-lint.exptests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/cond-undef-lint.mktests-usr.bin-tests compattestfile,atf
-./usr/tests/usr.bin/make/unit-tests/cond1.exp tests-usr.bin-tests compattestfile,atf
-./usr/tests/usr.bin/make/unit-tests/cond1.mk tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/cond1.exp tests-obsolete obsolete,atf
+./usr/tests/usr.bin/make/unit-tests/cond1.mk tests-obsolete obsolete,atf
./usr/tests/usr.bin/make/unit-tests/cond2.exp obsolete-tests obsolete
./usr/tests/usr.bin/make/unit-tests/cond2.mk obsolete-tests obsolete
./usr/tests/usr.bin/make/unit-tests/counter-append.exptests-usr.bin-tests compattestfile,atf
Index: src/usr.bin/make/unit-tests/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.313 src/usr.bin/make/unit-tests/Makefile:1.314
--- src/usr.bin/make/unit-tests/Makefile:1.313 Sat May 7 17:49:47 2022
+++ src/usr.bin/make/unit-tests/Makefile Sun May 8 06:51:27 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.313 2022/05/07 17:49:47 rillig Exp $
+# $NetBSD: Makefile,v 1.314 2022/05/08 06:51:27 rillig Exp $
#
# Unit tests for make(1)
#
@@ -84,7 +84,6 @@ TESTS+= cond-token-plain
TESTS+= cond-token-string
TESTS+= cond-token-var
TESTS+= cond-undef-lint
-TESTS+= cond1
TESTS+= counter
TESTS+= counter-append
TESTS+= dep
Index: src/usr.bin/make/unit-tests/comment.mk
diff -u src/usr.bin/make/unit-tests/comment.mk:1.4 src/usr.bin/make/unit-tests/comment.mk:1.5
--- src/usr.bin/make/unit-tests/comment.mk:1.4 Sun Jan 23 18:00:53 2022
+++ src/usr.bin/make/unit-tests/comment.mk Sun May 8 06:51:27 2022
@@ -1,4 +1,4 @@
-# $NetBSD: comment.mk,v 1.4 2022/01/23 18:00:53 rillig Exp $
+# $NetBSD: comment.mk,v 1.5 2022/05/08 06:51:27 rillig Exp $
#
# Demonstrate how comments are written in makefiles.
@@ -23,7 +23,7 @@ on and on.
.endif # And after the closing directive.
VAR= # This comment makes the variable value empty.
- # ParseGetLine removes any whitespace before the
+ # ParseRawLine removes any whitespace before the
# comment.
.if ${VAR} != ""
. error
Index: src/usr.bin/make/unit-tests/compat-error.mk
diff -u src/usr.bin/make/unit-tests/compat-error.mk:1.4 src/usr.bin/make/unit-tests/compat-error.mk:1.5
---
CVS commit: src/sys/dev/spi
Module Name:src
Committed By: skrll
Date: Sun May 8 06:38:59 UTC 2022
Modified Files:
src/sys/dev/spi: spi.c spiflash.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/spi/spi.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/spi/spiflash.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/spi/spi.c
diff -u src/sys/dev/spi/spi.c:1.24 src/sys/dev/spi/spi.c:1.25
--- src/sys/dev/spi/spi.c:1.24 Mon Mar 28 11:09:24 2022
+++ src/sys/dev/spi/spi.c Sun May 8 06:38:58 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: spi.c,v 1.24 2022/03/28 11:09:24 mlelstv Exp $ */
+/* $NetBSD: spi.c,v 1.25 2022/05/08 06:38:58 skrll Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: spi.c,v 1.24 2022/03/28 11:09:24 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spi.c,v 1.25 2022/05/08 06:38:58 skrll Exp $");
#include "locators.h"
@@ -544,7 +544,7 @@ spi_transfer(struct spi_handle *sh, stru
spi_acquire(sh);
st->st_spiprivate = (void *)sh;
-
+
/*
* Reconfigure controller
*
Index: src/sys/dev/spi/spiflash.c
diff -u src/sys/dev/spi/spiflash.c:1.25 src/sys/dev/spi/spiflash.c:1.26
--- src/sys/dev/spi/spiflash.c:1.25 Sat Aug 7 16:19:16 2021
+++ src/sys/dev/spi/spiflash.c Sun May 8 06:38:58 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: spiflash.c,v 1.25 2021/08/07 16:19:16 thorpej Exp $ */
+/* $NetBSD: spiflash.c,v 1.26 2022/05/08 06:38:58 skrll Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: spiflash.c,v 1.25 2021/08/07 16:19:16 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spiflash.c,v 1.26 2022/05/08 06:38:58 skrll Exp $");
#include
#include
@@ -384,7 +384,7 @@ spiflash_process_read(spiflash_handle_t
bufq_move(sc->sc_doneq, sc->sc_workq);
break;
}
-
+
bp->b_resid -= cnt;
data += cnt;
addr += cnt;
@@ -422,7 +422,7 @@ spiflash_process_write(spiflash_handle_t
/* read in as much of the data as we need */
DPRINTF(("reading in %d bytes\n", len));
if ((err = sc->sc_read(sc, base, len, save)) != 0) {
- bufq_move(sc->sc_doneq, sc->sc_workq);
+ bufq_move(sc->sc_doneq, sc->sc_workq);
spiflash_process_done(sc, err);
return;
}
@@ -455,7 +455,7 @@ spiflash_process_write(spiflash_handle_t
bufq_put(sc->sc_doneq, bp);
}
-
+
/*
* do the erase, if we need to.
*/
@@ -578,7 +578,7 @@ spiflash_common_erase(spiflash_handle_t
if ((start % sc->sc_erase_size) || (size % sc->sc_erase_size))
return EINVAL;
- /* the second test is to test against wrap */
+ /* the second test is to test against wrap */
if ((start > sc->sc_device_size) ||
((start + size) > sc->sc_device_size))
return EINVAL;
@@ -674,7 +674,7 @@ spiflash_common_read(spiflash_handle_t s
if (sc->sc_read_size > 0)
cnt = uimin(size, sc->sc_read_size);
- else
+ else
cnt = size;
if ((rv = spiflash_cmd(sc, SPIFLASH_CMD_READ, 3, start,
CVS commit: src/sys/dev/spi
Module Name:src Committed By: skrll Date: Sun May 8 06:38:59 UTC 2022 Modified Files: src/sys/dev/spi: spi.c spiflash.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/dev/spi/spi.c cvs rdiff -u -r1.25 -r1.26 src/sys/dev/spi/spiflash.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
