[src/netbsd-10]: src Pull up following revision(s) (requested by lukem in tic...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f625f030d8b8
branches:  netbsd-10
changeset: 376044:f625f030d8b8
user:      martin <martin%NetBSD.org@localhost>
date:      Sun May 28 09:58:40 2023 +0000

description:
Pull up following revision(s) (requested by lukem in ticket #178):

        etc/etc.mac68k/Makefile.inc: revision 1.24
        distrib/cdrom/Makefile: revision 1.53

Creating Type&Creator 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.

Reported upstream as <https://codeberg.org/schilytools/schilytools/issues/58>.

Arguably fixes PR toolchain/42166

Request pull-ups to netbsd-{8,9,10}.
XXX What about macppc?

diffstat:

 distrib/cdrom/Makefile      |  6 +++---
 etc/etc.mac68k/Makefile.inc |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 6d99cec5860b -r f625f030d8b8 distrib/cdrom/Makefile
--- a/distrib/cdrom/Makefile    Sun May 28 09:49:03 2023 +0000
+++ b/distrib/cdrom/Makefile    Sun May 28 09:58:40 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2018/01/24 09:04:40 skrll Exp $
+# $NetBSD: Makefile,v 1.52.14.1 2023/05/28 09:58:41 martin Exp $
 #
 # Consult "*.conf" for the configuration variables; this Makefile is typically
 # not edited for basic configuration changes.
@@ -288,7 +288,7 @@ MKISOFS_ARGS.${image}+=     -b ${BOOTFILE.am
 MKISOFS_ARGS.${image}+= -b ${BOOTFILE.amd64} -c boot.catalog
 .endif
 .endif
-        
+
 # Mac (mac68k, macppc)
 
 .if !empty(ports:Mmacppc)
@@ -299,7 +299,7 @@ MKISOFS_ARGS.${image}+=     -hfs -part -hide
 UUDECODE_FILES=        ${BOOTHFS}
 .include <bsd.files.mk>
 .elif defined(USE_APPLE_ISO) || !empty(ports:Mmac68k)
-MKISOFS_ARGS.${image}+=        -apple --macbin -map ${.CURDIR}/hfsmap.lst
+MKISOFS_ARGS.${image}+=        -apple --macbin -data-change-warn -map ${.CURDIR}/hfsmap.lst
 .endif
 
 # Sun (sparc, sparc64, sun3)
diff -r 6d99cec5860b -r f625f030d8b8 etc/etc.mac68k/Makefile.inc
--- a/etc/etc.mac68k/Makefile.inc       Sun May 28 09:49:03 2023 +0000
+++ b/etc/etc.mac68k/Makefile.inc       Sun May 28 09:58:40 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.23 2019/07/26 11:38:21 rin Exp $
+#      $NetBSD: Makefile.inc,v 1.23.10.1 2023/05/28 09:58:40 martin Exp $
 #
 #      etc.mac68k/Makefile.inc -- mac68k-specific etc Makefile targets
 #
@@ -18,7 +18,7 @@ snap_md_post:
 
 # For "make iso-image"
 # mkisofs arguments to create a hybrid (HFS/Rockridge) CD-ROM image.
-MKISOFS_FLAGS+=        -hfs --macbin \
+MKISOFS_FLAGS+=        -hfs --macbin -data-change-warn \
        -map ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/extensions.map
 
 iso-image: do-iso-image