CVS commit: src/distrib/emips/ramdisk

2024-05-22 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Wed May 22 16:24:41 UTC 2024

Modified Files:
src/distrib/emips/ramdisk: list

Log Message:
Also remove installboot(8) from emips install ramdisk.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/emips/ramdisk/list

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/emips/ramdisk/list
diff -u src/distrib/emips/ramdisk/list:1.4 src/distrib/emips/ramdisk/list:1.5
--- src/distrib/emips/ramdisk/list:1.4	Sun Jun 19 02:40:38 2011
+++ src/distrib/emips/ramdisk/list	Wed May 22 16:24:40 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.4 2011/06/19 02:40:38 tsutsui Exp $
+#	$NetBSD: list,v 1.5 2024/05/22 16:24:40 tsutsui Exp $
 
 SRCDIRS	bin sbin usr.bin usr.sbin sys/arch/emips/stand
 
@@ -47,8 +47,6 @@ PROG	usr/bin/sed
 PROG	usr/bin/tip
 PROG	usr/bin/tset
 
-PROG	usr/sbin/installboot
-
 PROG	usr/sbin/chown	usr/bin/chgrp
 PROG	usr/sbin/chroot
 



CVS commit: src/distrib/emips/ramdisk

2024-05-22 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Wed May 22 16:24:41 UTC 2024

Modified Files:
src/distrib/emips/ramdisk: list

Log Message:
Also remove installboot(8) from emips install ramdisk.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/emips/ramdisk/list

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/cdrom/macppc_installboot

2024-05-19 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sun May 19 15:52:34 UTC 2024

Modified Files:
src/distrib/cdrom/macppc_installboot: cd9660.c installboot.c

Log Message:
Use native cd9660 blocksize to specify block numbers in cd9660.c.

This reduces diffs from src/usr.sbin/installboot/cd9660.c.
Also explicitly call cd9660_match() to get fstype->blocksize properly.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/cdrom/macppc_installboot/cd9660.c
cvs rdiff -u -r1.6 -r1.7 src/distrib/cdrom/macppc_installboot/installboot.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/cdrom/macppc_installboot/cd9660.c
diff -u src/distrib/cdrom/macppc_installboot/cd9660.c:1.5 src/distrib/cdrom/macppc_installboot/cd9660.c:1.6
--- src/distrib/cdrom/macppc_installboot/cd9660.c:1.5	Sun May 19 15:51:30 2024
+++ src/distrib/cdrom/macppc_installboot/cd9660.c	Sun May 19 15:52:34 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660.c,v 1.5 2024/05/19 15:51:30 tsutsui Exp $	*/
+/*	$NetBSD: cd9660.c,v 1.6 2024/05/19 15:52:34 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 2005 Izumi Tsutsui.  All rights reserved.
@@ -30,7 +30,7 @@
 
 #include 
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: cd9660.c,v 1.5 2024/05/19 15:51:30 tsutsui Exp $");
+__RCSID("$NetBSD: cd9660.c,v 1.6 2024/05/19 15:52:34 tsutsui Exp $");
 #endif	/* !__lint */
 
 #include 
