Re: CVS commit: src

[Luke Mewburn <luke%mewburn.net@localhost>]

On 23-05-19 14:47, Hauke Fath wrote:
  | Module Name:	src
  | Committed By:	hauke
  | Date:		Fri May 19 14:47:16 UTC 2023
  | 
  | Modified Files:
  | 	src/distrib/cdrom: Makefile
  | 	src/etc/etc.mac68k: Makefile.inc
  | 
  | Log Message:
  | 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

I think you meant toolchain/41266.


  | Request pull-ups to netbsd-{8,9,10}.
  | 
  | XXX What about macppc?
  | 
  | 
  | To generate a diff of this commit:
  | cvs rdiff -u -r1.52 -r1.53 src/distrib/cdrom/Makefile
  | cvs rdiff -u -r1.23 -r1.24 src/etc/etc.mac68k/Makefile.inc
  | 
  | 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.52 src/distrib/cdrom/Makefile:1.53
  | --- src/distrib/cdrom/Makefile:1.52	Wed Jan 24 09:04:40 2018
  | +++ src/distrib/cdrom/Makefile	Fri May 19 14:47:16 2023
  | @@ -1,4 +1,4 @@
  | -# $NetBSD: Makefile,v 1.52 2018/01/24 09:04:40 skrll Exp $
  | +# $NetBSD: Makefile,v 1.53 2023/05/19 14:47:16 hauke 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)
  | 
  | Index: src/etc/etc.mac68k/Makefile.inc
  | diff -u src/etc/etc.mac68k/Makefile.inc:1.23 src/etc/etc.mac68k/Makefile.inc:1.24
  | --- src/etc/etc.mac68k/Makefile.inc:1.23	Fri Jul 26 11:38:21 2019
  | +++ src/etc/etc.mac68k/Makefile.inc	Fri May 19 14:47:16 2023
  | @@ -1,4 +1,4 @@
  | -#	$NetBSD: Makefile.inc,v 1.23 2019/07/26 11:38:21 rin Exp $
  | +#	$NetBSD: Makefile.inc,v 1.24 2023/05/19 14:47:16 hauke 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
  |