@@ -213,8 +213,6 @@ cd9660_findstage2(ib_params *params, uin
 			found = 1;
 			/* ISO filesystem always has contiguous file blocks */
 			blocks[0].block = (int64_t)isonum_733(idr->extent);
-			/* XXX bootxx assumes blocksize is 512 */
-			blocks[0].block *= blocksize / 512;
 			blocks[0].blocksize =
 			roundup(isonum_733(idr->size), blocksize);
 			*maxblk = 1;

Index: src/distrib/cdrom/macppc_installboot/installboot.c
diff -u src/distrib/cdrom/macppc_installboot/installboot.c:1.6 src/distrib/cdrom/macppc_installboot/installboot.c:1.7
--- src/distrib/cdrom/macppc_installboot/installboot.c:1.6	Sun May 19 15:51:30 2024
+++ src/distrib/cdrom/macppc_installboot/installboot.c	Sun May 19 15:52:34 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: installboot.c,v 1.6 2024/05/19 15:51:30 tsutsui Exp $	*/
+/*	$NetBSD: installboot.c,v 1.7 2024/05/19 15:52:34 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 2005 Izumi Tsutsui.  All rights reserved.
@@ -47,6 +47,12 @@ static	void usage(void);
 
 static	ib_params	installboot_params;
 
+static	struct ib_fs cd9660_fstype = {
+	.name = "cd9660",
+	.match = cd9660_match,
+	.findstage2 = cd9660_findstage2
+};
+
 int
 main(int argc, char **argv)
 {
@@ -59,6 +65,7 @@ main(int argc, char **argv)
 	uint32_t nblk, maxblk, blk_i;
 	int rv;
 	ib_block *blocks;
+	uint64_t block;
 
 	setprogname(argv[0]);
 	params = _params;
@@ -70,11 +77,16 @@ main(int argc, char **argv)
 		usage();
 
 	params->filesystem = argv[1];
+	params->fstype = _fstype;
 
 	if ((params->fsfd = open(params->filesystem, O_RDWR, 0600)) == -1)
 		err(1, "Opening file system `%s' read", params->filesystem);
 	if (fstat(params->fsfd, >fsstat) == -1)
 		err(1, "Examining file system `%s'", params->filesystem);
+	if (!params->fstype->match(params))
+		errx(1, "File system `%s' is not of type %s",
+		params->filesystem, params->fstype->name);
+
 #ifdef DEBUG
 	printf("file system: %s, %ld bytes\n",
 	params->filesystem, (long)params->fsstat.st_size);
@@ -167,14 +179,16 @@ main(int argc, char **argv)
 	}
 
 	nblk = maxblk;
-	if (!cd9660_findstage2(params, , blocks)) {
+	if (!params->fstype->findstage2(params, , blocks)) {
 		exit(1);
 	}
 
 	bbinfop->bbi_block_count = htobe32(nblk);
 	bbinfop->bbi_block_size = htobe32(blocks[0].blocksize);
 	for (blk_i = 0; blk_i < nblk; blk_i++) {
-		bbinfop->bbi_block_table[blk_i] = htobe32(blocks[blk_i].block);
+		/* XXX bootxx assumes blocksize is 512 */
+		block = blocks[blk_i].block * (params->fstype->blocksize / 512);
+		bbinfop->bbi_block_table[blk_i] = htobe32(block);
 		if (blocks[blk_i].blocksize < blocks[0].blocksize &&
 		blk_i + 1 != nblk) {
 			warnx("Secondary bootstrap `%s' blocks do not have "



CVS commit: src/distrib/cdrom/macppc_installboot

2024-05-19 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sun May 19 15:52:34 UTC 2024

Modified Files:
src/distrib/cdrom/macppc_installboot: cd9660.c installboot.c

Log Message:
Use native cd9660 blocksize to specify block numbers in cd9660.c.

This reduces diffs from src/usr.sbin/installboot/cd9660.c.
Also explicitly call cd9660_match() to get fstype->blocksize properly.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/cdrom/macppc_installboot/cd9660.c
cvs rdiff -u -r1.6 -r1.7 src/distrib/cdrom/macppc_installboot/installboot.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/cdrom/macppc_installboot

2024-05-19 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sun May 19 15:51:30 UTC 2024

Modified Files:
src/distrib/cdrom/macppc_installboot: Makefile cd9660.c installboot.c
installboot.h

Log Message:
Sync with src/usr.sbin/installboot/cd9660.c:

- include now properly updated cd9660_extern.h for function prototypes
  and remove them from local installboot.h
- use ISO_MAXNAMLEN rather than (BSD specific and incorrect) MAXNAMLEN
- use proper names for the secondary boot file
- appease several pointer signedness warnings (not fatal on HOST tools)


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/distrib/cdrom/macppc_installboot/Makefile
cvs rdiff -u -r1.4 -r1.5 src/distrib/cdrom/macppc_installboot/cd9660.c \
src/distrib/cdrom/macppc_installboot/installboot.h
cvs rdiff -u -r1.5 -r1.6 src/distrib/cdrom/macppc_installboot/installboot.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/cdrom/macppc_installboot/Makefile
diff -u src/distrib/cdrom/macppc_installboot/Makefile:1.11 src/distrib/cdrom/macppc_installboot/Makefile:1.12
--- src/distrib/cdrom/macppc_installboot/Makefile:1.11	Tue May  1 19:59:43 2018
+++ src/distrib/cdrom/macppc_installboot/Makefile	Sun May 19 15:51:30 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2018/05/01 19:59:43 christos Exp $
+#	$NetBSD: Makefile,v 1.12 2024/05/19 15:51:30 tsutsui Exp $
 
 .include 
 HOSTPROG=	macppc_installboot
@@ -16,6 +16,7 @@ HOST_CPPFLAGS+=	-I. -I${.CURDIR}
 	${HOST_INSTALL_DIR} fs/cd9660
 	${HOST_LN} -s ${NETBSDSRCDIR}/sys/fs/unicode.h fs
 	${HOST_LN} -s ${NETBSDSRCDIR}/sys/fs/cd9660/iso.h fs/cd9660
+	${HOST_LN} -s ${NETBSDSRCDIR}/sys/fs/cd9660/cd9660_extern.h fs/cd9660
 .endif
 
 cleandir distclean: cleaninc

Index: src/distrib/cdrom/macppc_installboot/cd9660.c
diff -u src/distrib/cdrom/macppc_installboot/cd9660.c:1.4 src/distrib/cdrom/macppc_installboot/cd9660.c:1.5
--- src/distrib/cdrom/macppc_installboot/cd9660.c:1.4	Sat Sep 27 15:21:40 2014
+++ src/distrib/cdrom/macppc_installboot/cd9660.c	Sun May 19 15:51:30 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660.c,v 1.4 2014/09/27 15:21:40 tsutsui Exp $	*/
+/*	$NetBSD: cd9660.c,v 1.5 2024/05/19 15:51:30 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 2005 Izumi Tsutsui.  All rights reserved.
@@ -30,7 +30,7 @@
 
 #include 
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: cd9660.c,v 1.4 2014/09/27 15:21:40 tsutsui Exp $");
+__RCSID("$NetBSD: cd9660.c,v 1.5 2024/05/19 15:51:30 tsutsui Exp $");
 #endif	/* !__lint */
 
 #include 
@@ -51,6 +51,7 @@ __RCSID("$NetBSD: cd9660.c,v 1.4 2014/09
 #include 
 
 #include 
+#include 
 
 #include "installboot.h"
 
@@ -87,7 +88,7 @@ cd9660_match(ib_params *params)
 		return 0;
 	}
 
-	blocksize = isonum_723((char *)ipd.logical_block_size);
+	blocksize = isonum_723((u_char *)ipd.logical_block_size);
 	if (blocksize != ISO_DEFAULT_BLOCK_SIZE) {
 		warnx("Invalid blocksize %d in `%s'",
 		blocksize, params->filesystem);
@@ -104,10 +105,11 @@ int
 cd9660_findstage2(ib_params *params, uint32_t *maxblk, ib_block *blocks)
 {
 	uint8_t buf[ISO_DEFAULT_BLOCK_SIZE];
-	char name[MAXNAMLEN];
-	char *ofwboot;
+	char name[ISO_MAXNAMLEN];
+	char *stage2;
 	off_t loc;
-	int rv, blocksize, found, i;
+	int rv, blocksize, found;
+	u_int i;
 	struct iso_primary_descriptor ipd;
 	struct iso_directory_record *idr;
 
@@ -122,20 +124,20 @@ cd9660_findstage2(ib_params *params, uin
 #endif
 
 	/* The secondary bootstrap must be clearly in /. */
-	strlcpy(name, params->stage2, MAXNAMLEN);
-	ofwboot = name;
-	if (ofwboot[0] == '/')
-		ofwboot++;
-	if (strchr(ofwboot, '/') != NULL) {
+	strlcpy(name, params->stage2, ISO_MAXNAMLEN);
+	stage2 = name;
+	if (stage2[0] == '/')
+		stage2++;
+	if (strchr(stage2, '/') != NULL) {
 		warnx("The secondary bootstrap `%s' must be in / "
 		"on filesystem `%s'", params->stage2, params->filesystem);
 		return 0;
 	}
-	if (strchr(ofwboot, '.') == NULL) {
+	if (strchr(stage2, '.') == NULL) {
 		/*
 		 * XXX should fix isofncmp()?
 		 */
-		strlcat(ofwboot, ".", MAXNAMLEN);
+		strlcat(name, ".", ISO_MAXNAMLEN);
 	}
 
 	rv = pread(params->fsfd, , sizeof(ipd),
@@ -148,7 +150,7 @@ cd9660_findstage2(ib_params *params, uin
 		   params->filesystem);
 		return 0;
 	}
-	blocksize = isonum_723((char *)ipd.logical_block_size);
+	blocksize = isonum_723((u_char *)ipd.logical_block_size);
 
 	idr = (void *)ipd.root_directory_record;
 	loc = (off_t)isonum_733(idr->extent) * blocksize;
@@ -205,8 +207,9 @@ cd9660_findstage2(ib_params *params, uin
 			printf("\n");
 		}
 #endif
-		if (isofncmp(ofwboot, strlen(ofwboot),
-		idr->name, isonum_711(idr->name_len), 0) == 0) {
+		if (isofncmp((u_char *)stage2, strlen(stage2),
+		(u_char *)idr->name,
+		isonum_711((u_char *)idr->name_len), 0) == 0) {
 			found = 1;
 			/* ISO filesystem always has contiguous file blocks */
 			blocks[0].block = (int64_t)isonum_733(idr->extent);
Index: 

CVS commit: src/distrib/cdrom/macppc_installboot

2024-05-19 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sun May 19 15:51:30 UTC 2024

Modified Files:
src/distrib/cdrom/macppc_installboot: Makefile cd9660.c installboot.c
installboot.h

Log Message:
Sync with src/usr.sbin/installboot/cd9660.c:

- include now properly updated cd9660_extern.h for function prototypes
  and remove them from local installboot.h
- use ISO_MAXNAMLEN rather than (BSD specific and incorrect) MAXNAMLEN
- use proper names for the secondary boot file
- appease several pointer signedness warnings (not fatal on HOST tools)


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/distrib/cdrom/macppc_installboot/Makefile
cvs rdiff -u -r1.4 -r1.5 src/distrib/cdrom/macppc_installboot/cd9660.c \
src/distrib/cdrom/macppc_installboot/installboot.h
cvs rdiff -u -r1.5 -r1.6 src/distrib/cdrom/macppc_installboot/installboot.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/hp300/cdroms/installcd

2024-05-19 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sun May 19 15:50:00 UTC 2024

Modified Files:
src/distrib/hp300/cdroms/installcd: Makefile

Log Message:
Put a RAMDISK kernel and SYS_UBOOT into hp300 installcd to make it bootable.

This should finally close PR/54455.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/hp300/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/hp300/cdroms/installcd/Makefile
diff -u src/distrib/hp300/cdroms/installcd/Makefile:1.3 src/distrib/hp300/cdroms/installcd/Makefile:1.4
--- src/distrib/hp300/cdroms/installcd/Makefile:1.3	Mon Sep 23 13:42:32 2019
+++ src/distrib/hp300/cdroms/installcd/Makefile	Sun May 19 15:50:00 2024
@@ -1,6 +1,20 @@
-#	$NetBSD: Makefile,v 1.3 2019/09/23 13:42:32 christos Exp $
+#	$NetBSD: Makefile,v 1.4 2024/05/19 15:50:00 tsutsui Exp $
 CDBASE=		hp300cd			# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 
+CDKERNELS=	netbsd-RAMDISK.gz netbsd
+CDINSTKERNEL=	../../instkernel
+
+SYS_UBOOT=	SYS_UBOOT
+BOOTDIR=	${DESTDIR}/usr/mdec/rbootd
+
+# make the CD bootable
+prepare_md_post:
+	${INSTALL} ${COPY} -m 0644 ${BOOTDIR}/${SYS_UBOOT} cdrom
+
+image_md_post:
+	${TOOL_INSTALLBOOT} -m ${MACHINE} \
+	${CDIMAGE} ${BOOTDIR}/${SYS_UBOOT} /${SYS_UBOOT}
+
 .include "${.CURDIR}/../../../common/Makefile.bootcd"



CVS commit: src/distrib/hp300/cdroms/installcd

2024-05-19 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sun May 19 15:50:00 UTC 2024

Modified Files:
src/distrib/hp300/cdroms/installcd: Makefile

Log Message:
Put a RAMDISK kernel and SYS_UBOOT into hp300 installcd to make it bootable.

This should finally close PR/54455.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/hp300/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/common/bootimage

2024-05-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat May 18 02:03:17 UTC 2024

Modified Files:
src/distrib/common/bootimage: Makefile.bootimage

Log Message:
include all extra flavors of the kernel and use the proper variable for
the machine dependent installation directory.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/distrib/common/bootimage/Makefile.bootimage

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/common/bootimage

2024-05-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat May 18 02:03:17 UTC 2024

Modified Files:
src/distrib/common/bootimage: Makefile.bootimage

Log Message:
include all extra flavors of the kernel and use the proper variable for
the machine dependent installation directory.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/distrib/common/bootimage/Makefile.bootimage

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/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.36 src/distrib/common/bootimage/Makefile.bootimage:1.37
--- src/distrib/common/bootimage/Makefile.bootimage:1.36	Thu May 16 11:46:42 2024
+++ src/distrib/common/bootimage/Makefile.bootimage	Fri May 17 22:03:17 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.bootimage,v 1.36 2024/05/16 15:46:42 christos Exp $
+#	$NetBSD: Makefile.bootimage,v 1.37 2024/05/18 02:03:17 christos Exp $
 #
 # Copyright (c) 2009, 2010, 2011 Izumi Tsutsui.  All rights reserved.
 #
@@ -433,12 +433,13 @@ ${TARGETFS}: prepare_md_post ${WORKFSTAB
 .if defined(SPEC_EXTRA)
 	cat ${SPEC_EXTRA} >> ${WORKSPEC}
 .endif
-	if [ -f ${WORKDIR}/netbsd.gdb ]; then \
-	echo "./netbsd.gdb type=file uname=root gname=wheel mode=0444" \
-	>> ${WORKSPEC}; \
-	fi
-	if [ -d ${WORKDIR}/${MACHINE} ]; then \
-	${MAKESPEC} -d ${WORKDIR} ${MACHINE} >> ${WORKSPEC}; \
+	for i in ${WORKDIR}/netbsd.*; do \
+	if [ -e $$i ]; then \
+		echo "./$$(basename $$i) type=file uname=root gname=wheel mode=0444" >> ${WORKSPEC}; \
+	fi; \
+	done
+	if [ -d ${WORKDIR}/${RELEASEMACHINEDIR} ]; then \
+	${MAKESPEC} -d ${WORKDIR} ${RELEASEMACHINEDIR} >> ${WORKSPEC}; \
 	fi
 	@echo Creating rootfs...
 	# XXX /var/spool/ftp/hidden is unreadable



CVS commit: src/distrib

2024-05-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May 17 21:31:10 UTC 2024

Modified Files:
src/distrib/common: Makefile.image
src/distrib/evbarm/instkernel/sshramdisk: Makefile

Log Message:
use IMAGESPECEXTRA to include libdata and don't include IMAGERUNTIME


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/distrib/common/Makefile.image
cvs rdiff -u -r1.27 -r1.28 src/distrib/evbarm/instkernel/sshramdisk/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib

2024-05-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May 17 21:31:10 UTC 2024

Modified Files:
src/distrib/common: Makefile.image
src/distrib/evbarm/instkernel/sshramdisk: Makefile

Log Message:
use IMAGESPECEXTRA to include libdata and don't include IMAGERUNTIME


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/distrib/common/Makefile.image
cvs rdiff -u -r1.27 -r1.28 src/distrib/evbarm/instkernel/sshramdisk/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.image
diff -u src/distrib/common/Makefile.image:1.43 src/distrib/common/Makefile.image:1.44
--- src/distrib/common/Makefile.image:1.43	Fri May 17 15:54:28 2024
+++ src/distrib/common/Makefile.image	Fri May 17 17:31:10 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.image,v 1.43 2024/05/17 19:54:28 christos Exp $
+#	$NetBSD: Makefile.image,v 1.44 2024/05/17 21:31:10 christos Exp $
 #
 # Makefile snippet to build a tree from the provided lists,
 # and make an ffs file system image from that tree
@@ -107,8 +107,7 @@ ${IMAGE}: ${WORKBUILT}
 	${IMAGEPREBUILD}
 .endif
 	if [ "X${IMAGERUNTIME}" != "X" ]; then\
-		release_destdir=${WORKDIR};\
-		cd $$release_destdir;	\
+		release_destdir=${CUROBJDIR}/${WORKDIR};		\
 		cd ${DESTDIR};		\
 		for imge in ${IMAGERUNTIME};\
 		do			\
@@ -117,7 +116,7 @@ ${IMAGE}: ${WORKBUILT}
 		done;			\
 		cd "${CUROBJDIR}";	\
 	fi
-	for i in ${IMAGERUNTIME} ${IMAGESPECEXTRA}; do 			\
+	for i in ${IMAGESPECEXTRA}; do 	\
 		if [ -n "$$i" ] && [ -e ${WORKDIR}/$$i ]; then 		\
 		${MAKESPEC} -d ${WORKDIR} $$i >> ${WORKSPEC}; 	\
 		fi; 			\

Index: src/distrib/evbarm/instkernel/sshramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.27 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.28
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.27	Fri May 17 16:26:48 2024
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile	Fri May 17 17:31:10 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.27 2024/05/17 20:26:48 christos Exp $
+#	$NetBSD: Makefile,v 1.28 2024/05/17 21:31:10 christos Exp $
 
 .include 
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -30,6 +30,7 @@ IMAGEDEPENDS=	${CRUNCHBIN} \
 		${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
 		${DISTRIBDIR}/common/services
 IMAGERUNTIME= libdata/firmware
+IMAGESPECEXTRA= libdata
 
 # Use stubs to eliminate some large stuff from libc
 HACKSRC=	${DISTRIBDIR}/utils/libhack



CVS commit: src/distrib

2024-05-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May 17 20:27:09 UTC 2024

Modified Files:
src/distrib/sun2/ramdisk: Makefile
src/distrib/sun3/ramdisk: Makefile

Log Message:
Add /dev/pipe to the spec list using IMAGESPECEXTRA


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/distrib/sun2/ramdisk/Makefile
cvs rdiff -u -r1.41 -r1.42 src/distrib/sun3/ramdisk/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/sun2/ramdisk/Makefile
diff -u src/distrib/sun2/ramdisk/Makefile:1.27 src/distrib/sun2/ramdisk/Makefile:1.28
--- src/distrib/sun2/ramdisk/Makefile:1.27	Fri Jun 18 16:30:58 2021
+++ src/distrib/sun2/ramdisk/Makefile	Fri May 17 16:27:09 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.27 2021/06/18 20:30:58 mrg Exp $
+#	$NetBSD: Makefile,v 1.28 2024/05/17 20:27:09 christos Exp $
 
 .include 
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -33,6 +33,7 @@ CRUNCHBIN=	rd_bin
 LISTS=		${.CURDIR}/list
 MTREECONF=	${.CURDIR}/mtree.conf
 IMAGEENDIAN=	be
+IMAGESPECEXTRA=	dev/pipe
 MAKEDEVTARGETS=	std md0 cd0 st0 st1 sd0 sd1 sd2 xd0 xy0
 IMAGEDEPENDS=	${CRUNCHBIN} \
 		fstab passwd protocols ${DISTRIBDIR}/common/services \

Index: src/distrib/sun3/ramdisk/Makefile
diff -u src/distrib/sun3/ramdisk/Makefile:1.41 src/distrib/sun3/ramdisk/Makefile:1.42
--- src/distrib/sun3/ramdisk/Makefile:1.41	Wed Feb  6 23:33:58 2019
+++ src/distrib/sun3/ramdisk/Makefile	Fri May 17 16:27:09 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.41 2019/02/07 04:33:58 mrg Exp $
+#	$NetBSD: Makefile,v 1.42 2024/05/17 20:27:09 christos Exp $
 
 .include 
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -6,6 +6,7 @@
 
 IMAGE=		ramdisk.fs
 IMAGESIZE=	660k
+IMAGESPECEXTRA=	dev/pipe
 MAKEFS_FLAGS+=	-f 6 -o density=3500
 
 WARNS=		1



CVS commit: src/distrib

2024-05-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May 17 20:27:09 UTC 2024

Modified Files:
src/distrib/sun2/ramdisk: Makefile
src/distrib/sun3/ramdisk: Makefile

Log Message:
Add /dev/pipe to the spec list using IMAGESPECEXTRA


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/distrib/sun2/ramdisk/Makefile
cvs rdiff -u -r1.41 -r1.42 src/distrib/sun3/ramdisk/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/evbarm/instkernel/sshramdisk

2024-05-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May 17 20:26:48 UTC 2024

Modified Files:
src/distrib/evbarm/instkernel/sshramdisk: Makefile

Log Message:
use IMAGERUNTIME to copy extra data instead of random pax commands


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/distrib/evbarm/instkernel/sshramdisk/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/evbarm/instkernel/sshramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.26 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.27
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.26	Thu Mar 14 22:20:58 2024
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile	Fri May 17 16:26:48 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.26 2024/03/15 02:20:58 riastradh Exp $
+#	$NetBSD: Makefile,v 1.27 2024/05/17 20:26:48 christos Exp $
 
 .include 
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -29,9 +29,7 @@ IMAGEDEPENDS=	${CRUNCHBIN} \
 		${NETBSDSRCDIR}/etc/group \
 		${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
 		${DISTRIBDIR}/common/services
-IMAGEPREBUILD= \
-	(cd ${DESTDIR} && ${TOOL_PAX} ${PAX_TIMESTAMP} -w libdata/firmware) \
-	| (cd ${WORKDIR} && ${TOOL_PAX} -r -pp)
+IMAGERUNTIME= libdata/firmware
 
 # Use stubs to eliminate some large stuff from libc
 HACKSRC=	${DISTRIBDIR}/utils/libhack



CVS commit: src/distrib/evbarm/instkernel/sshramdisk

2024-05-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May 17 20:26:48 UTC 2024

Modified Files:
src/distrib/evbarm/instkernel/sshramdisk: Makefile

Log Message:
use IMAGERUNTIME to copy extra data instead of random pax commands


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/distrib/evbarm/instkernel/sshramdisk/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

2024-05-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May 17 19:54:28 UTC 2024

Modified Files:
src/distrib/common: Makefile.image

Log Message:
Add IMAGERUNTIME and IMAGESPECEXTRA variables


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/distrib/common/Makefile.image

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.image
diff -u src/distrib/common/Makefile.image:1.42 src/distrib/common/Makefile.image:1.43
--- src/distrib/common/Makefile.image:1.42	Thu May 16 11:46:42 2024
+++ src/distrib/common/Makefile.image	Fri May 17 15:54:28 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.image,v 1.42 2024/05/16 15:46:42 christos Exp $
+#	$NetBSD: Makefile.image,v 1.43 2024/05/17 19:54:28 christos Exp $
 #
 # Makefile snippet to build a tree from the provided lists,
 # and make an ffs file system image from that tree
@@ -16,6 +16,8 @@
 #	IMAGEPREBUILD	additional operations to run pre image creation
 #	IMAGEPOSTBUILD	operation to run on ${IMAGE} ${.TARGET} after its built
 #			(if this returns non zero, ${.TARGET} is removed)
+#	IMAGERUNTIME	files/directories to copy from $DESTDIR onto the image
+#	IMAGESPECEXTRA	files/directories to add to the spec
 #	CRUNCHBIN	name of crunchgen(1)ed binary
 #	DESTDIR		destination directory
 #	MAKEFS_FLAGS	extra options to ${TOOL_MAKEFS}
@@ -34,6 +36,7 @@ _MAKEFILE_IMAGE_=1
 WORKDIR?=	work
 WORKSPEC?=	work.spec
 WORKBUILT?=	work.built
+CUROBJDIR!= cd ${.CURDIR} && ${PRINTOBJDIR}
 
 .include "${DISTRIBDIR}/common/Makefile.parselist"
 
@@ -44,6 +47,14 @@ MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP
 PAX_TIMESTAMP=--timestamp "${MKREPRO_TIMESTAMP}"
 GZIP_N_FLAG=-n
 .endif
+MAKESPEC=	${HOST_SH} ${NETBSDSRCDIR}/etc/makespec
+
+.if ${MAKEVERBOSE} >= 2 
+PAX_v?= -v
+.else   
+PAX_v?= 
+.endif  
+
 
 GZIP_FLAGS= -9 ${GZIP_N_FLAG}
 
@@ -95,6 +106,22 @@ ${IMAGE}: ${WORKBUILT}
 .if defined(IMAGEPREBUILD)
 	${IMAGEPREBUILD}
 .endif
+	if [ "X${IMAGERUNTIME}" != "X" ]; then\
+		release_destdir=${WORKDIR};\
+		cd $$release_destdir;	\
+		cd ${DESTDIR};		\
+		for imge in ${IMAGERUNTIME};\
+		do			\
+			${TOOL_PAX} ${PAX_TIMESTAMP} -rw -pp ${PAX_v}	\
+$${imge} $$release_destdir;		\
+		done;			\
+		cd "${CUROBJDIR}";	\
+	fi
+	for i in ${IMAGERUNTIME} ${IMAGESPECEXTRA}; do 			\
+		if [ -n "$$i" ] && [ -e ${WORKDIR}/$$i ]; then 		\
+		${MAKESPEC} -d ${WORKDIR} $$i >> ${WORKSPEC}; 	\
+		fi; 			\
+	done
 	[ "${.OODATE}" = ${WORKBUILT} -a -f ${IMAGE} -a ! ${IMAGE} -ot ${WORKBUILT} ]  || { \
 	${_MKSHMSG_CREATE} ${.CURDIR:T}/${.TARGET}; \
 	rm -f ${.TARGET} ${.TARGET}.tmp; \



CVS commit: src/distrib/common

2024-05-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May 17 19:54:28 UTC 2024

Modified Files:
src/distrib/common: Makefile.image

Log Message:
Add IMAGERUNTIME and IMAGESPECEXTRA variables


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/distrib/common/Makefile.image

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/common

2024-05-16 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu May 16 17:55:48 UTC 2024

Modified Files:
src/distrib/common: Makefile.bootcd

Log Message:
Add more extra stuff on the cds


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/distrib/common/Makefile.bootcd

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.54 src/distrib/common/Makefile.bootcd:1.55
--- src/distrib/common/Makefile.bootcd:1.54	Tue May 14 13:17:13 2024
+++ src/distrib/common/Makefile.bootcd	Thu May 16 13:55:48 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.bootcd,v 1.54 2024/05/14 17:17:13 christos Exp $
+#	$NetBSD: Makefile.bootcd,v 1.55 2024/05/16 17:55:48 christos Exp $
 #
 # Makefile snipped to create a CD/DVD ISO
 #
@@ -324,8 +324,12 @@ image:
 .endif
 	if [ ! -s ${WORKSPEC} ]; then \
 	${MAKESPEC} -d cdrom . > ${WORKSPEC}; \
-	elif [ -d cdrom/${MACHINE} ]; then \
-	${MAKESPEC} -d cdrom ${MACHINE} >> ${WORKSPEC}; \
+	else \
+	for i in ${RELEASEMACHINEDIR} source ${CDEXTRA} ${CDBUILDEXTRA}; do\
+		if [ -n "$$i" ] && [ -e cdrom/$$i ]; then \
+		${MAKESPEC} -d cdrom $$i >> ${WORKSPEC}; \
+		fi; \
+	done; \
 	fi
 	${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 -F ${WORKSPEC} -xx \
 	${MAKEFS_TIMESTAMP} ${CDMAKEFSEXTRAOPTS} -o ${_CDMAKEFSOPTIONS:Q} \



CVS commit: src/distrib/common

2024-05-16 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu May 16 17:55:48 UTC 2024

Modified Files:
src/distrib/common: Makefile.bootcd

Log Message:
Add more extra stuff on the cds


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/distrib/common/Makefile.bootcd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/common

2024-05-16 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu May 16 15:46:42 UTC 2024

Modified Files:
src/distrib/common: Makefile.image
src/distrib/common/bootimage: Makefile.bootimage

Log Message:
Apply the -xx treatment to the rest of the ffs makefs invocations.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/distrib/common/Makefile.image
cvs rdiff -u -r1.35 -r1.36 src/distrib/common/bootimage/Makefile.bootimage

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.image
diff -u src/distrib/common/Makefile.image:1.41 src/distrib/common/Makefile.image:1.42
--- src/distrib/common/Makefile.image:1.41	Tue Mar 19 20:31:54 2024
+++ src/distrib/common/Makefile.image	Thu May 16 11:46:42 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.image,v 1.41 2024/03/20 00:31:54 christos Exp $
+#	$NetBSD: Makefile.image,v 1.42 2024/05/16 15:46:42 christos Exp $
 #
 # Makefile snippet to build a tree from the provided lists,
 # and make an ffs file system image from that tree
@@ -99,7 +99,7 @@ ${IMAGE}: ${WORKBUILT}
 	${_MKSHMSG_CREATE} ${.CURDIR:T}/${.TARGET}; \
 	rm -f ${.TARGET} ${.TARGET}.tmp; \
 	${TOOL_MAKEFS} -t ffs -B ${IMAGEENDIAN} -s ${IMAGESIZE} -F ${WORKSPEC} \
-	${MAKEFS_TIMESTAMP} -N ${NETBSDSRCDIR}/etc ${IMGMAKEFSOPTIONS} \
+	-xx ${MAKEFS_TIMESTAMP} -N ${NETBSDSRCDIR}/etc ${IMGMAKEFSOPTIONS} \
 	-o optimization=space,minfree=0 \
 	${MAKEFS_FLAGS} ${.TARGET}.tmp ${WORKDIR} \
 	&& mv -f ${.TARGET}.tmp ${.TARGET}; \

Index: src/distrib/common/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.35 src/distrib/common/bootimage/Makefile.bootimage:1.36
--- src/distrib/common/bootimage/Makefile.bootimage:1.35	Mon Apr 22 10:41:24 2024
+++ src/distrib/common/bootimage/Makefile.bootimage	Thu May 16 11:46:42 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.bootimage,v 1.35 2024/04/22 14:41:24 nia Exp $
+#	$NetBSD: Makefile.bootimage,v 1.36 2024/05/16 15:46:42 christos Exp $
 #
 # Copyright (c) 2009, 2010, 2011 Izumi Tsutsui.  All rights reserved.
 #
@@ -171,6 +171,8 @@ DD?=		dd
 MKDIR?=		mkdir -p
 RM?=		rm
 
+MAKESPEC=	${HOST_SH} ${NETBSDSRCDIR}/etc/makespec
+
 #
 # common definitions for image
 #
@@ -351,6 +353,7 @@ ${WORKFSTAB}:
 # create root file system for the image
 #
 ${TARGETFS}: prepare_md_post ${WORKFSTAB}
+	@${RM} -f ${WORKSPEC}
 	@if [ ! -d ${RELEASEDIR}/${RELEASEMACHINEDIR} ]; then 		\
 		echo "Missing ${RELEASEDIR}/${RELEASEMACHINEDIR}, aborting"; \
 		false; 			\
@@ -413,11 +416,11 @@ ${TARGETFS}: prepare_md_post ${WORKFSTAB
 	@if [ -f ${_SRC} ]; then 	\
 		echo ${INSTALL} ${COPY} -m 0644 ${_SRC} ${WORKDIR}/${_TARGET}; \
 		${INSTALL} ${COPY} -m 0644 ${_SRC} ${WORKDIR}/${_TARGET}; \
+		echo "./${_TARGET} type=file uname=root gname=wheel mode=0555" >> ${WORKSPEC}; \
 	fi
 .endfor
 .endif
 	@echo Preparing spec files for makefs...
-	${RM} -f ${WORKSPEC}
 	cat ${WORKDIR}/etc/mtree/* |	\
 	${TOOL_SED} -e 's/ size=[0-9]*//' > ${WORKSPEC}
 	${HOST_SH} ${WORKDIR}/dev/MAKEDEV -s all ipty |			\
@@ -430,12 +433,19 @@ ${TARGETFS}: prepare_md_post ${WORKFSTAB
 .if defined(SPEC_EXTRA)
 	cat ${SPEC_EXTRA} >> ${WORKSPEC}
 .endif
+	if [ -f ${WORKDIR}/netbsd.gdb ]; then \
+	echo "./netbsd.gdb type=file uname=root gname=wheel mode=0444" \
+	>> ${WORKSPEC}; \
+	fi
+	if [ -d ${WORKDIR}/${MACHINE} ]; then \
+	${MAKESPEC} -d ${WORKDIR} ${MACHINE} >> ${WORKSPEC}; \
+	fi
 	@echo Creating rootfs...
 	# XXX /var/spool/ftp/hidden is unreadable
 	${CHMOD} +r ${WORKDIR}/var/spool/ftp/hidden
 	${TOOL_MAKEFS} -M ${FSSIZE} -m ${FSSIZE}			\
 	-B ${TARGET_ENDIANNESS}	\
-	-F ${WORKSPEC} -N ${WORKDIR}/etc\
+	-xx -F ${WORKSPEC} -N ${WORKDIR}/etc			\
 	${MAKEFS_TIMESTAMP}		\
 	${IMGMAKEFSOPTIONS}		\
 	${WORKFS} ${WORKDIR}



CVS commit: src/distrib/common

2024-05-16 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu May 16 15:46:42 UTC 2024

Modified Files:
src/distrib/common: Makefile.image
src/distrib/common/bootimage: Makefile.bootimage

Log Message:
Apply the -xx treatment to the rest of the ffs makefs invocations.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/distrib/common/Makefile.image
cvs rdiff -u -r1.35 -r1.36 src/distrib/common/bootimage/Makefile.bootimage

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/cdrom

2024-05-16 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Thu May 16 14:21:45 UTC 2024

Modified Files:
src/distrib/cdrom: Makefile

Log Message:
Add -data-change-warn to MKISOFS_ARGS for macppc as done for mac68k:

https://mail-index.netbsd.org/source-changes/2023/05/19/msg144826.html
> Creating Type mappings for .bin (macbinary encoded) files,
> mkisofs changes files, then turns around and complains they have been
> changed.
>
> This is a self-inflicted wound, so demote the error to a warning.

This looks to make macppccd builds with cdrtools-3.02a10.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/distrib/cdrom/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/cdrom/Makefile
diff -u src/distrib/cdrom/Makefile:1.53 src/distrib/cdrom/Makefile:1.54
--- src/distrib/cdrom/Makefile:1.53	Fri May 19 14:47:16 2023
+++ src/distrib/cdrom/Makefile	Thu May 16 14:21:45 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2023/05/19 14:47:16 hauke Exp $
+# $NetBSD: Makefile,v 1.54 2024/05/16 14:21:45 tsutsui Exp $
 #
 # Consult "*.conf" for the configuration variables; this Makefile is typically
 # not edited for basic configuration changes.
@@ -294,7 +294,7 @@ MKISOFS_ARGS.${image}+= -b ${BOOTFILE.am
 .if !empty(ports:Mmacppc)
 BOOTHFS=	boothfs
 MKISOFS_ARGS.${image}+=	-hfs -part -hide-hfs-list ${.CURDIR}/hide-hfs.lst \
-	--macbin -map ${.CURDIR}/hfsmap.lst \
+	--macbin -data-change-warn -map ${.CURDIR}/hfsmap.lst \
 	-boot-hfs-file ${.OBJDIR}/${BOOTHFS}
 UUDECODE_FILES=	${BOOTHFS}
 .include 



CVS commit: src/distrib/cdrom

2024-05-16 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Thu May 16 14:21:45 UTC 2024

Modified Files:
src/distrib/cdrom: Makefile

Log Message:
Add -data-change-warn to MKISOFS_ARGS for macppc as done for mac68k:

https://mail-index.netbsd.org/source-changes/2023/05/19/msg144826.html
> Creating Type mappings for .bin (macbinary encoded) files,
> mkisofs changes files, then turns around and complains they have been
> changed.
>
> This is a self-inflicted wound, so demote the error to a warning.

This looks to make macppccd builds with cdrtools-3.02a10.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/distrib/cdrom/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/vax/cdroms/installcd

2024-05-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed May 15 16:31:36 UTC 2024

Modified Files:
src/distrib/vax/cdroms/installcd: Makefile
Added Files:
src/distrib/vax/cdroms/installcd: spec.in

Log Message:
Add missing stuff for vax


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/distrib/vax/cdroms/installcd/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/vax/cdroms/installcd/spec.in

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/cdroms/installcd/Makefile
diff -u src/distrib/vax/cdroms/installcd/Makefile:1.19 src/distrib/vax/cdroms/installcd/Makefile:1.20
--- src/distrib/vax/cdroms/installcd/Makefile:1.19	Fri Dec 20 14:46:51 2019
+++ src/distrib/vax/cdroms/installcd/Makefile	Wed May 15 12:31:35 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.19 2019/12/20 19:46:51 martin Exp $
+#	$NetBSD: Makefile,v 1.20 2024/05/15 16:31:35 christos Exp $
 CDBASE=		vaxcd			# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
 CDDEV_POPULATE=	true			# populate /dev on the CD
@@ -11,6 +11,8 @@ CD_SETS=	base etc	# no modules for VAX
 .include 
 SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR}
 
+SPEC_EXTRA:=${.PARSEDIR}/spec.in
+
 # prepare mutliuser install environment
 image_md_pre:
 	${RM} -f cdrom/boot

Added files:

Index: src/distrib/vax/cdroms/installcd/spec.in
diff -u /dev/null src/distrib/vax/cdroms/installcd/spec.in:1.1
--- /dev/null	Wed May 15 12:31:36 2024
+++ src/distrib/vax/cdroms/installcd/spec.in	Wed May 15 12:31:35 2024
@@ -0,0 +1,5 @@
+./install.sh 	type=file uname=root gname=wheel mode=755
+./mnt2 		type=dir  uname=root gname=wheel mode=755
+./netbsd 	type=file uname=root gname=wheel mode=644
+./targetroot 	type=dir  uname=root gname=wheel mode=755
+./etc/gettytab	type=link uname=root gname=wheel mode=755



CVS commit: src/distrib/vax/cdroms/installcd

2024-05-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed May 15 16:31:36 UTC 2024

Modified Files:
src/distrib/vax/cdroms/installcd: Makefile
Added Files:
src/distrib/vax/cdroms/installcd: spec.in

Log Message:
Add missing stuff for vax


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/distrib/vax/cdroms/installcd/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/vax/cdroms/installcd/spec.in

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

2024-05-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed May 15 16:29:54 UTC 2024

Modified Files:
src/distrib/sparc64/cdroms/installcd: Makefile
src/distrib/sparc64/cdroms/installdvd: Makefile
Added Files:
src/distrib/sparc64/cdroms: Makefile.cdrom spec.in

Log Message:
Factor out common stuff.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/distrib/sparc64/cdroms/Makefile.cdrom \
src/distrib/sparc64/cdroms/spec.in
cvs rdiff -u -r1.33 -r1.34 src/distrib/sparc64/cdroms/installcd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/sparc64/cdroms/installdvd/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

2024-05-14 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue May 14 17:17:13 UTC 2024

Modified Files:
src/distrib/common: Makefile.bootcd

Log Message:
check if the ${MACHINE} directory exists


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/distrib/common/Makefile.bootcd

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.53 src/distrib/common/Makefile.bootcd:1.54
--- src/distrib/common/Makefile.bootcd:1.53	Tue May 14 10:58:05 2024
+++ src/distrib/common/Makefile.bootcd	Tue May 14 13:17:13 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.bootcd,v 1.53 2024/05/14 14:58:05 christos Exp $
+#	$NetBSD: Makefile.bootcd,v 1.54 2024/05/14 17:17:13 christos Exp $
 #
 # Makefile snipped to create a CD/DVD ISO
 #
@@ -324,7 +324,7 @@ image:
 .endif
 	if [ ! -s ${WORKSPEC} ]; then \
 	${MAKESPEC} -d cdrom . > ${WORKSPEC}; \
-	else \
+	elif [ -d cdrom/${MACHINE} ]; then \
 	${MAKESPEC} -d cdrom ${MACHINE} >> ${WORKSPEC}; \
 	fi
 	${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 -F ${WORKSPEC} -xx \



CVS commit: src/distrib/common

2024-05-14 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue May 14 17:17:13 UTC 2024

Modified Files:
src/distrib/common: Makefile.bootcd

Log Message:
check if the ${MACHINE} directory exists


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/distrib/common/Makefile.bootcd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/i386/cdroms

2024-05-14 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue May 14 17:15:13 UTC 2024

Modified Files:
src/distrib/i386/cdroms: Makefile.cdrom
Added Files:
src/distrib/i386/cdroms: spec.in

Log Message:
Add the same extra stuff from amd64


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r0 -r1.1 src/distrib/i386/cdroms/spec.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/i386/cdroms/Makefile.cdrom
diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.43 src/distrib/i386/cdroms/Makefile.cdrom:1.44
--- src/distrib/i386/cdroms/Makefile.cdrom:1.43	Fri Apr 26 13:36:32 2024
+++ src/distrib/i386/cdroms/Makefile.cdrom	Tue May 14 13:15:13 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.43 2024/04/26 17:36:32 nia Exp $
+# $NetBSD: Makefile.cdrom,v 1.44 2024/05/14 17:15:13 christos Exp $
 
 .include 
 
@@ -12,6 +12,8 @@ CDKERNELS=	netbsd-GENERIC.gz   netbs
 CDRELEASE_NOISOS=	true
 CD_SETS+=	base etc gpufw
 
+SPEC_EXTRA:=${.PARSEDIR}/spec.in
+
 image_md_pre:
 	${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc cdrom/install.sh
 	${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab

Added files:

Index: src/distrib/i386/cdroms/spec.in
diff -u /dev/null src/distrib/i386/cdroms/spec.in:1.1
--- /dev/null	Tue May 14 13:15:13 2024
+++ src/distrib/i386/cdroms/spec.in	Tue May 14 13:15:13 2024
@@ -0,0 +1,6 @@
+./boot 		type=file uname=root gname=wheel mode=644
+./install.sh 	type=file uname=root gname=wheel mode=755
+./mnt2 		type=dir  uname=root gname=wheel mode=755
+./netbsd 	type=file uname=root gname=wheel mode=644
+./targetroot 	type=dir  uname=root gname=wheel mode=755
+./etc/gettytab 	type=link uname=root gname=wheel mode=755



CVS commit: src/distrib/i386/cdroms

2024-05-14 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue May 14 17:15:13 UTC 2024

Modified Files:
src/distrib/i386/cdroms: Makefile.cdrom
Added Files:
src/distrib/i386/cdroms: spec.in

Log Message:
Add the same extra stuff from amd64


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r0 -r1.1 src/distrib/i386/cdroms/spec.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/amd64/cdroms

2024-05-14 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue May 14 14:58:41 UTC 2024

Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
Added Files:
src/distrib/amd64/cdroms: spec.in

Log Message:
Add the extra spec for the amd64 cdroms


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r0 -r1.1 src/distrib/amd64/cdroms/spec.in

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/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.28 src/distrib/amd64/cdroms/Makefile.cdrom:1.29
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.28	Fri Apr 26 13:36:32 2024
+++ src/distrib/amd64/cdroms/Makefile.cdrom	Tue May 14 10:58:41 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.28 2024/04/26 17:36:32 nia Exp $
+# $NetBSD: Makefile.cdrom,v 1.29 2024/05/14 14:58:41 christos Exp $
 
 .include 
 .include 
@@ -22,6 +22,8 @@ CD_SETS+=	base etc gpufw
 CD_SETS+=	modules
 .endif
 
+SPEC_EXTRA:=${.PARSEDIR}/spec.in
+
 ${EFIBOOTIMG}: ${DESTDIR}/usr/mdec/bootx64.efi ${DESTDIR}/usr/mdec/bootia32.efi
 	${RM} -f ${EFIBOOTIMG}
 	${RM} -rf efiboot/EFI/boot

Added files:

Index: src/distrib/amd64/cdroms/spec.in
diff -u /dev/null src/distrib/amd64/cdroms/spec.in:1.1
--- /dev/null	Tue May 14 10:58:41 2024
+++ src/distrib/amd64/cdroms/spec.in	Tue May 14 10:58:41 2024
@@ -0,0 +1,6 @@
+./boot 		type=file uname=root gname=wheel mode=644
+./install.sh 	type=file uname=root gname=wheel mode=755
+./mnt2 		type=dir  uname=root gname=wheel mode=755
+./netbsd 	type=file uname=root gname=wheel mode=644
+./targetroot 	type=dir  uname=root gname=wheel mode=755
+./etc/gettytab 	type=link uname=root gname=wheel mode=755



CVS commit: src/distrib/amd64/cdroms

2024-05-14 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue May 14 14:58:41 UTC 2024

Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
Added Files:
src/distrib/amd64/cdroms: spec.in

Log Message:
Add the extra spec for the amd64 cdroms


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r0 -r1.1 src/distrib/amd64/cdroms/spec.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/common

2024-05-14 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue May 14 14:58:05 UTC 2024

Modified Files:
src/distrib/common: Makefile.bootcd

Log Message:
Put back -xx (this will break some archs but we'll fix them) and automatically
generate the spec for the machine-specific portions of the cdrom.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/distrib/common/Makefile.bootcd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/common

2024-05-14 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue May 14 14:58:05 UTC 2024

Modified Files:
src/distrib/common: Makefile.bootcd

Log Message:
Put back -xx (this will break some archs but we'll fix them) and automatically
generate the spec for the machine-specific portions of the cdrom.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/distrib/common/Makefile.bootcd

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.52 src/distrib/common/Makefile.bootcd:1.53
--- src/distrib/common/Makefile.bootcd:1.52	Thu May  9 12:09:03 2024
+++ src/distrib/common/Makefile.bootcd	Tue May 14 10:58:05 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.bootcd,v 1.52 2024/05/09 16:09:03 christos Exp $
+#	$NetBSD: Makefile.bootcd,v 1.53 2024/05/14 14:58:05 christos Exp $
 #
 # Makefile snipped to create a CD/DVD ISO
 #
@@ -285,7 +285,7 @@ copy-releasedir:
 	fi;\
 	${CDSETSCMD} ./maketars -i "${CUROBJDIR}/cdrom"			\
 	${CD_METALOG.unpriv} ${mtunpriv} -N ${NETBSDSRCDIR}/etc	\
-	-F "${CUROBJDIR}/cdrom/etc/mtree" \
+	-xx -F "${CUROBJDIR}/cdrom/etc/mtree" 			\
 	-d "${DESTDIR:S,^$,/,}" ${set}
 .endfor
 	if [ -d "${CUROBJDIR}/cdrom/var/spool/ftp/hidden" ]; then	\
@@ -322,8 +322,12 @@ image:
 .if defined(SPEC_EXTRA)
 	cat ${SPEC_EXTRA} >> ${WORKSPEC}
 .endif
-	if [ ! -s ${WORKSPEC} ]; then ${MAKESPEC} cdrom > ${WORKSPEC}; fi
-	${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 -F ${WORKSPEC} \
+	if [ ! -s ${WORKSPEC} ]; then \
+	${MAKESPEC} -d cdrom . > ${WORKSPEC}; \
+	else \
+	${MAKESPEC} -d cdrom ${MACHINE} >> ${WORKSPEC}; \
+	fi
+	${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 -F ${WORKSPEC} -xx \
 	${MAKEFS_TIMESTAMP} ${CDMAKEFSEXTRAOPTS} -o ${_CDMAKEFSOPTIONS:Q} \
 	${CDIMAGE} cdrom
 



CVS commit: src/distrib/sets/lists/xcomp

2024-05-13 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon May 13 14:59:31 UTC 2024

Modified Files:
src/distrib/sets/lists/xcomp: shl.mi

Log Message:
more Xf86misc obsolete


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/distrib/sets/lists/xcomp/shl.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/xcomp/shl.mi
diff -u src/distrib/sets/lists/xcomp/shl.mi:1.57 src/distrib/sets/lists/xcomp/shl.mi:1.58
--- src/distrib/sets/lists/xcomp/shl.mi:1.57	Thu Jul 14 03:41:49 2022
+++ src/distrib/sets/lists/xcomp/shl.mi	Mon May 13 10:59:31 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: shl.mi,v 1.57 2022/07/14 07:41:49 mrg Exp $
+#	$NetBSD: shl.mi,v 1.58 2024/05/13 14:59:31 christos Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -50,7 +50,7 @@
 ./usr/X11R7/lib/libXvMC_pic.axcomp-libXvMC-lib	xorg,picinstall,compatx11file
 ./usr/X11R7/lib/libXv_pic.axcomp-libXv-lib	xorg,picinstall,compatx11file
 ./usr/X11R7/lib/libXxf86dga_pic.a			xcomp-libXxf86dga-lib	xorg,picinstall,compatx11file
-./usr/X11R7/lib/libXxf86misc_pic.a			xcomp-libXxf86misc-lib	xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXxf86misc_pic.a			xcomp-obsolete	obsolete
 ./usr/X11R7/lib/libXxf86vm_pic.a			xcomp-libXxf86vm-lib	xorg,picinstall,compatx11file
 ./usr/X11R7/lib/libdrm_pic.axcomp-libdrm-lib	xorg,picinstall,compatx11file
 ./usr/X11R7/lib/libdrm_radeon_pic.a			xcomp-libdrm_radeon-lib	xorg,picinstall,compatx11file



CVS commit: src/distrib/sets/lists/xcomp

2024-05-13 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon May 13 14:59:31 UTC 2024

Modified Files:
src/distrib/sets/lists/xcomp: shl.mi

Log Message:
more Xf86misc obsolete


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/distrib/sets/lists/xcomp/shl.mi

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

2024-05-13 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon May 13 14:56:44 UTC 2024

Modified Files:
src/distrib/sets/lists/xcomp: mi
src/distrib/sets/lists/xdebug: mi

Log Message:
mark more of libXxf86misc obsolete


To generate a diff of this commit:
cvs rdiff -u -r1.242 -r1.243 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.46 -r1.47 src/distrib/sets/lists/xdebug/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/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.242 src/distrib/sets/lists/xcomp/mi:1.243
--- src/distrib/sets/lists/xcomp/mi:1.242	Thu May  9 02:38:27 2024
+++ src/distrib/sets/lists/xcomp/mi	Mon May 13 10:56:44 2024
@@ -1,4 +1,4 @@
-#	 $NetBSD: mi,v 1.242 2024/05/09 06:38:27 nia Exp $
+#	 $NetBSD: mi,v 1.243 2024/05/13 14:56:44 christos Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -5962,7 +5962,7 @@
 ./usr/libdata/lint/llib-lXvMC.ln			xcomp-libXvMC-lintlib	lint,xorg
 ./usr/libdata/lint/llib-lXvMCW.ln			xcomp-libXvMCW-lintlib	lint,xorg
 ./usr/libdata/lint/llib-lXxf86dga.ln			xcomp-libXxf86dga-lintlib	lint,xorg
-./usr/libdata/lint/llib-lXxf86misc.ln			xcomp-libXxf86misc-lintlib	lint,xorg
+./usr/libdata/lint/llib-lXxf86misc.ln			xcomp-obsolete	obsolete
 ./usr/libdata/lint/llib-lXxf86vm.ln			xcomp-libXxf86vm-lintlib	lint,xorg
 ./usr/libdata/lint/llib-ldrm.lnxcomp-libdrm-lintlib	lint,xorg
 ./usr/libdata/lint/llib-ldrm_radeon.ln			xcomp-libdrm_radeon-lintlib	lint,xorg

Index: src/distrib/sets/lists/xdebug/mi
diff -u src/distrib/sets/lists/xdebug/mi:1.46 src/distrib/sets/lists/xdebug/mi:1.47
--- src/distrib/sets/lists/xdebug/mi:1.46	Sat Feb  4 11:34:36 2023
+++ src/distrib/sets/lists/xdebug/mi	Mon May 13 10:56:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.46 2023/02/04 16:34:36 wiz Exp $
+# $NetBSD: mi,v 1.47 2024/05/13 14:56:44 christos Exp $
 ./etc/mtree/set.xdebug	comp-sys-root
 ./usr/X11R7/lib		base-x11-root	xorg,debuglib,compatx11dir
 ./usr/X11R7/lib/libEGL_g.axdebug-libEGL-debuglib	xorg,debuglib,compatx11file,xorg_glamor
@@ -48,7 +48,7 @@
 ./usr/X11R7/lib/libXvMC_g.axdebug-libXvMC-debuglib	xorg,debuglib,compatx11file
 ./usr/X11R7/lib/libXv_g.axdebug-libXv-debuglib	xorg,debuglib,compatx11file
 ./usr/X11R7/lib/libXxf86dga_g.axdebug-libXxf86dga-debuglib	xorg,debuglib,compatx11file
-./usr/X11R7/lib/libXxf86misc_g.a			xdebug-libXxf86misc-debuglib	xorg,debuglib,compatx11file
+./usr/X11R7/lib/libXxf86misc_g.a			xdebug-obsolete	obsolete
 ./usr/X11R7/lib/libXxf86vm_g.axdebug-libXxf86vm-debuglib	xorg,debuglib,compatx11file
 ./usr/X11R7/lib/libdrm_g.axdebug-libdrm-debuglib	xorg,debuglib,compatx11file
 ./usr/X11R7/lib/libdrm_radeon_g.a			xdebug-libdrm_radeon-debuglib	xorg,debuglib,compatx11file



CVS commit: src/distrib/sets/lists

2024-05-13 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon May 13 14:56:44 UTC 2024

Modified Files:
src/distrib/sets/lists/xcomp: mi
src/distrib/sets/lists/xdebug: mi

Log Message:
mark more of libXxf86misc obsolete


To generate a diff of this commit:
cvs rdiff -u -r1.242 -r1.243 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.46 -r1.47 src/distrib/sets/lists/xdebug/mi

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

2024-05-11 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Sat May 11 07:34:34 UTC 2024

Modified Files:
src/distrib/sets/lists/debug: module.ad.aarch64

Log Message:
Fix aarch64 build


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/debug/module.ad.aarch64

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/module.ad.aarch64
diff -u src/distrib/sets/lists/debug/module.ad.aarch64:1.6 src/distrib/sets/lists/debug/module.ad.aarch64:1.7
--- src/distrib/sets/lists/debug/module.ad.aarch64:1.6	Tue Apr 11 10:30:41 2023
+++ src/distrib/sets/lists/debug/module.ad.aarch64	Sat May 11 07:34:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: module.ad.aarch64,v 1.6 2023/04/11 10:30:41 riastradh Exp $
+# $NetBSD: module.ad.aarch64,v 1.7 2024/05/11 07:34:33 mlelstv Exp $
 ./usr/libdata/debug/@MODULEDIR@/amdgpumodules-base-kernel kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/amdgpu/amdgpu.kmod.debug	modules-base-kernel kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/bpfjitmodules-base-kernel	kmod,sljit,debug
@@ -73,3 +73,5 @@
 ./usr/libdata/debug/@MODULEDIR@/exec_elf64/exec_elf64.kmod.debug	modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/sljitmodules-base-kernel	kmod,sljit,debug
 ./usr/libdata/debug/@MODULEDIR@/sljit/sljit.kmod.debug			modules-base-kernel	kmod,sljit,debug
+./usr/libdata/debug/@MODULEDIR@/vmtmodules-base-kernel	kmod,debug
+./usr/libdata/debug/@MODULEDIR@/vmt/vmt.kmod.debug			modules-base-kernel	kmod,debug



CVS commit: src/distrib/sets/lists/debug

2024-05-11 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Sat May 11 07:34:34 UTC 2024

Modified Files:
src/distrib/sets/lists/debug: module.ad.aarch64

Log Message:
Fix aarch64 build


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/debug/module.ad.aarch64

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/miniroot

2024-05-11 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Sat May 11 06:31:59 UTC 2024

Modified Files:
src/distrib/miniroot: install.sub

Log Message:
s/timestemps/timestamps/ in comments.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/distrib/miniroot/install.sub

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/miniroot/install.sub
diff -u src/distrib/miniroot/install.sub:1.65 src/distrib/miniroot/install.sub:1.66
--- src/distrib/miniroot/install.sub:1.65	Sat Jul 29 15:46:45 2023
+++ src/distrib/miniroot/install.sub	Sat May 11 06:31:59 2024
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$NetBSD: install.sub,v 1.65 2023/07/29 15:46:45 tsutsui Exp $
+#	$NetBSD: install.sub,v 1.66 2024/05/11 06:31:59 andvar Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1613,12 +1613,12 @@ mi_mount_kernfs() {
 }
 
 mi_filter_msgbuf() {
-	# Remove timestemps, sort.
+	# Remove timestamps, sort.
 	sed -e 's/^\[[0-9. ]*\] //' < /kern/msgbuf | sort -u
 }
 
 mi_filter_dmesg() {
-	# Remove timestemps, sort.
+	# Remove timestamps, sort.
 	dmesg | awk '{ h=$0; gsub("^[[0-9. ]*] ", "", h); print h; }' \
 	| sort -u
 }



CVS commit: src/distrib/miniroot

2024-05-11 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Sat May 11 06:31:59 UTC 2024

Modified Files:
src/distrib/miniroot: install.sub

Log Message:
s/timestemps/timestamps/ in comments.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/distrib/miniroot/install.sub

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/xdebug

2024-05-10 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Fri May 10 12:24:08 UTC 2024

Modified Files:
src/distrib/sets/lists/xdebug: shl.mi

Log Message:
xdebug/shl.mi: Delete libXxf86misc.so.2.0.debug.

Loading existing applications that linked against this into a
debugger should continue to work, so it shouldn't be obsoleted, but
the file is no longer installed.


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/distrib/sets/lists/xdebug/shl.mi

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/xdebug

2024-05-10 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Fri May 10 12:24:08 UTC 2024

Modified Files:
src/distrib/sets/lists/xdebug: shl.mi

Log Message:
xdebug/shl.mi: Delete libXxf86misc.so.2.0.debug.

Loading existing applications that linked against this into a
debugger should continue to work, so it shouldn't be obsoleted, but
the file is no longer installed.


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/distrib/sets/lists/xdebug/shl.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/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.69 src/distrib/sets/lists/xdebug/shl.mi:1.70
--- src/distrib/sets/lists/xdebug/shl.mi:1.69	Mon Sep  4 19:07:59 2023
+++ src/distrib/sets/lists/xdebug/shl.mi	Fri May 10 12:24:08 2024
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.69 2023/09/04 19:07:59 riastradh Exp $
+# $NetBSD: shl.mi,v 1.70 2024/05/10 12:24:08 riastradh Exp $
 ./usr/libdata/debug/usr/X11R7/lib	base-sys-usr		xorg,debug,compatx11dir
 ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug	obsolete		obsolete
 ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug	obsolete		obsolete
@@ -50,7 +50,6 @@
 ./usr/libdata/debug/usr/X11R7/lib/libXvMC.so.2.0.debug	xdebug-libXvMC-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libXvMCW.so.1.0.debug	xdebug-libXvMCW-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libXxf86dga.so.2.0.debug	xdebug-libXxf86dga-debug		xorg,debug,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/libXxf86misc.so.2.0.debug	xdebug-libXxf86misc-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libXxf86vm.so.2.0.debug	xdebug-libXxf86vm-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libdrm.so.3.7.debug	xdebug-libdrm-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libdrm_radeon.so.0.0.debug	xdebug-libdrm_radeon-debug		xorg,debug,compatx11file



CVS commit: src/distrib/sets/lists/xbase

2024-05-10 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Fri May 10 12:21:49 UTC 2024

Modified Files:
src/distrib/sets/lists/xbase: shl.mi

Log Message:
xbase/shl.mi: Delete, rather than obsolete, libXxf86misc.so.M(.N).

Obsolete lines here will lead postinstall to delete the shlib, which
will break any existing applications linked against it.  Deleting the
lines has no effect on postinstall.

(We should maybe have a different way to mark them instead, as
suggested in PR 57581, but we don't, so this is what we do for now.)

However, keep the obsolete line for libXxf86misc.so, since the .so
symlink itself is only used when linking new applications.


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/distrib/sets/lists/xbase/shl.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/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.105 src/distrib/sets/lists/xbase/shl.mi:1.106
--- src/distrib/sets/lists/xbase/shl.mi:1.105	Fri May 10 12:18:16 2024
+++ src/distrib/sets/lists/xbase/shl.mi	Fri May 10 12:21:49 2024
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.105 2024/05/10 12:18:16 riastradh Exp $
+# $NetBSD: shl.mi,v 1.106 2024/05/10 12:21:49 riastradh Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -152,8 +152,6 @@
 ./usr/X11R7/lib/libXxf86dga.so.2		xbase-libXxf86dga-lib		xorg,compatx11file
 ./usr/X11R7/lib/libXxf86dga.so.2.0		xbase-libXxf86dga-lib		xorg,compatx11file
 ./usr/X11R7/lib/libXxf86misc.so			xbase-obsolete		obsolete
-./usr/X11R7/lib/libXxf86misc.so.2		xbase-obsolete		obsolete
-./usr/X11R7/lib/libXxf86misc.so.2.0		xbase-obsolete		obsolete
 ./usr/X11R7/lib/libXxf86vm.so			xbase-libXxf86vm-lib		xorg,compatx11file
 ./usr/X11R7/lib/libXxf86vm.so.2			xbase-libXxf86vm-lib		xorg,compatx11file
 ./usr/X11R7/lib/libXxf86vm.so.2.0		xbase-libXxf86vm-lib		xorg,compatx11file



CVS commit: src/distrib/sets/lists/xbase

2024-05-10 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Fri May 10 12:21:49 UTC 2024

Modified Files:
src/distrib/sets/lists/xbase: shl.mi

Log Message:
xbase/shl.mi: Delete, rather than obsolete, libXxf86misc.so.M(.N).

Obsolete lines here will lead postinstall to delete the shlib, which
will break any existing applications linked against it.  Deleting the
lines has no effect on postinstall.

(We should maybe have a different way to mark them instead, as
suggested in PR 57581, but we don't, so this is what we do for now.)

However, keep the obsolete line for libXxf86misc.so, since the .so
symlink itself is only used when linking new applications.


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/distrib/sets/lists/xbase/shl.mi

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/xbase

2024-05-10 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Fri May 10 12:18:16 UTC 2024

Modified Files:
src/distrib/sets/lists/xbase: shl.mi

Log Message:
xbase/shl.mi: Copy comment about delete vs obsolete from base/shl.mi.


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/distrib/sets/lists/xbase/shl.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/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.104 src/distrib/sets/lists/xbase/shl.mi:1.105
--- src/distrib/sets/lists/xbase/shl.mi:1.104	Thu May  9 06:38:27 2024
+++ src/distrib/sets/lists/xbase/shl.mi	Fri May 10 12:18:16 2024
@@ -1,6 +1,15 @@
-# $NetBSD: shl.mi,v 1.104 2024/05/09 06:38:27 nia Exp $
+# $NetBSD: shl.mi,v 1.105 2024/05/10 12:18:16 riastradh Exp $
 #
-# Note: don't delete entries from here - mark them as "obsolete" instead.
+# Note:	Don't delete entries from here - mark them as "obsolete" instead,
+#	unless otherwise stated below.
+#
+# Note:	Do not mark "old" major and major.minor shared libraries as
+#	"obsolete"; just remove the entry, as third-party applications
+#	may be linked against the old major shared library, and
+#	that is a symlink to the old major.minor shared library.
+#	e.g., "lib.so." and "lib.so.."
+#	Exceptions to this rule may include shared libraries that
+#	are dlopen()ed at run-time, such as extra locales, etc.
 #
 ./usr/X11R7/lib/X11/locale/lib/common/ximcp.so		obsolete	obsolete
 ./usr/X11R7/lib/X11/locale/lib/common/ximcp.so.2	obsolete	obsolete



CVS commit: src/distrib/sets/lists/xbase

2024-05-10 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Fri May 10 12:18:16 UTC 2024

Modified Files:
src/distrib/sets/lists/xbase: shl.mi

Log Message:
xbase/shl.mi: Copy comment about delete vs obsolete from base/shl.mi.


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/distrib/sets/lists/xbase/shl.mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



Re: CVS commit: src/distrib/common

2024-05-09 Thread Robert Elz
Date:Thu, 9 May 2024 17:44:16 -0400
From:Christos Zoulas 
Message-ID:  <9c618434-9d7b-4f1c-97ed-3260b7f36...@zoulas.com>

  | I am not sure either but the resulting cd does not boot anymore.

Which version?   It has been a long time since I needed to boot
from an optical drive, but I could try it.

Its a little hard to believe that the uid/gid settings could make
any difference, though the m9de settings might.

kre


Re: CVS commit: src/distrib/common

2024-05-09 Thread Christos Zoulas



> On May 9, 2024, at 5:37 PM, Robert Elz  wrote:
> 
> Date:Thu, 9 May 2024 12:09:03 -0400
>From:"Christos Zoulas" 
>Message-ID:  <20240509160903.6e41bf...@cvs.netbsd.org>
> 
>  | Instead of augmenting the platform spec with an autogenerated one,
>  | we should understand why we have missing entries in the first place.
> 
> Is it really important?   Everything was fine without it previously,
> except that reproducible builds, weren't (as local info was being
> used in the CD images).
> 
> As long as the "augmenting" is just providing info for files that
> weren't otherwise specified (an issue I admit to not checking in the
> change I made) - that is, as long as makefs takes the first entry in
> the spec file it is given, should there be more than one for a file
> (if it prefers to use the last, then that would just change the order
> in which the augmentation file is included, no need to change makefs)
> then I'm not really sure what the problem is.

I am not sure either but the resulting cd does not boot anymore. I am trying to 
understand why. If augmenting works as you describe, there is more problem...

christos
> 
> That is, I don't see we need to add yet another manual maintenance step
> that we need to make in order to add or remove a file from a CD image
> (or whatever the image is destined for) when the information being added
> isn't really important - but just needs to be consistent.
> 
> kre



Re: CVS commit: src/distrib/common

2024-05-09 Thread Robert Elz
Date:Thu, 9 May 2024 12:09:03 -0400
From:"Christos Zoulas" 
Message-ID:  <20240509160903.6e41bf...@cvs.netbsd.org>

  | Instead of augmenting the platform spec with an autogenerated one,
  | we should understand why we have missing entries in the first place.

Is it really important?   Everything was fine without it previously,
except that reproducible builds, weren't (as local info was being
used in the CD images).

As long as the "augmenting" is just providing info for files that
weren't otherwise specified (an issue I admit to not checking in the
change I made) - that is, as long as makefs takes the first entry in
the spec file it is given, should there be more than one for a file
(if it prefers to use the last, then that would just change the order
in which the augmentation file is included, no need to change makefs)
then I'm not really sure what the problem is.

That is, I don't see we need to add yet another manual maintenance step
that we need to make in order to add or remove a file from a CD image
(or whatever the image is destined for) when the information being added
isn't really important - but just needs to be consistent.

kre



CVS commit: src/distrib/common

2024-05-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu May  9 16:09:03 UTC 2024

Modified Files:
src/distrib/common: Makefile.bootcd

Log Message:
Remove the -xx, now we have the list of 20 platforms that have incomplete
fspecs. Instead of augmenting the platform spec with an autogenerated one,
we should understand why we have missing entries in the first place.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/distrib/common/Makefile.bootcd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/common

2024-05-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu May  9 16:09:03 UTC 2024

Modified Files:
src/distrib/common: Makefile.bootcd

Log Message:
Remove the -xx, now we have the list of 20 platforms that have incomplete
fspecs. Instead of augmenting the platform spec with an autogenerated one,
we should understand why we have missing entries in the first place.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/distrib/common/Makefile.bootcd

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.51 src/distrib/common/Makefile.bootcd:1.52
--- src/distrib/common/Makefile.bootcd:1.51	Wed May  8 23:41:05 2024
+++ src/distrib/common/Makefile.bootcd	Thu May  9 12:09:03 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.bootcd,v 1.51 2024/05/09 03:41:05 kre Exp $
+#	$NetBSD: Makefile.bootcd,v 1.52 2024/05/09 16:09:03 christos Exp $
 #
 # Makefile snipped to create a CD/DVD ISO
 #
@@ -285,7 +285,7 @@ copy-releasedir:
 	fi;\
 	${CDSETSCMD} ./maketars -i "${CUROBJDIR}/cdrom"			\
 	${CD_METALOG.unpriv} ${mtunpriv} -N ${NETBSDSRCDIR}/etc	\
-	-F "${CUROBJDIR}/cdrom/etc/mtree" -xx			\
+	-F "${CUROBJDIR}/cdrom/etc/mtree" \
 	-d "${DESTDIR:S,^$,/,}" ${set}
 .endfor
 	if [ -d "${CUROBJDIR}/cdrom/var/spool/ftp/hidden" ]; then	\
@@ -322,8 +322,8 @@ image:
 .if defined(SPEC_EXTRA)
 	cat ${SPEC_EXTRA} >> ${WORKSPEC}
 .endif
-	${MAKESPEC} cdrom >> ${WORKSPEC}
-	${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 -F ${WORKSPEC} -xx \
+	if [ ! -s ${WORKSPEC} ]; then ${MAKESPEC} cdrom > ${WORKSPEC}; fi
+	${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 -F ${WORKSPEC} \
 	${MAKEFS_TIMESTAMP} ${CDMAKEFSEXTRAOPTS} -o ${_CDMAKEFSOPTIONS:Q} \
 	${CDIMAGE} cdrom
 



CVS commit: src/distrib/sets/lists

2024-05-09 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Thu May  9 15:54:58 UTC 2024

Modified Files:
src/distrib/sets/lists/base32: ad.riscv64
src/distrib/sets/lists/debug32: ad.riscv64

Log Message:
fix gcc 12 builds.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/base32/ad.riscv64
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/debug32/ad.riscv64

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/base32/ad.riscv64
diff -u src/distrib/sets/lists/base32/ad.riscv64:1.5 src/distrib/sets/lists/base32/ad.riscv64:1.6
--- src/distrib/sets/lists/base32/ad.riscv64:1.5	Mon May  6 08:38:51 2024
+++ src/distrib/sets/lists/base32/ad.riscv64	Thu May  9 15:54:58 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.riscv64,v 1.5 2024/05/06 08:38:51 mrg Exp $
+# $NetBSD: ad.riscv64,v 1.6 2024/05/09 15:54:58 mrg Exp $
 ./lib/rv32	base-compat-shlib	compat
 ./lib/rv32/npf	base-compat-shlib	compat,npf
 ./lib/rv32/npf/ext_log.so			base-compat-shlib	compat,npf
@@ -88,8 +88,10 @@
 ./usr/lib/rv32/libarchive.so.5			base-compat-shlib	compat
 ./usr/lib/rv32/libarchive.so.5.0		base-compat-shlib	compat
 ./usr/lib/rv32/libasan.so			base-compat-shlib	compat,gcc,cxx
-./usr/lib/rv32/libasan.so.5			base-compat-shlib	compat,gcc,cxx
-./usr/lib/rv32/libasan.so.5.0			base-compat-shlib	compat,gcc,cxx
+./usr/lib/rv32/libasan.so.5			base-compat-shlib	compat,gcc=10,cxx
+./usr/lib/rv32/libasan.so.5.0			base-compat-shlib	compat,gcc=10,cxx
+./usr/lib/rv32/libasan.so.6			base-compat-shlib	compat,gcc=12,cxx
+./usr/lib/rv32/libasan.so.6.0			base-compat-shlib	compat,gcc=12,cxx
 ./usr/lib/rv32/libasn1.so			base-compat-shlib	compat,kerberos
 ./usr/lib/rv32/libasn1.so.10			base-compat-shlib	compat,kerberos
 ./usr/lib/rv32/libasn1.so.10.0			base-compat-shlib	compat,kerberos
@@ -198,8 +200,10 @@
 ./usr/lib/rv32/libgnumalloc.so.1		base-compat-shlib	compat
 ./usr/lib/rv32/libgnumalloc.so.1.0		base-compat-shlib	compat
 ./usr/lib/rv32/libgomp.so			base-compat-shlib	compat,gcc
-./usr/lib/rv32/libgomp.so.2			base-compat-shlib	compat,gcc
-./usr/lib/rv32/libgomp.so.2.1			base-compat-shlib	compat,gcc
+./usr/lib/rv32/libgomp.so.2			base-compat-shlib	compat,gcc=10
+./usr/lib/rv32/libgomp.so.2.1			base-compat-shlib	compat,gcc=10
+./usr/lib/rv32/libgomp.so.2			base-compat-shlib	compat,gcc=12
+./usr/lib/rv32/libgomp.so.2.2			base-compat-shlib	compat,gcc=12
 ./usr/lib/rv32/libgssapi.so			base-compat-shlib	compat,kerberos
 ./usr/lib/rv32/libgssapi.so.12			base-compat-shlib	compat,kerberos
 ./usr/lib/rv32/libgssapi.so.12.0		base-compat-shlib	compat,kerberos
@@ -270,8 +274,10 @@
 ./usr/lib/rv32/libldap_r.so.6			base-compat-shlib	compat,ldap
 ./usr/lib/rv32/libldap_r.so.6.0		base-compat-shlib	compat,ldap
 ./usr/lib/rv32/liblsan.so			base-compat-shlib	compat,cxx,gcc
-./usr/lib/rv32/liblsan.so.2			base-compat-shlib	compat,cxx,gcc
-./usr/lib/rv32/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcc
+./usr/lib/rv32/liblsan.so.2			base-compat-shlib	compat,cxx,gcc=10
+./usr/lib/rv32/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcc=10
+./usr/lib/rv32/liblsan.so.3			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/rv32/liblsan.so.3.0			base-compat-shlib	compat,cxx,gcc=12
 ./usr/lib/rv32/liblua.so			base-compat-shlib	compat
 ./usr/lib/rv32/liblua.so.6			base-compat-shlib	compat
 ./usr/lib/rv32/liblua.so.6.1			base-compat-shlib	compat
@@ -418,7 +424,8 @@
 ./usr/lib/rv32/libssl.so.15.0			base-compat-shlib	compat
 ./usr/lib/rv32/libstdc++.so			base-compat-shlib	compat,gcc,cxx,libstdcxx
 ./usr/lib/rv32/libstdc++.so.9			base-compat-shlib	compat,gcc,cxx,libstdcxx
-./usr/lib/rv32/libstdc++.so.9.0		base-compat-shlib	compat,gcc,cxx,libstdcxx
+./usr/lib/rv32/libstdc++.so.9.0			base-compat-shlib	compat,gcc=10,cxx,libstdcxx
+./usr/lib/rv32/libstdc++.so.9.1			base-compat-shlib	compat,gcc=12,cxx,libstdcxx
 ./usr/lib/rv32/libtermcap.so			base-compat-shlib	compat
 ./usr/lib/rv32/libtermcap.so.0			base-compat-shlib	compat
 ./usr/lib/rv32/libtermcap.so.0.6		base-compat-shlib	compat
@@ -432,8 +439,10 @@
 ./usr/lib/rv32/libtre.so.0			base-compat-shlib	compat
 ./usr/lib/rv32/libtre.so.0.8			base-compat-shlib	compat
 ./usr/lib/rv32/libubsan.so			base-compat-shlib	compat,gcc,cxx
-./usr/lib/rv32/libubsan.so.4			base-compat-shlib	compat,gcc,cxx
-./usr/lib/rv32/libubsan.so.4.0			base-compat-shlib	compat,gcc,cxx
+./usr/lib/rv32/libubsan.so.4			base-compat-shlib	compat,gcc=10,cxx
+./usr/lib/rv32/libubsan.so.4.0			base-compat-shlib	compat,gcc=10,cxx
+./usr/lib/rv32/libubsan.so.5			base-compat-shlib	compat,gcc=12,cxx
+./usr/lib/rv32/libubsan.so.5.0			base-compat-shlib	compat,gcc=12,cxx
 ./usr/lib/rv32/libukfs.so			base-compat-shlib	compat
 ./usr/lib/rv32/libukfs.so.1			base-compat-shlib	compat
 ./usr/lib/rv32/libukfs.so.1.0			base-compat-shlib	compat

Index: src/distrib/sets/lists/debug32/ad.riscv64
diff -u src/distrib/sets/lists/debug32/ad.riscv64:1.5 

CVS commit: src/distrib/sets/lists

2024-05-09 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Thu May  9 15:54:58 UTC 2024

Modified Files:
src/distrib/sets/lists/base32: ad.riscv64
src/distrib/sets/lists/debug32: ad.riscv64

Log Message:
fix gcc 12 builds.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/base32/ad.riscv64
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/debug32/ad.riscv64

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/common

2024-05-08 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Thu May  9 03:41:05 UTC 2024

Modified Files:
src/distrib/common: Makefile.bootcd

Log Message:
No point testing if the spec file is empty before running makespec,
the previous commands guarantee that cannot be the case, so makespec
was never being run.   Just run it unconditionally.

Seems to fix the build for me.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/distrib/common/Makefile.bootcd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/common

2024-05-08 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Thu May  9 03:41:05 UTC 2024

Modified Files:
src/distrib/common: Makefile.bootcd

Log Message:
No point testing if the spec file is empty before running makespec,
the previous commands guarantee that cannot be the case, so makespec
was never being run.   Just run it unconditionally.

Seems to fix the build for me.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/distrib/common/Makefile.bootcd

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.50 src/distrib/common/Makefile.bootcd:1.51
--- src/distrib/common/Makefile.bootcd:1.50	Wed May  8 16:08:08 2024
+++ src/distrib/common/Makefile.bootcd	Thu May  9 03:41:05 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.bootcd,v 1.50 2024/05/08 16:08:08 christos Exp $
+#	$NetBSD: Makefile.bootcd,v 1.51 2024/05/09 03:41:05 kre Exp $
 #
 # Makefile snipped to create a CD/DVD ISO
 #
@@ -322,7 +322,7 @@ image:
 .if defined(SPEC_EXTRA)
 	cat ${SPEC_EXTRA} >> ${WORKSPEC}
 .endif
-	if [ ! -s ${WORKSPEC} ]; then ${MAKESPEC} cdrom > ${WORKSPEC}; fi
+	${MAKESPEC} cdrom >> ${WORKSPEC}
 	${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 -F ${WORKSPEC} -xx \
 	${MAKEFS_TIMESTAMP} ${CDMAKEFSEXTRAOPTS} -o ${_CDMAKEFSOPTIONS:Q} \
 	${CDIMAGE} cdrom



CVS commit: src/distrib/sets/lists/debug32

2024-05-08 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Thu May  9 02:14:21 UTC 2024

Modified Files:
src/distrib/sets/lists/debug32: md.sparc64

Log Message:
fix gcc 12 support.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/debug32/md.sparc64

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/debug32/md.sparc64
diff -u src/distrib/sets/lists/debug32/md.sparc64:1.5 src/distrib/sets/lists/debug32/md.sparc64:1.6
--- src/distrib/sets/lists/debug32/md.sparc64:1.5	Tue Apr 16 19:15:36 2024
+++ src/distrib/sets/lists/debug32/md.sparc64	Thu May  9 02:14:21 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.5 2024/04/16 19:15:36 christos Exp $
+# $NetBSD: md.sparc64,v 1.6 2024/05/09 02:14:21 mrg Exp $
 ./usr/lib/sparc/i18n/libBIG5_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/sparc/i18n/libDECHanyu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/sparc/i18n/libEUCTW_g.a			comp-c-debuglib	debuglib,compat
@@ -191,7 +191,8 @@
 ./usr/libdata/debug/usr/lib/sparc/i18n/libmapper_zone.so.5.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/sparc/libamu.so.5.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/sparc/libarchive.so.5.0.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/sparc/libasan.so.5.0.debug	comp-sys-debug	debug,compat
+./usr/libdata/debug/usr/lib/sparc/libasan.so.5.0.debug	comp-sys-debug	debug,compat,gcc=10
+./usr/libdata/debug/usr/lib/sparc/libasan.so.6.0.debug	comp-sys-debug	debug,compat,gcc=12
 ./usr/libdata/debug/usr/lib/sparc/libasn1.so.10.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/sparc/libatf-c++.so.2.0.debug	comp-sys-debug	debug,compat,atf
 ./usr/libdata/debug/usr/lib/sparc/libatf-c.so.0.0.debug	comp-sys-debug	debug,compat,atf
@@ -228,7 +229,8 @@
 ./usr/libdata/debug/usr/lib/sparc/libgcc_s.so.1.0.debug	comp-sys-debug	debug,compat,gcc
 ./usr/libdata/debug/usr/lib/sparc/libgnuctf.so.1.0.debug	comp-sys-debug	debug,compat,gcc
 ./usr/libdata/debug/usr/lib/sparc/libgnumalloc.so.1.0.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/sparc/libgomp.so.2.1.debug	comp-sys-debug	debug,compat,gcc
+./usr/libdata/debug/usr/lib/sparc/libgomp.so.2.1.debug	comp-sys-debug	debug,compat,gcc=10
+./usr/libdata/debug/usr/lib/sparc/libgomp.so.2.2.debug	comp-sys-debug	debug,compat,gcc=12
 ./usr/libdata/debug/usr/lib/sparc/libgssapi.so.12.0.debug	comp-sys-debug	debug,compat,kerberos
 ./usr/libdata/debug/usr/lib/sparc/libhdb.so.16.0.debug	comp-sys-debug	debug,compat,kerberos
 ./usr/libdata/debug/usr/lib/sparc/libheimbase.so.2.0.debug	comp-sys-debug	debug,compat,kerberos
@@ -252,7 +254,8 @@
 ./usr/libdata/debug/usr/lib/sparc/liblber.so.5.0.debug	comp-sys-debug	debug,compat,ldap
 ./usr/libdata/debug/usr/lib/sparc/libldap.so.6.0.debug	comp-sys-debug	debug,compat,ldap
 ./usr/libdata/debug/usr/lib/sparc/libldap_r.so.6.0.debug	comp-sys-debug	debug,compat,ldap
-./usr/libdata/debug/usr/lib/sparc/liblsan.so.2.0.debug	comp-sys-debug	debug,compat
+./usr/libdata/debug/usr/lib/sparc/liblsan.so.2.0.debug	comp-sys-debug	debug,compat,gcc=10
+./usr/libdata/debug/usr/lib/sparc/liblsan.so.3.0.debug	comp-sys-debug	debug,compat,gcc=12
 ./usr/libdata/debug/usr/lib/sparc/liblua.so.6.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/sparc/liblzf.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/sparc/liblzma.so.2.0.debug	comp-sys-debug	debug,compat
@@ -301,10 +304,12 @@
 ./usr/libdata/debug/usr/lib/sparc/libsqlite3.so.1.5.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/sparc/libssh.so.46.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/sparc/libssl.so.15.0.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/sparc/libstdc++.so.9.0.debug	comp-sys-debug	debug,compat
+./usr/libdata/debug/usr/lib/sparc/libstdc++.so.9.0.debug	comp-sys-debug	debug,compat,gcc=10
+./usr/libdata/debug/usr/lib/sparc/libstdc++.so.9.1.debug	comp-sys-debug	debug,compat,gcc=12
 ./usr/libdata/debug/usr/lib/sparc/libterminfo.so.2.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/sparc/libtre.so.0.8.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/sparc/libubsan.so.4.0.debug	comp-sys-debug	debug,compat
+./usr/libdata/debug/usr/lib/sparc/libubsan.so.4.0.debug	comp-sys-debug	debug,compat,gcc=10
+./usr/libdata/debug/usr/lib/sparc/libubsan.so.5.0.debug	comp-sys-debug	debug,compat,gcc=12
 ./usr/libdata/debug/usr/lib/sparc/libukfs.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/sparc/libumem.so.0.0.debug	comp-sys-debug	debug,compat,zfs
 ./usr/libdata/debug/usr/lib/sparc/libunbound.so.9.0.debug	comp-sys-debug	debug,compat,unbound



CVS commit: src/distrib/sets/lists/debug32

2024-05-08 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Thu May  9 02:14:21 UTC 2024

Modified Files:
src/distrib/sets/lists/debug32: md.sparc64

Log Message:
fix gcc 12 support.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/debug32/md.sparc64

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/common

2024-05-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed May  8 16:08:08 UTC 2024

Modified Files:
src/distrib/common: Makefile.bootcd

Log Message:
Fail on incomplete mtree specs


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/distrib/common/Makefile.bootcd

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.49 src/distrib/common/Makefile.bootcd:1.50
--- src/distrib/common/Makefile.bootcd:1.49	Tue May  7 16:33:20 2024
+++ src/distrib/common/Makefile.bootcd	Wed May  8 12:08:08 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.bootcd,v 1.49 2024/05/07 20:33:20 christos Exp $
+#	$NetBSD: Makefile.bootcd,v 1.50 2024/05/08 16:08:08 christos Exp $
 #
 # Makefile snipped to create a CD/DVD ISO
 #
@@ -285,7 +285,7 @@ copy-releasedir:
 	fi;\
 	${CDSETSCMD} ./maketars -i "${CUROBJDIR}/cdrom"			\
 	${CD_METALOG.unpriv} ${mtunpriv} -N ${NETBSDSRCDIR}/etc	\
-	-F "${CUROBJDIR}/cdrom/etc/mtree"\
+	-F "${CUROBJDIR}/cdrom/etc/mtree" -xx			\
 	-d "${DESTDIR:S,^$,/,}" ${set}
 .endfor
 	if [ -d "${CUROBJDIR}/cdrom/var/spool/ftp/hidden" ]; then	\
@@ -323,8 +323,9 @@ image:
 	cat ${SPEC_EXTRA} >> ${WORKSPEC}
 .endif
 	if [ ! -s ${WORKSPEC} ]; then ${MAKESPEC} cdrom > ${WORKSPEC}; fi
-	${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 -F ${WORKSPEC} 	\
-		${MAKEFS_TIMESTAMP} ${CDMAKEFSEXTRAOPTS} -o ${_CDMAKEFSOPTIONS:Q} ${CDIMAGE} cdrom
+	${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 -F ${WORKSPEC} -xx \
+	${MAKEFS_TIMESTAMP} ${CDMAKEFSEXTRAOPTS} -o ${_CDMAKEFSOPTIONS:Q} \
+	${CDIMAGE} cdrom
 
 .if ${CDRELEASE} == false
 release: prepare .WAIT prepare_md_post .WAIT copy-releasedir .WAIT image_md_pre .WAIT image .WAIT image_md_post



CVS commit: src/distrib/common

2024-05-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed May  8 16:08:08 UTC 2024

Modified Files:
src/distrib/common: Makefile.bootcd

Log Message:
Fail on incomplete mtree specs


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/distrib/common/Makefile.bootcd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/common

2024-05-07 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue May  7 20:33:20 UTC 2024

Modified Files:
src/distrib/common: Makefile.bootcd

Log Message:
PR/58196: Jan-Benedict Glaw: If there was no spec file specified, generate
one on the fly. Should fix reproducible builds where the mode and the
ownership/group is not fixed and picked up from the filesystem.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/distrib/common/Makefile.bootcd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/common

2024-05-07 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue May  7 20:33:20 UTC 2024

Modified Files:
src/distrib/common: Makefile.bootcd

Log Message:
PR/58196: Jan-Benedict Glaw: If there was no spec file specified, generate
one on the fly. Should fix reproducible builds where the mode and the
ownership/group is not fixed and picked up from the filesystem.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/distrib/common/Makefile.bootcd

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.48 src/distrib/common/Makefile.bootcd:1.49
--- src/distrib/common/Makefile.bootcd:1.48	Thu Apr 25 07:56:51 2024
+++ src/distrib/common/Makefile.bootcd	Tue May  7 16:33:20 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.bootcd,v 1.48 2024/04/25 11:56:51 nia Exp $
+#	$NetBSD: Makefile.bootcd,v 1.49 2024/05/07 20:33:20 christos Exp $
 #
 # Makefile snipped to create a CD/DVD ISO
 #
@@ -106,6 +106,7 @@ _CDMAKEFSOPTIONS=	rockridge,label=${ISO_
 MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}"
 PAX_TIMESTAMP=--timestamp "${MKREPRO_TIMESTAMP}"
 .endif
+MAKESPEC=	${HOST_SH} ${NETBSDSRCDIR}/etc/makespec
 
 .if ${MKUNPRIVED} == "no"
 CD_METALOG.unpriv=
@@ -321,8 +322,8 @@ image:
 .if defined(SPEC_EXTRA)
 	cat ${SPEC_EXTRA} >> ${WORKSPEC}
 .endif
-	if [ -s ${WORKSPEC} ]; then specarg="-F ${WORKSPEC}"; fi;	\
-	${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 $${specarg} 	\
+	if [ ! -s ${WORKSPEC} ]; then ${MAKESPEC} cdrom > ${WORKSPEC}; fi
+	${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 -F ${WORKSPEC} 	\
 		${MAKEFS_TIMESTAMP} ${CDMAKEFSEXTRAOPTS} -o ${_CDMAKEFSOPTIONS:Q} ${CDIMAGE} cdrom
 
 .if ${CDRELEASE} == false



CVS commit: src/distrib/sets/lists

2024-05-06 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon May  6 08:38:51 UTC 2024

Modified Files:
src/distrib/sets/lists/base32: ad.aarch64 ad.mips64el ad.mipsn64eb
ad.mipsn64el ad.powerpc64 ad.riscv64 md.sparc64
src/distrib/sets/lists/base64: ad.mips64eb ad.mips64el

Log Message:
mark more libpam* with pam.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/base32/ad.aarch64 \
src/distrib/sets/lists/base32/ad.powerpc64
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/base32/ad.mips64el \
src/distrib/sets/lists/base32/ad.riscv64 \
src/distrib/sets/lists/base32/md.sparc64
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/base32/ad.mipsn64eb \
src/distrib/sets/lists/base32/ad.mipsn64el
cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/base64/ad.mips64eb \
src/distrib/sets/lists/base64/ad.mips64el

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/base32/ad.aarch64
diff -u src/distrib/sets/lists/base32/ad.aarch64:1.3 src/distrib/sets/lists/base32/ad.aarch64:1.4
--- src/distrib/sets/lists/base32/ad.aarch64:1.3	Tue Apr 16 19:15:36 2024
+++ src/distrib/sets/lists/base32/ad.aarch64	Mon May  6 08:38:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.3 2024/04/16 19:15:36 christos Exp $
+# $NetBSD: ad.aarch64,v 1.4 2024/05/06 08:38:51 mrg Exp $
 ./lib/eabi	base-compat-shlib	compat
 ./lib/eabi/npf	base-compat-shlib	compat,npf
 ./lib/eabi/npf/ext_log.so			base-compat-shlib	compat,npf
@@ -329,9 +329,9 @@
 ./usr/lib/eabi/libp2k.so			base-compat-shlib	compat
 ./usr/lib/eabi/libp2k.so.2			base-compat-shlib	compat
 ./usr/lib/eabi/libp2k.so.2.0			base-compat-shlib	compat
-./usr/lib/eabi/libpam.so			base-compat-shlib	compat
-./usr/lib/eabi/libpam.so.4			base-compat-shlib	compat
-./usr/lib/eabi/libpam.so.4.1			base-compat-shlib	compat
+./usr/lib/eabi/libpam.so			base-compat-shlib	compat,pam
+./usr/lib/eabi/libpam.so.4			base-compat-shlib	compat,pam
+./usr/lib/eabi/libpam.so.4.1			base-compat-shlib	compat,pam
 ./usr/lib/eabi/libpanel.so			base-compat-shlib	compat
 ./usr/lib/eabi/libpanel.so.3			base-compat-shlib	compat
 ./usr/lib/eabi/libpanel.so.3.0			base-compat-shlib	compat
@@ -831,9 +831,9 @@
 ./usr/lib/eabihf/libp2k.so			base-compat-shlib	compat
 ./usr/lib/eabihf/libp2k.so.2			base-compat-shlib	compat
 ./usr/lib/eabihf/libp2k.so.2.0			base-compat-shlib	compat
-./usr/lib/eabihf/libpam.so			base-compat-shlib	compat
-./usr/lib/eabihf/libpam.so.4			base-compat-shlib	compat
-./usr/lib/eabihf/libpam.so.4.1			base-compat-shlib	compat
+./usr/lib/eabihf/libpam.so			base-compat-shlib	compat,pam
+./usr/lib/eabihf/libpam.so.4			base-compat-shlib	compat,pam
+./usr/lib/eabihf/libpam.so.4.1			base-compat-shlib	compat,pam
 ./usr/lib/eabihf/libpanel.so			base-compat-shlib	compat
 ./usr/lib/eabihf/libpanel.so.3			base-compat-shlib	compat
 ./usr/lib/eabihf/libpanel.so.3.0			base-compat-shlib	compat
Index: src/distrib/sets/lists/base32/ad.powerpc64
diff -u src/distrib/sets/lists/base32/ad.powerpc64:1.3 src/distrib/sets/lists/base32/ad.powerpc64:1.4
--- src/distrib/sets/lists/base32/ad.powerpc64:1.3	Tue Apr 16 19:15:36 2024
+++ src/distrib/sets/lists/base32/ad.powerpc64	Mon May  6 08:38:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.powerpc64,v 1.3 2024/04/16 19:15:36 christos Exp $
+# $NetBSD: ad.powerpc64,v 1.4 2024/05/06 08:38:51 mrg Exp $
 ./lib/powerpc	base-compat-shlib	compat
 ./lib/powerpc/npf	base-compat-shlib	compat,npf
 ./lib/powerpc/npf/ext_log.so			base-compat-shlib	compat,npf
@@ -317,9 +317,9 @@
 ./usr/lib/powerpc/libp2k.so			base-compat-shlib	compat
 ./usr/lib/powerpc/libp2k.so.2			base-compat-shlib	compat
 ./usr/lib/powerpc/libp2k.so.2.0			base-compat-shlib	compat
-./usr/lib/powerpc/libpam.so			base-compat-shlib	compat
-./usr/lib/powerpc/libpam.so.4			base-compat-shlib	compat
-./usr/lib/powerpc/libpam.so.4.1			base-compat-shlib	compat
+./usr/lib/powerpc/libpam.so			base-compat-shlib	compat,pam
+./usr/lib/powerpc/libpam.so.4			base-compat-shlib	compat,pam
+./usr/lib/powerpc/libpam.so.4.1			base-compat-shlib	compat,pam
 ./usr/lib/powerpc/libpanel.so			base-compat-shlib	compat
 ./usr/lib/powerpc/libpanel.so.3			base-compat-shlib	compat
 ./usr/lib/powerpc/libpanel.so.3.0			base-compat-shlib	compat

Index: src/distrib/sets/lists/base32/ad.mips64el
diff -u src/distrib/sets/lists/base32/ad.mips64el:1.4 src/distrib/sets/lists/base32/ad.mips64el:1.5
--- src/distrib/sets/lists/base32/ad.mips64el:1.4	Mon Apr 22 14:41:25 2024
+++ src/distrib/sets/lists/base32/ad.mips64el	Mon May  6 08:38:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.4 2024/04/22 14:41:25 nia Exp $
+# $NetBSD: ad.mips64el,v 1.5 2024/05/06 08:38:51 mrg Exp $
 ./lib/64	base-compat-shlib	compat
 ./lib/o32	base-compat-shlib	compat
 ./lib/o32/npf	base-compat-shlib	compat,npf
@@ -323,9 +323,9 @@
 ./usr/lib/o32/libp2k.so			base-compat-shlib	compat
 

CVS commit: src/distrib/sets/lists

2024-05-06 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon May  6 08:38:51 UTC 2024

Modified Files:
src/distrib/sets/lists/base32: ad.aarch64 ad.mips64el ad.mipsn64eb
ad.mipsn64el ad.powerpc64 ad.riscv64 md.sparc64
src/distrib/sets/lists/base64: ad.mips64eb ad.mips64el

Log Message:
mark more libpam* with pam.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/base32/ad.aarch64 \
src/distrib/sets/lists/base32/ad.powerpc64
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/base32/ad.mips64el \
src/distrib/sets/lists/base32/ad.riscv64 \
src/distrib/sets/lists/base32/md.sparc64
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/base32/ad.mipsn64eb \
src/distrib/sets/lists/base32/ad.mipsn64el
cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/base64/ad.mips64eb \
src/distrib/sets/lists/base64/ad.mips64el

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/base32

2024-05-06 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Mon May  6 06:06:41 UTC 2024

Modified Files:
src/distrib/sets/lists/base32: md.sparc64

Log Message:
sprinkle rump, gcc=12 etc.
Now sparc64 with HAVE_GCC=12 and MKRUMP=no builds again


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/base32/md.sparc64

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/base32/md.sparc64
diff -u src/distrib/sets/lists/base32/md.sparc64:1.3 src/distrib/sets/lists/base32/md.sparc64:1.4
--- src/distrib/sets/lists/base32/md.sparc64:1.3	Tue Apr 16 19:15:36 2024
+++ src/distrib/sets/lists/base32/md.sparc64	Mon May  6 06:06:40 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.3 2024/04/16 19:15:36 christos Exp $
+# $NetBSD: md.sparc64,v 1.4 2024/05/06 06:06:40 macallan Exp $
 ./lib/sparc	base-compat-shlib	compat
 ./lib/sparc/npf	base-compat-shlib	compat,npf
 ./lib/sparc/npf/ext_log.so			base-compat-shlib	compat,npf
@@ -88,8 +88,10 @@
 ./usr/lib/sparc/libarchive.so.5			base-compat-shlib	compat
 ./usr/lib/sparc/libarchive.so.5.0		base-compat-shlib	compat
 ./usr/lib/sparc/libasan.so			base-compat-shlib	compat,gcc,cxx
-./usr/lib/sparc/libasan.so.5			base-compat-shlib	compat,gcc,cxx
-./usr/lib/sparc/libasan.so.5.0			base-compat-shlib	compat,gcc,cxx
+./usr/lib/sparc/libasan.so.5			base-compat-shlib	compat,gcc=10,cxx
+./usr/lib/sparc/libasan.so.5.0			base-compat-shlib	compat,gcc=10,cxx
+./usr/lib/sparc/libasan.so.6			base-compat-shlib	compat,gcc=12,cxx
+./usr/lib/sparc/libasan.so.6.0			base-compat-shlib	compat,gcc=12,cxx
 ./usr/lib/sparc/libasn1.so			base-compat-shlib	compat,kerberos
 ./usr/lib/sparc/libasn1.so.10			base-compat-shlib	compat,kerberos
 ./usr/lib/sparc/libasn1.so.10.0			base-compat-shlib	compat,kerberos
@@ -199,7 +201,8 @@
 ./usr/lib/sparc/libgnumalloc.so.1.0		base-compat-shlib	compat
 ./usr/lib/sparc/libgomp.so			base-compat-shlib	compat,gcc
 ./usr/lib/sparc/libgomp.so.2			base-compat-shlib	compat,gcc
-./usr/lib/sparc/libgomp.so.2.1			base-compat-shlib	compat,gcc
+./usr/lib/sparc/libgomp.so.2.1			base-compat-shlib	compat,gcc=10
+./usr/lib/sparc/libgomp.so.2.2			base-compat-shlib	compat,gcc=12
 ./usr/lib/sparc/libgssapi.so			base-compat-shlib	compat,kerberos
 ./usr/lib/sparc/libgssapi.so.12			base-compat-shlib	compat,kerberos
 ./usr/lib/sparc/libgssapi.so.12.0		base-compat-shlib	compat,kerberos
@@ -270,8 +273,10 @@
 ./usr/lib/sparc/libldap_r.so.6			base-compat-shlib	compat,ldap
 ./usr/lib/sparc/libldap_r.so.6.0		base-compat-shlib	compat,ldap
 ./usr/lib/sparc/liblsan.so			base-compat-shlib	compat,cxx,gcc
-./usr/lib/sparc/liblsan.so.2			base-compat-shlib	compat,cxx,gcc
-./usr/lib/sparc/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcc
+./usr/lib/sparc/liblsan.so.2			base-compat-shlib	compat,cxx,gcc=10
+./usr/lib/sparc/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcc=10
+./usr/lib/sparc/liblsan.so.3			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/sparc/liblsan.so.3.0			base-compat-shlib	compat,cxx,gcc=12
 ./usr/lib/sparc/liblua.so			base-compat-shlib	compat
 ./usr/lib/sparc/liblua.so.6			base-compat-shlib	compat
 ./usr/lib/sparc/liblua.so.6.1			base-compat-shlib	compat
@@ -314,9 +319,9 @@
 ./usr/lib/sparc/libossaudio.so			base-compat-shlib	compat
 ./usr/lib/sparc/libossaudio.so.1		base-compat-shlib	compat
 ./usr/lib/sparc/libossaudio.so.1.1		base-compat-shlib	compat
-./usr/lib/sparc/libp2k.so			base-compat-shlib	compat
-./usr/lib/sparc/libp2k.so.2			base-compat-shlib	compat
-./usr/lib/sparc/libp2k.so.2.0			base-compat-shlib	compat
+./usr/lib/sparc/libp2k.so			base-compat-shlib	compat,rump
+./usr/lib/sparc/libp2k.so.2			base-compat-shlib	compat,rump
+./usr/lib/sparc/libp2k.so.2.0			base-compat-shlib	compat,rump
 ./usr/lib/sparc/libpam.so			base-compat-shlib	compat
 ./usr/lib/sparc/libpam.so.4			base-compat-shlib	compat
 ./usr/lib/sparc/libpam.so.4.1			base-compat-shlib	compat
@@ -418,7 +423,8 @@
 ./usr/lib/sparc/libssl.so.15.0			base-compat-shlib	compat
 ./usr/lib/sparc/libstdc++.so			base-compat-shlib	compat,gcc,cxx,libstdcxx
 ./usr/lib/sparc/libstdc++.so.9			base-compat-shlib	compat,gcc,cxx,libstdcxx
-./usr/lib/sparc/libstdc++.so.9.0		base-compat-shlib	compat,gcc,cxx,libstdcxx
+./usr/lib/sparc/libstdc++.so.9.0		base-compat-shlib	compat,gcc=10,cxx,libstdcxx
+./usr/lib/sparc/libstdc++.so.9.1		base-compat-shlib	compat,gcc=12,cxx,libstdcxx
 ./usr/lib/sparc/libtermcap.so			base-compat-shlib	compat
 ./usr/lib/sparc/libtermcap.so.0			base-compat-shlib	compat
 ./usr/lib/sparc/libtermcap.so.0.6		base-compat-shlib	compat
@@ -432,11 +438,13 @@
 ./usr/lib/sparc/libtre.so.0			base-compat-shlib	compat
 ./usr/lib/sparc/libtre.so.0.8			base-compat-shlib	compat
 ./usr/lib/sparc/libubsan.so			base-compat-shlib	compat,gcc,cxx
-./usr/lib/sparc/libubsan.so.4			base-compat-shlib	compat,gcc,cxx
-./usr/lib/sparc/libubsan.so.4.0			base-compat-shlib	compat,gcc,cxx

CVS commit: src/distrib/sets/lists/base32

2024-05-06 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Mon May  6 06:06:41 UTC 2024

Modified Files:
src/distrib/sets/lists/base32: md.sparc64

Log Message:
sprinkle rump, gcc=12 etc.
Now sparc64 with HAVE_GCC=12 and MKRUMP=no builds again


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/base32/md.sparc64

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/base32

2024-05-05 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon May  6 05:27:46 UTC 2024

Modified Files:
src/distrib/sets/lists/base32: md.amd64

Log Message:
mark libpam* as being part of pam.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/base32/md.amd64

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/base32/md.amd64
diff -u src/distrib/sets/lists/base32/md.amd64:1.7 src/distrib/sets/lists/base32/md.amd64:1.8
--- src/distrib/sets/lists/base32/md.amd64:1.7	Tue Apr 30 18:34:19 2024
+++ src/distrib/sets/lists/base32/md.amd64	Mon May  6 05:27:46 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.7 2024/04/30 18:34:19 martin Exp $
+# $NetBSD: md.amd64,v 1.8 2024/05/06 05:27:46 mrg Exp $
 ./lib/i386	base-compat-shlib	compat
 ./lib/i386/npf	base-compat-shlib	compat,npf
 ./lib/i386/npf/ext_log.so			base-compat-shlib	compat,npf
@@ -332,9 +332,9 @@
 ./usr/lib/i386/libp2k.so			base-compat-shlib	compat,rump
 ./usr/lib/i386/libp2k.so.2			base-compat-shlib	compat,rump
 ./usr/lib/i386/libp2k.so.2.0			base-compat-shlib	compat,rump
-./usr/lib/i386/libpam.so			base-compat-shlib	compat
-./usr/lib/i386/libpam.so.4			base-compat-shlib	compat
-./usr/lib/i386/libpam.so.4.1			base-compat-shlib	compat
+./usr/lib/i386/libpam.so			base-compat-shlib	compat,pam
+./usr/lib/i386/libpam.so.4			base-compat-shlib	compat,pam
+./usr/lib/i386/libpam.so.4.1			base-compat-shlib	compat,pam
 ./usr/lib/i386/libpanel.so			base-compat-shlib	compat
 ./usr/lib/i386/libpanel.so.3			base-compat-shlib	compat
 ./usr/lib/i386/libpanel.so.3.0			base-compat-shlib	compat



CVS commit: src/distrib/sets/lists/base32

2024-05-05 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon May  6 05:27:46 UTC 2024

Modified Files:
src/distrib/sets/lists/base32: md.amd64

Log Message:
mark libpam* as being part of pam.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/base32/md.amd64

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/man

2024-05-04 Thread Jeremy C. Reed
Module Name:src
Committed By:   reed
Date:   Sat May  4 19:16:23 UTC 2024

Modified Files:
src/distrib/sets/lists/man: mi

Log Message:
add the catman pages to the set for mkcsmapper and mkesdb


To generate a diff of this commit:
cvs rdiff -u -r1.1774 -r1.1775 src/distrib/sets/lists/man/mi

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/man

2024-05-04 Thread Jeremy C. Reed
Module Name:src
Committed By:   reed
Date:   Sat May  4 19:16:23 UTC 2024

Modified Files:
src/distrib/sets/lists/man: mi

Log Message:
add the catman pages to the set for mkcsmapper and mkesdb


To generate a diff of this commit:
cvs rdiff -u -r1.1774 -r1.1775 src/distrib/sets/lists/man/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/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1774 src/distrib/sets/lists/man/mi:1.1775
--- src/distrib/sets/lists/man/mi:1.1774	Sat May  4 19:10:04 2024
+++ src/distrib/sets/lists/man/mi	Sat May  4 19:16:22 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1774 2024/05/04 19:10:04 reed Exp $
+# $NetBSD: mi,v 1.1775 2024/05/04 19:16:22 reed Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -337,8 +337,10 @@
 ./usr/share/man/cat1/midiplay.0			man-audio-catman	.cat
 ./usr/share/man/cat1/midirecord.0		man-audio-catman	.cat
 ./usr/share/man/cat1/mixerctl.0			man-audio-catman	.cat
+./usr/share/man/cat1/mkcsmapper.0		man-util-catman		.cat
 ./usr/share/man/cat1/mkdep.0			man-c-catman		.cat
 ./usr/share/man/cat1/mkdir.0			man-util-catman		.cat
+./usr/share/man/cat1/mkesdb.0			man-util-catman		.cat
 ./usr/share/man/cat1/mkfifo.0			man-sysutil-catman	.cat
 ./usr/share/man/cat1/mkfilters.0		man-ipf-catman		ipfilter,.cat
 ./usr/share/man/cat1/mklocale.0			man-util-catman		.cat



CVS commit: src/distrib/riscv/ramdisk

2024-05-03 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Sat May  4 00:41:06 UTC 2024

Modified Files:
src/distrib/riscv/ramdisk: Makefile

Log Message:
Add dhcpcd to riscv ramdisk, etc.

Be consistent with configs for pretty much every other (modern) arch
and provide dhcpcd, lest someone end up using this image and then be
surprised (as happened relatively recently with evbmips images). This
means of course we also need bpf.

While here, add a few wedge devices, too. This aligns us with the
device definitions evbmips uses (that appears to be where the riscv
Makefile was copied from back in 2015).


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/riscv/ramdisk/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/riscv/ramdisk/Makefile
diff -u src/distrib/riscv/ramdisk/Makefile:1.3 src/distrib/riscv/ramdisk/Makefile:1.4
--- src/distrib/riscv/ramdisk/Makefile:1.3	Wed Jun 14 23:03:19 2023
+++ src/distrib/riscv/ramdisk/Makefile	Sat May  4 00:41:06 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2023/06/14 23:03:19 gutteridge Exp $
+#	$NetBSD: Makefile,v 1.4 2024/05/04 00:41:06 gutteridge Exp $
 
 .include 
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -22,7 +22,8 @@ IMAGEDEPENDS=	${CRUNCHBIN} \
 		${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
 		${DISTRIBDIR}/common/services
 
-MAKEDEVTARGETS= std md0 wd0 wd1 wd2 wd3 cd0 cd1 sd0 sd1 sd2 sd3 st0 ipty
+MAKEDEVTARGETS= std md0 wd0 wd1 wd2 wd3 cd0 cd1 sd0 sd1 sd2 sd3 st0 ipty \
+		bpf dk0 dk1 dk2 dk3
 
 # Use stubs to eliminate some large stuff from libc
 HACKSRC=	${DISTRIBDIR}/utils/libhack
@@ -30,6 +31,7 @@ HACKSRC=	${DISTRIBDIR}/utils/libhack
 ${CRUNCHBIN}:	libhack.o
 
 .include "${DISTRIBDIR}/common/Makefile.crunch"
+.include "${DISTRIBDIR}/common/Makefile.dhcpcd"
 .include "${DISTRIBDIR}/common/Makefile.makedev"
 .include "${DISTRIBDIR}/common/Makefile.image"
 



CVS commit: src/distrib/riscv/ramdisk

2024-05-03 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Sat May  4 00:41:06 UTC 2024

Modified Files:
src/distrib/riscv/ramdisk: Makefile

Log Message:
Add dhcpcd to riscv ramdisk, etc.

Be consistent with configs for pretty much every other (modern) arch
and provide dhcpcd, lest someone end up using this image and then be
surprised (as happened relatively recently with evbmips images). This
means of course we also need bpf.

While here, add a few wedge devices, too. This aligns us with the
device definitions evbmips uses (that appears to be where the riscv
Makefile was copied from back in 2015).


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/riscv/ramdisk/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/notes/hp300

2024-05-01 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Wed May  1 19:40:56 UTC 2024

Modified Files:
src/distrib/notes/hp300: hardware

Log Message:
Add 98542 and 98543 framebuffers to supported "Graphics Devices" section.

I hope someone will sync a list of supported devices in port wiki pages
with one in this installation notes.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/distrib/notes/hp300/hardware

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/notes/hp300/hardware
diff -u src/distrib/notes/hp300/hardware:1.27 src/distrib/notes/hp300/hardware:1.28
--- src/distrib/notes/hp300/hardware:1.27	Sun Jan 14 12:05:33 2024
+++ src/distrib/notes/hp300/hardware	Wed May  1 19:40:56 2024
@@ -1,4 +1,4 @@
-.\"	$NetBSD: hardware,v 1.27 2024/01/14 12:05:33 tsutsui Exp $
+.\"	$NetBSD: hardware,v 1.28 2024/05/01 19:40:56 tsutsui Exp $
 .
 .Nx*M
 \*V will run on most HP 9000/300- and 400-series machines.
@@ -155,6 +155,10 @@ Network interfaces
 .It
 Graphics Devices
 .(bullet -compact
+98542 monochrome Topcat (512x400, 1 bit, DIO-II)
+.It
+98543 color Topcat (512x400, 4 bits, DIO-II)
+.It
 98544 monochrome Topcat (1024x768, 1 bit, DIO-II)
 .It
 98545A color Topcat (1024x768, 4 bits, DIO-II)



CVS commit: src/distrib/notes/hp300

2024-05-01 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Wed May  1 19:40:56 UTC 2024

Modified Files:
src/distrib/notes/hp300: hardware

Log Message:
Add 98542 and 98543 framebuffers to supported "Graphics Devices" section.

I hope someone will sync a list of supported devices in port wiki pages
with one in this installation notes.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/distrib/notes/hp300/hardware

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

2024-04-30 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Apr 30 18:34:19 UTC 2024

Modified Files:
src/distrib/sets/lists/base32: md.amd64
src/distrib/sets/lists/debug32: md.amd64

Log Message:
Mark ctf libs as depending on MKCTF


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/base32/md.amd64
cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/debug32/md.amd64

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

2024-04-30 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Apr 30 18:34:19 UTC 2024

Modified Files:
src/distrib/sets/lists/base32: md.amd64
src/distrib/sets/lists/debug32: md.amd64

Log Message:
Mark ctf libs as depending on MKCTF


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/base32/md.amd64
cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/debug32/md.amd64

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/base32/md.amd64
diff -u src/distrib/sets/lists/base32/md.amd64:1.6 src/distrib/sets/lists/base32/md.amd64:1.7
--- src/distrib/sets/lists/base32/md.amd64:1.6	Tue Apr 30 01:18:40 2024
+++ src/distrib/sets/lists/base32/md.amd64	Tue Apr 30 18:34:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.6 2024/04/30 01:18:40 macallan Exp $
+# $NetBSD: md.amd64,v 1.7 2024/04/30 18:34:19 martin Exp $
 ./lib/i386	base-compat-shlib	compat
 ./lib/i386/npf	base-compat-shlib	compat,npf
 ./lib/i386/npf/ext_log.so			base-compat-shlib	compat,npf
@@ -142,9 +142,9 @@
 ./usr/lib/i386/libcrypto.so			base-compat-shlib	compat
 ./usr/lib/i386/libcrypto.so.15			base-compat-shlib	compat
 ./usr/lib/i386/libcrypto.so.15.0		base-compat-shlib	compat
-./usr/lib/i386/libctf.so			base-compat-shlib	compat
-./usr/lib/i386/libctf.so.3			base-compat-shlib	compat
-./usr/lib/i386/libctf.so.3.0			base-compat-shlib	compat
+./usr/lib/i386/libctf.so			base-compat-shlib	compat,ctf
+./usr/lib/i386/libctf.so.3			base-compat-shlib	compat,ctf
+./usr/lib/i386/libctf.so.3.0			base-compat-shlib	compat,ctf
 ./usr/lib/i386/libcurses.so			base-compat-shlib	compat
 ./usr/lib/i386/libcurses.so.9			base-compat-shlib	compat
 ./usr/lib/i386/libcurses.so.9.1			base-compat-shlib	compat

Index: src/distrib/sets/lists/debug32/md.amd64
diff -u src/distrib/sets/lists/debug32/md.amd64:1.8 src/distrib/sets/lists/debug32/md.amd64:1.9
--- src/distrib/sets/lists/debug32/md.amd64:1.8	Tue Apr 16 19:15:36 2024
+++ src/distrib/sets/lists/debug32/md.amd64	Tue Apr 30 18:34:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.8 2024/04/16 19:15:36 christos Exp $
+# $NetBSD: md.amd64,v 1.9 2024/04/30 18:34:19 martin Exp $
 ./usr/lib/i386/i18n/libBIG5_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/i386/i18n/libDECHanyu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/i386/i18n/libEUCTW_g.a			comp-c-debuglib	debuglib,compat
@@ -211,7 +211,7 @@
 ./usr/libdata/debug/usr/lib/i386/libcom_err.so.8.0.debug	comp-sys-debug	debug,compat,kerberos
 ./usr/libdata/debug/usr/lib/i386/libcrypt.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/i386/libcrypto.so.15.0.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/i386/libctf.so.3.0.debug
+./usr/libdata/debug/usr/lib/i386/libctf.so.3.0.debug	comp-sys-debug	debug,compat,ctf
 ./usr/libdata/debug/usr/lib/i386/libcurses.so.9.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/i386/libdes.so.15.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/i386/libdevmapper.so.1.0.debug	comp-sys-debug	debug,compat,lvm



CVS commit: src/distrib/sets/lists/base32

2024-04-29 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Tue Apr 30 01:18:40 UTC 2024

Modified Files:
src/distrib/sets/lists/base32: md.amd64

Log Message:
sprinkle gcc=12 and rump attributes


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/base32/md.amd64

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/base32/md.amd64
diff -u src/distrib/sets/lists/base32/md.amd64:1.5 src/distrib/sets/lists/base32/md.amd64:1.6
--- src/distrib/sets/lists/base32/md.amd64:1.5	Tue Apr 16 19:15:36 2024
+++ src/distrib/sets/lists/base32/md.amd64	Tue Apr 30 01:18:40 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.5 2024/04/16 19:15:36 christos Exp $
+# $NetBSD: md.amd64,v 1.6 2024/04/30 01:18:40 macallan Exp $
 ./lib/i386	base-compat-shlib	compat
 ./lib/i386/npf	base-compat-shlib	compat,npf
 ./lib/i386/npf/ext_log.so			base-compat-shlib	compat,npf
@@ -88,8 +88,10 @@
 ./usr/lib/i386/libarchive.so.5			base-compat-shlib	compat
 ./usr/lib/i386/libarchive.so.5.0		base-compat-shlib	compat
 ./usr/lib/i386/libasan.so			base-compat-shlib	compat,gcc,cxx
-./usr/lib/i386/libasan.so.5			base-compat-shlib	compat,gcc,cxx
-./usr/lib/i386/libasan.so.5.0			base-compat-shlib	compat,gcc,cxx
+./usr/lib/i386/libasan.so.5			base-compat-shlib	compat,gcc=10,cxx
+./usr/lib/i386/libasan.so.5.0			base-compat-shlib	compat,gcc=10,cxx
+./usr/lib/i386/libasan.so.6			base-compat-shlib	compat,gcc=12,cxx
+./usr/lib/i386/libasan.so.6.0			base-compat-shlib	compat,gcc=12,cxx
 ./usr/lib/i386/libasn1.so			base-compat-shlib	compat,kerberos
 ./usr/lib/i386/libasn1.so.10			base-compat-shlib	compat,kerberos
 ./usr/lib/i386/libasn1.so.10.0			base-compat-shlib	compat,kerberos
@@ -205,7 +207,8 @@
 ./usr/lib/i386/libgnumalloc.so.1.0		base-compat-shlib	compat
 ./usr/lib/i386/libgomp.so			base-compat-shlib	compat,gcc
 ./usr/lib/i386/libgomp.so.2			base-compat-shlib	compat,gcc
-./usr/lib/i386/libgomp.so.2.1			base-compat-shlib	compat,gcc
+./usr/lib/i386/libgomp.so.2.1			base-compat-shlib	compat,gcc=10
+./usr/lib/i386/libgomp.so.2.2			base-compat-shlib	compat,gcc=12
 ./usr/lib/i386/libgssapi.so			base-compat-shlib	compat,kerberos
 ./usr/lib/i386/libgssapi.so.12			base-compat-shlib	compat,kerberos
 ./usr/lib/i386/libgssapi.so.12.0		base-compat-shlib	compat,kerberos
@@ -280,8 +283,10 @@
 ./usr/lib/i386/libldap_r.so.6			base-compat-shlib	compat,ldap
 ./usr/lib/i386/libldap_r.so.6.0			base-compat-shlib	compat,ldap
 ./usr/lib/i386/liblsan.so			base-compat-shlib	compat,cxx,gcc
-./usr/lib/i386/liblsan.so.2			base-compat-shlib	compat,cxx,gcc
-./usr/lib/i386/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcc
+./usr/lib/i386/liblsan.so.2			base-compat-shlib	compat,cxx,gcc=10
+./usr/lib/i386/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcc=10
+./usr/lib/i386/liblsan.so.3			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/i386/liblsan.so.3.0			base-compat-shlib	compat,cxx,gcc=12
 ./usr/lib/i386/liblua.so			base-compat-shlib	compat
 ./usr/lib/i386/liblua.so.6			base-compat-shlib	compat
 ./usr/lib/i386/liblua.so.6.1			base-compat-shlib	compat
@@ -324,9 +329,9 @@
 ./usr/lib/i386/libossaudio.so			base-compat-shlib	compat
 ./usr/lib/i386/libossaudio.so.1			base-compat-shlib	compat
 ./usr/lib/i386/libossaudio.so.1.1		base-compat-shlib	compat
-./usr/lib/i386/libp2k.so			base-compat-shlib	compat
-./usr/lib/i386/libp2k.so.2			base-compat-shlib	compat
-./usr/lib/i386/libp2k.so.2.0			base-compat-shlib	compat
+./usr/lib/i386/libp2k.so			base-compat-shlib	compat,rump
+./usr/lib/i386/libp2k.so.2			base-compat-shlib	compat,rump
+./usr/lib/i386/libp2k.so.2.0			base-compat-shlib	compat,rump
 ./usr/lib/i386/libpam.so			base-compat-shlib	compat
 ./usr/lib/i386/libpam.so.4			base-compat-shlib	compat
 ./usr/lib/i386/libpam.so.4.1			base-compat-shlib	compat
@@ -428,7 +433,8 @@
 ./usr/lib/i386/libssl.so.15.0			base-compat-shlib	compat
 ./usr/lib/i386/libstdc++.so			base-compat-shlib	compat,gcc,cxx,libstdcxx
 ./usr/lib/i386/libstdc++.so.9			base-compat-shlib	compat,gcc,cxx,libstdcxx
-./usr/lib/i386/libstdc++.so.9.0			base-compat-shlib	compat,gcc,cxx,libstdcxx
+./usr/lib/i386/libstdc++.so.9.0			base-compat-shlib	compat,gcc=10,cxx,libstdcxx
+./usr/lib/i386/libstdc++.so.9.1			base-compat-shlib	compat,gcc=12,cxx,libstdcxx
 ./usr/lib/i386/libtermcap.so			base-compat-shlib	compat
 ./usr/lib/i386/libtermcap.so.0			base-compat-shlib	compat
 ./usr/lib/i386/libtermcap.so.0.6		base-compat-shlib	compat
@@ -442,11 +448,13 @@
 ./usr/lib/i386/libtre.so.0			base-compat-shlib	compat
 ./usr/lib/i386/libtre.so.0.8			base-compat-shlib	compat
 ./usr/lib/i386/libubsan.so			base-compat-shlib	compat,gcc,cxx
-./usr/lib/i386/libubsan.so.4			base-compat-shlib	compat,gcc,cxx
-./usr/lib/i386/libubsan.so.4.0			base-compat-shlib	compat,gcc,cxx
-./usr/lib/i386/libukfs.so			base-compat-shlib	compat
-./usr/lib/i386/libukfs.so.1			base-compat-shlib	compat
-./usr/lib/i386/libukfs.so.1.0		

CVS commit: src/distrib/sets/lists/base32

2024-04-29 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Tue Apr 30 01:18:40 UTC 2024

Modified Files:
src/distrib/sets/lists/base32: md.amd64

Log Message:
sprinkle gcc=12 and rump attributes


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/base32/md.amd64

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

2024-04-28 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Apr 28 18:55:04 UTC 2024

Modified Files:
src/distrib/sets/lists/debug: mi

Log Message:
tests/cd9660: add debug info to the file list


To generate a diff of this commit:
cvs rdiff -u -r1.433 -r1.434 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.433 src/distrib/sets/lists/debug/mi:1.434
--- src/distrib/sets/lists/debug/mi:1.433	Sun Apr 28 01:21:26 2024
+++ src/distrib/sets/lists/debug/mi	Sun Apr 28 18:55:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.433 2024/04/28 01:21:26 riastradh Exp $
+# $NetBSD: mi,v 1.434 2024/04/28 18:55:04 rillig Exp $
 ./etc/mtree/set.debug   comp-sys-root
 ./usr/lib	comp-sys-usr		compatdir
 ./usr/lib/i18n/libBIG5_g.a			comp-c-debuglib		debuglib
@@ -1681,6 +1681,7 @@
 ./usr/libdata/debug/usr/tests/dev/scsipi/t_cd.debug			tests-fs-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/dev/sysmon/t_swwdog.debug			tests-fs-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/dev/usb/t_hid.debug			tests-fs-debug		debug,atf,rump
+./usr/libdata/debug/usr/tests/fs/cd9660/h_hexdump_r.debug		tests-fs-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/fs/ffs/h_ffs_server.debug			tests-fs-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/fs/ffs/h_quota2_server.debug		tests-obsolete		obsolete,compattestfile
 ./usr/libdata/debug/usr/tests/fs/ffs/h_quota2_tests.debug		tests-fs-debug		debug,atf,rump



CVS commit: src/distrib/sets/lists/debug

2024-04-28 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Apr 28 18:55:04 UTC 2024

Modified Files:
src/distrib/sets/lists/debug: mi

Log Message:
tests/cd9660: add debug info to the file list


To generate a diff of this commit:
cvs rdiff -u -r1.433 -r1.434 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.



CVS commit: src/distrib

2024-04-26 Thread Nia Alarie
Module Name:src
Committed By:   nia
Date:   Fri Apr 26 17:36:32 UTC 2024

Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
src/distrib/amd64/cdroms/installdvd: Makefile
src/distrib/i386/cdroms: Makefile.cdrom
src/distrib/i386/cdroms/installdvd: Makefile
src/distrib/sparc64/cdroms/installdvd: Makefile

Log Message:
Remove modules set from the i386 install cd

It is not particularly useful to be able to load modules while
installing on i386, probably the most useful one is dtrace,
and this takes up about 20mb on a port that is already exceeding
CD limits. Most stuff you'd want to use while installing is already
in GENERIC.

The modules set is still available compressed for installing into
a target system, meaning modules are available after installation.

While here, add man set to the installation DVD, it's helpful to be able
to read e.g. the man page for fdisk when rescuing a system.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/cdroms/installdvd/Makefile
cvs rdiff -u -r1.42 -r1.43 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r1.1 -r1.2 src/distrib/i386/cdroms/installdvd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/sparc64/cdroms/installdvd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib

2024-04-26 Thread Nia Alarie
Module Name:src
Committed By:   nia
Date:   Fri Apr 26 17:36:32 UTC 2024

Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
src/distrib/amd64/cdroms/installdvd: Makefile
src/distrib/i386/cdroms: Makefile.cdrom
src/distrib/i386/cdroms/installdvd: Makefile
src/distrib/sparc64/cdroms/installdvd: Makefile

Log Message:
Remove modules set from the i386 install cd

It is not particularly useful to be able to load modules while
installing on i386, probably the most useful one is dtrace,
and this takes up about 20mb on a port that is already exceeding
CD limits. Most stuff you'd want to use while installing is already
in GENERIC.

The modules set is still available compressed for installing into
a target system, meaning modules are available after installation.

While here, add man set to the installation DVD, it's helpful to be able
to read e.g. the man page for fdisk when rescuing a system.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/cdroms/installdvd/Makefile
cvs rdiff -u -r1.42 -r1.43 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r1.1 -r1.2 src/distrib/i386/cdroms/installdvd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/sparc64/cdroms/installdvd/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/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.27 src/distrib/amd64/cdroms/Makefile.cdrom:1.28
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.27	Sat Sep 25 08:54:29 2021
+++ src/distrib/amd64/cdroms/Makefile.cdrom	Fri Apr 26 17:36:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.27 2021/09/25 08:54:29 maya Exp $
+# $NetBSD: Makefile.cdrom,v 1.28 2024/04/26 17:36:32 nia Exp $
 
 .include 
 .include 
@@ -17,7 +17,7 @@ CDMAKEFSOPTIONS= bootimage=i386;bootxx.$
 CDINSTKERNEL=	../../instkernel
 CDKERNELS=	netbsd-GENERIC.gz   netbsd
 CDRELEASE_NOISOS=	true
-CD_SETS=	base etc gpufw
+CD_SETS+=	base etc gpufw
 .if ${MKKMOD} != "no"
 CD_SETS+=	modules
 .endif

Index: src/distrib/amd64/cdroms/installdvd/Makefile
diff -u src/distrib/amd64/cdroms/installdvd/Makefile:1.1 src/distrib/amd64/cdroms/installdvd/Makefile:1.2
--- src/distrib/amd64/cdroms/installdvd/Makefile:1.1	Wed Apr 24 11:29:34 2024
+++ src/distrib/amd64/cdroms/installdvd/Makefile	Fri Apr 26 17:36:32 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2024/04/24 11:29:34 nia Exp $
+#	$NetBSD: Makefile,v 1.2 2024/04/26 17:36:32 nia Exp $
 #
 
 # Install CD, to be made after 'build.sh release'
@@ -12,6 +12,10 @@ CDRELEASE=	true			# include $RELEASEDIR/
 CDBUILDEXTRA=	boot.cfg		# Add boot.cfg file
 CLEANFILES+=	boot.cfg
 
+.if ${MKMAN} != "no"
+CD_SETS+=	man
+.endif
+
 prepare_md_post:
 	${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" \
 		< ${.CURDIR}/boot.cfg.in > boot.cfg

Index: src/distrib/i386/cdroms/Makefile.cdrom
diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.42 src/distrib/i386/cdroms/Makefile.cdrom:1.43
--- src/distrib/i386/cdroms/Makefile.cdrom:1.42	Sat Sep 25 08:54:29 2021
+++ src/distrib/i386/cdroms/Makefile.cdrom	Fri Apr 26 17:36:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.42 2021/09/25 08:54:29 maya Exp $
+# $NetBSD: Makefile.cdrom,v 1.43 2024/04/26 17:36:32 nia Exp $
 
 .include 
 
@@ -10,10 +10,7 @@ CDMAKEFSOPTIONS= bootimage=i386;bootxx.$
 CDINSTKERNEL=	../../instkernel
 CDKERNELS=	netbsd-GENERIC.gz   netbsd
 CDRELEASE_NOISOS=	true
-CD_SETS=	base etc gpufw
-.if ${MKKMOD} != "no"
-CD_SETS+=	modules
-.endif
+CD_SETS+=	base etc gpufw
 
 image_md_pre:
 	${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc cdrom/install.sh

Index: src/distrib/i386/cdroms/installdvd/Makefile
diff -u src/distrib/i386/cdroms/installdvd/Makefile:1.1 src/distrib/i386/cdroms/installdvd/Makefile:1.2
--- src/distrib/i386/cdroms/installdvd/Makefile:1.1	Wed Apr 24 11:29:34 2024
+++ src/distrib/i386/cdroms/installdvd/Makefile	Fri Apr 26 17:36:32 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2024/04/24 11:29:34 nia Exp $
+#	$NetBSD: Makefile,v 1.2 2024/04/26 17:36:32 nia Exp $
 #
 
 # Install CD, to be made after 'build.sh release'
@@ -12,6 +12,14 @@ CDRELEASE=	true# inc
 CDBUILDEXTRA+=	boot.cfg		# Add boot.cfg file
 CLEANFILES+=	boot.cfg
 
+.if ${MKKMOD} != "no"
+CD_SETS+=	modules
+.endif
+
+.if ${MKMAN} != "no"
+CD_SETS+=	man
+.endif
+
 prepare_md_post:
 	${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" < ${.CURDIR}/boot.cfg.in > boot.cfg
 

Index: src/distrib/sparc64/cdroms/installdvd/Makefile
diff -u src/distrib/sparc64/cdroms/installdvd/Makefile:1.1 src/distrib/sparc64/cdroms/installdvd/Makefile:1.2
--- src/distrib/sparc64/cdroms/installdvd/Makefile:1.1	Wed Apr 24 15:39:58 2024
+++ src/distrib/sparc64/cdroms/installdvd/Makefile	Fri Apr 26 17:36:32 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2024/04/24 15:39:58 nia Exp $
+#	$NetBSD: Makefile,v 

CVS commit: src/distrib

2024-04-25 Thread Nia Alarie
Module Name:src
Committed By:   nia
Date:   Thu Apr 25 11:56:51 UTC 2024

Modified Files:
src/distrib/common: Makefile.bootcd
src/distrib/common/bootimage: Makefile.installimage
src/distrib/i386/cdroms/installcd: Makefile

Log Message:
remove redundant kernels and floppies from the space-starved i386 ISO


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.10 -r1.11 src/distrib/common/bootimage/Makefile.installimage
cvs rdiff -u -r1.11 -r1.12 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.47 src/distrib/common/Makefile.bootcd:1.48
--- src/distrib/common/Makefile.bootcd:1.47	Wed Apr 24 11:29:34 2024
+++ src/distrib/common/Makefile.bootcd	Thu Apr 25 11:56:51 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.bootcd,v 1.47 2024/04/24 11:29:34 nia Exp $
+#	$NetBSD: Makefile.bootcd,v 1.48 2024/04/25 11:56:51 nia Exp $
 #
 # Makefile snipped to create a CD/DVD ISO
 #
@@ -53,7 +53,7 @@ CDROMS_RELEASEDIR?=	${MACHINE}/installat
 CDROMS_RELEASEDIR?=	images
 .endif
 .if defined(CDRELEASE_NOISOS)
-CDRELEASE_EXCLUDE=	-s ',./installation/cdrom.*,,gp'
+CDRELEASE_EXCLUDE+=	-s ',./installation/cdrom.*,,gp'
 .endif
 .if defined(CDRELEASE_NOCOMPAT)
 .  for sufx in tgz tar.xz

Index: src/distrib/common/bootimage/Makefile.installimage
diff -u src/distrib/common/bootimage/Makefile.installimage:1.10 src/distrib/common/bootimage/Makefile.installimage:1.11
--- src/distrib/common/bootimage/Makefile.installimage:1.10	Sat Sep 25 21:26:03 2021
+++ src/distrib/common/bootimage/Makefile.installimage	Thu Apr 25 11:56:51 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.installimage,v 1.10 2021/09/25 21:26:03 maya Exp $
+#	$NetBSD: Makefile.installimage,v 1.11 2024/04/25 11:56:51 nia Exp $
 #
 # Common Makefile to create a bootable installation image for USB flash etc.
 #
@@ -46,7 +46,8 @@ DISKPROTO_IN?=	${NETBSDSRCDIR}/distrib/c
 
 # XXX: no permission info for makefs(8)
 IMGDIR_EXTRA=	${RELEASEDIR}/${RELEASEMACHINEDIR}	${RELEASEMACHINEDIR}
-IMGDIR_EXCLUDE= 	-s ',./installation/cdrom.*,,gp'
+IMGDIR_EXCLUDE+= 	-s ',./installation/floppy/.*,,gp'
+IMGDIR_EXCLUDE+= 	-s ',./installation/cdrom.*,,gp'
 IMGDIR_EXCLUDE+=	-s ',./installation/liveimage.*,,gp'
 IMGDIR_EXCLUDE+=	-s ',./installation/installimage.*,,gp'
 .if defined(MD_IMGDIR_EXCLUDE)

Index: src/distrib/i386/cdroms/installcd/Makefile
diff -u src/distrib/i386/cdroms/installcd/Makefile:1.11 src/distrib/i386/cdroms/installcd/Makefile:1.12
--- src/distrib/i386/cdroms/installcd/Makefile:1.11	Tue Apr 23 20:37:08 2024
+++ src/distrib/i386/cdroms/installcd/Makefile	Thu Apr 25 11:56:51 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2024/04/23 20:37:08 nia Exp $
+#	$NetBSD: Makefile,v 1.12 2024/04/25 11:56:51 nia Exp $
 #
 
 # Install CD, to be made after 'build.sh release'
@@ -15,6 +15,21 @@ CDRELEASE_NOTESTS=	true
 CDBUILDEXTRA+=	boot.cfg		# Add boot.cfg file
 CLEANFILES+=	boot.cfg
 
+# already (probably) booting from CD if using this and the floppy images
+# are 20MB+ when combined
+CDRELEASE_EXCLUDE+=	-s ',./installation/floppy/.*,,gp'
+
+# MONOLITHIC (i386-only) was originally added to the release build
+# for upgrades from netbsd-5, and now primarily exists so the no-modules
+# build can continue to be tested.  this takes up 20MB+ space.
+.  for sufx in tgz tar.xz
+CDRELEASE_EXCLUDE+=	-s ',./binary/sets/kern-INSTALL.${sufx},,gp'
+CDRELEASE_EXCLUDE+=	-s ',./binary/sets/kern-MONOLITHIC.${sufx},,gp'
+.  endfor
+
+CDRELEASE_EXCLUDE+=	-s ',./binary/kernel/netbsd-INSTALL.gz,,gp'
+CDRELEASE_EXCLUDE+=	-s ',./binary/kernel/netbsd-MONOLITHIC.gz,,gp'
+
 prepare_md_post:
 	${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" < ${.CURDIR}/boot.cfg.in > boot.cfg
 



CVS commit: src/distrib

2024-04-25 Thread Nia Alarie
Module Name:src
Committed By:   nia
Date:   Thu Apr 25 11:56:51 UTC 2024

Modified Files:
src/distrib/common: Makefile.bootcd
src/distrib/common/bootimage: Makefile.installimage
src/distrib/i386/cdroms/installcd: Makefile

Log Message:
remove redundant kernels and floppies from the space-starved i386 ISO


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.10 -r1.11 src/distrib/common/bootimage/Makefile.installimage
cvs rdiff -u -r1.11 -r1.12 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: src/distrib/sparc64/cdroms

2024-04-24 Thread Nia Alarie
Module Name:src
Committed By:   nia
Date:   Wed Apr 24 15:39:58 UTC 2024

Modified Files:
src/distrib/sparc64/cdroms: Makefile
Added Files:
src/distrib/sparc64/cdroms/installdvd: Makefile

Log Message:
sparc64 follows x86 and gets an installdvd image with all sets


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/sparc64/cdroms/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/sparc64/cdroms/installdvd/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

2024-04-24 Thread Nia Alarie
Module Name:src
Committed By:   nia
Date:   Wed Apr 24 15:39:58 UTC 2024

Modified Files:
src/distrib/sparc64/cdroms: Makefile
Added Files:
src/distrib/sparc64/cdroms/installdvd: Makefile

Log Message:
sparc64 follows x86 and gets an installdvd image with all sets


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/sparc64/cdroms/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/sparc64/cdroms/installdvd/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/Makefile
diff -u src/distrib/sparc64/cdroms/Makefile:1.1 src/distrib/sparc64/cdroms/Makefile:1.2
--- src/distrib/sparc64/cdroms/Makefile:1.1	Tue Mar  6 21:57:24 2007
+++ src/distrib/sparc64/cdroms/Makefile	Wed Apr 24 15:39:58 2024
@@ -1,6 +1,6 @@
-#   $NetBSD: Makefile,v 1.1 2007/03/06 21:57:24 bouyer Exp $
+#   $NetBSD: Makefile,v 1.2 2024/04/24 15:39:58 nia Exp $
 
-SUBDIR=		installcd
+SUBDIR=		installcd installdvd
 TARGETS+=	release iso_image
 
 .include 

Added files:

Index: src/distrib/sparc64/cdroms/installdvd/Makefile
diff -u /dev/null src/distrib/sparc64/cdroms/installdvd/Makefile:1.1
--- /dev/null	Wed Apr 24 15:39:58 2024
+++ src/distrib/sparc64/cdroms/installdvd/Makefile	Wed Apr 24 15:39:58 2024
@@ -0,0 +1,35 @@
+#	$NetBSD: Makefile,v 1.1 2024/04/24 15:39:58 nia Exp $
+
+.include 
+
+CDBASE=		sparc64dvd		# gives ${CDBASE}.iso
+CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
+CDKERNELS=	${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-GENERIC.gz	netbsd
+CD_SETS=	base etc
+.if ${MKKMOD} != "no"
+CD_SETS+=	modules
+.endif
+
+SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR}
+
+CDRELEASE_NOISOS=	true
+CDBOOTIMAGEDIR!= cd ${NETBSDSRCDIR}/distrib/sparc64/bootfs && ${PRINTOBJDIR}
+CDBOOTIMAGE=${CDBOOTIMAGEDIR}/boot.fs
+SUN_BOOT_ARGS:=  - - - - ${CDBOOTIMAGE}
+
+image_md_pre:
+	${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc
+	${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
+	${INSTALL} ${COPY} ${.CURDIR}/../installcd/etc.ttys cdrom/etc/ttys
+	${INSTALL} ${COPY} ${.CURDIR}/../installcd/etc.rc cdrom/etc/rc
+	${INSTALL} ${COPY} -m 0555 ${.CURDIR}/../installcd/install.sh cdrom/install.sh
+	${MKDIR} ${MKDIRPERM} cdrom/mnt2 cdrom/targetroot
+	${INSTALL} ${COPY} ${SYSINSTDIR}/sysinstmsgs.?? cdrom/usr/share/sysinst/catalog/
+
+image_md_post:
+	SUNLABEL=${TOOL_SUNLABEL:Q} \
+		${HOST_SH} ${NETBSDSRCDIR}/distrib/common/sunbootcd.sh \
+		${CDIMAGE} ${SUN_BOOT_ARGS}
+
+.include "${.CURDIR}/../../../common/Makefile.bootcd"
+



CVS commit: src/distrib

2024-04-24 Thread Nia Alarie
Module Name:src
Committed By:   nia
Date:   Wed Apr 24 11:29:35 UTC 2024

Modified Files:
src/distrib/amd64/cdroms: Makefile
src/distrib/cdrom: current.conf
src/distrib/common: Makefile.bootcd
src/distrib/i386/cdroms: Makefile
Added Files:
src/distrib/amd64/cdroms/installdvd: Makefile boot.cfg.in
src/distrib/i386/cdroms/installdvd: Makefile boot.cfg.in

Log Message:
Add "DVD" ISOs for x86 that don't have to follow CD size limitations.

These include all available sets.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/cdroms/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/amd64/cdroms/installdvd/Makefile \
src/distrib/amd64/cdroms/installdvd/boot.cfg.in
cvs rdiff -u -r1.13 -r1.14 src/distrib/cdrom/current.conf
cvs rdiff -u -r1.46 -r1.47 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.4 -r1.5 src/distrib/i386/cdroms/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/i386/cdroms/installdvd/Makefile \
src/distrib/i386/cdroms/installdvd/boot.cfg.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib

2024-04-24 Thread Nia Alarie
Module Name:src
Committed By:   nia
Date:   Wed Apr 24 11:29:35 UTC 2024

Modified Files:
src/distrib/amd64/cdroms: Makefile
src/distrib/cdrom: current.conf
src/distrib/common: Makefile.bootcd
src/distrib/i386/cdroms: Makefile
Added Files:
src/distrib/amd64/cdroms/installdvd: Makefile boot.cfg.in
src/distrib/i386/cdroms/installdvd: Makefile boot.cfg.in

Log Message:
Add "DVD" ISOs for x86 that don't have to follow CD size limitations.

These include all available sets.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/cdroms/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/amd64/cdroms/installdvd/Makefile \
src/distrib/amd64/cdroms/installdvd/boot.cfg.in
cvs rdiff -u -r1.13 -r1.14 src/distrib/cdrom/current.conf
cvs rdiff -u -r1.46 -r1.47 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.4 -r1.5 src/distrib/i386/cdroms/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/i386/cdroms/installdvd/Makefile \
src/distrib/i386/cdroms/installdvd/boot.cfg.in

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/Makefile
diff -u src/distrib/amd64/cdroms/Makefile:1.3 src/distrib/amd64/cdroms/Makefile:1.4
--- src/distrib/amd64/cdroms/Makefile:1.3	Tue Mar  6 21:52:44 2007
+++ src/distrib/amd64/cdroms/Makefile	Wed Apr 24 11:29:34 2024
@@ -1,8 +1,9 @@
-#	$NetBSD: Makefile,v 1.3 2007/03/06 21:52:44 bouyer Exp $
+#	$NetBSD: Makefile,v 1.4 2024/04/24 11:29:34 nia Exp $
 
 SUBDIR=
 SUBDIR+=	bootcd
 SUBDIR+=	bootcd-com
+SUBDIR+=	installdvd
 SUBDIR+=	installcd
 
 TARGETS+=   release iso_image

Index: src/distrib/cdrom/current.conf
diff -u src/distrib/cdrom/current.conf:1.13 src/distrib/cdrom/current.conf:1.14
--- src/distrib/cdrom/current.conf:1.13	Wed Jan 24 09:04:40 2018
+++ src/distrib/cdrom/current.conf	Wed Apr 24 11:29:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: current.conf,v 1.13 2018/01/24 09:04:40 skrll Exp $
+# $NetBSD: current.conf,v 1.14 2024/04/24 11:29:34 nia Exp $
 #
 # Makefile fragment for CD sets; includes config information.
 
@@ -32,6 +32,7 @@ CD_IMAGES+=	multi-cd3-${ISO_RELEASE}
 CD_IMAGES+=	acorn32cd-${ISO_RELEASE}
 CD_IMAGES+=	algorcd-${ISO_RELEASE}
 CD_IMAGES+=	alphacd-${ISO_RELEASE}
+CD_IMAGES+=	amd64dvd-${ISO_RELEASE}
 CD_IMAGES+=	amd64cd-${ISO_RELEASE}
 CD_IMAGES+=	amigacd-${ISO_RELEASE}
 CD_IMAGES+=	arccd-${ISO_RELEASE} 
@@ -51,6 +52,7 @@ CD_IMAGES+=	hppacd-${ISO_RELEASE}
 CD_IMAGES+=	hpcarmcd-${ISO_RELEASE}
 CD_IMAGES+=	hpcmipscd-${ISO_RELEASE}
 CD_IMAGES+=	hpcshcd-${ISO_RELEASE}
+CD_IMAGES+=	i386dvd-${ISO_RELEASE}
 CD_IMAGES+=	i386cd-${ISO_RELEASE}
 CD_IMAGES+=	ibmnwscd-${ISO_RELEASE}
 CD_IMAGES+=	iyonix-${ISO_RELEASE}
@@ -159,6 +161,7 @@ BASE_PORTS.multi-cd3-${ISO_RELEASE}=	cob
 BASE_PORTS.acorn32cd-${ISO_RELEASE}=acorn32
 BASE_PORTS.algorcd-${ISO_RELEASE}=algor
 BASE_PORTS.alphacd-${ISO_RELEASE}=alpha
+BASE_PORTS.amd64dvd-${ISO_RELEASE}=amd64
 BASE_PORTS.amd64cd-${ISO_RELEASE}=amd64
 BASE_PORTS.amigacd-${ISO_RELEASE}=amiga
 BASE_PORTS.arccd-${ISO_RELEASE}=arc
@@ -176,6 +179,7 @@ BASE_PORTS.hp300cd-${ISO_RELEASE}=hp300
 BASE_PORTS.hpcarmcd-${ISO_RELEASE}=hpcarm
 BASE_PORTS.hpcmipscd-${ISO_RELEASE}=hpcmips
 BASE_PORTS.hpcshcd-${ISO_RELEASE}=hpcsh
+BASE_PORTS.i386dvd-${ISO_RELEASE}=i386
 BASE_PORTS.i386cd-${ISO_RELEASE}=i386
 BASE_PORTS.iyonixcd-${ISO_RELEASE}=iyonix
 BASE_PORTS.ibmnwscd-${ISO_RELEASE}=ibmnws

Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.46 src/distrib/common/Makefile.bootcd:1.47
--- src/distrib/common/Makefile.bootcd:1.46	Tue Apr 23 20:37:07 2024
+++ src/distrib/common/Makefile.bootcd	Wed Apr 24 11:29:34 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.bootcd,v 1.46 2024/04/23 20:37:07 nia Exp $
+#	$NetBSD: Makefile.bootcd,v 1.47 2024/04/24 11:29:34 nia Exp $
 #
 # Makefile snipped to create a CD/DVD ISO
 #
@@ -123,6 +123,8 @@ ECHO?=		echo
 
 .if ${CDRELEASE} == false
 CDIMAGE=	${CDBASE}.iso
+.elif ${CDBASE:M*dvd}
+CDIMAGE=	NetBSD-${DISTRIBVER}-${CDBASE:S/dvd$//}-dvd.iso
 .else
 CDIMAGE=	NetBSD-${DISTRIBVER}-${CDBASE:S/cd$//}.iso
 .endif

Index: src/distrib/i386/cdroms/Makefile
diff -u src/distrib/i386/cdroms/Makefile:1.4 src/distrib/i386/cdroms/Makefile:1.5
--- src/distrib/i386/cdroms/Makefile:1.4	Tue Mar  6 21:52:45 2007
+++ src/distrib/i386/cdroms/Makefile	Wed Apr 24 11:29:34 2024
@@ -1,8 +1,9 @@
-#	$NetBSD: Makefile,v 1.4 2007/03/06 21:52:45 bouyer Exp $
+#	$NetBSD: Makefile,v 1.5 2024/04/24 11:29:34 nia Exp $
 
 SUBDIR=
 SUBDIR+=	bootcd
 SUBDIR+=	bootcd-com
+SUBDIR+=	installdvd
 SUBDIR+=	installcd
 
 TARGETS+=   release iso_image

Added files:

Index: src/distrib/amd64/cdroms/installdvd/Makefile
diff -u /dev/null src/distrib/amd64/cdroms/installdvd/Makefile:1.1
--- /dev/null	Wed Apr 24 11:29:35 2024
+++ src/distrib/amd64/cdroms/installdvd/Makefile	Wed Apr 24 11:29:34 2024
@@ -0,0 +1,19 @@
+#	$NetBSD: Makefile,v 1.1 2024/04/24 11:29:34 nia Exp $
+#
+

CVS commit: src/distrib/sparc64/cdroms/installcd

2024-04-23 Thread Nia Alarie
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

2024-04-23 Thread Nia Alarie
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/distrib/vax/floppy

2024-04-23 Thread Christos Zoulas
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

2024-04-23 Thread Christos Zoulas
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

2024-04-23 Thread Christos Zoulas
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

2024-04-23 Thread Christos Zoulas
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

2024-04-23 Thread Nia Alarie
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

2024-04-23 Thread Nia Alarie
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: src/distrib

2024-04-23 Thread Nia Alarie
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

2024-04-23 Thread Nia Alarie
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"



  1   2   3   4   5   6   7   8   9   10   >