Re: misc/58098: build.sh release fails due to missing METALOG entries

[Rob Whitlock <rwhitlock22%gmail.com@localhost>]

The following reply was made to PR misc/58098; it has been noted by GNATS.

From: Rob Whitlock <rwhitlock22%gmail.com@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: misc-bug-people%netbsd.org@localhost,
 gnats-admin%netbsd.org@localhost,
 netbsd-bugs%netbsd.org@localhost
Subject: Re: misc/58098: build.sh release fails due to missing METALOG entries
Date: Sun, 14 Apr 2024 23:02:48 -0400

 --Apple-Mail=_31BEBA01-8262-4223-97A5-8DDA861653FB
 Content-Transfer-Encoding: 7bit
 Content-Type: text/plain;
 	charset=us-ascii
 
 
 > On Apr 8, 2024, at 10:20 AM, Rob Whitlock <rwhitlock22%gmail.com@localhost> wrote:
 --Apple-Mail=_31BEBA01-8262-4223-97A5-8DDA861653FB
 Content-Disposition: attachment;
 	filename=METALOG.diff
 Content-Type: application/octet-stream;
 	x-unix-mode=0644;
 	name="METALOG.diff"
 Content-Transfer-Encoding: 7bit
 
 Index: share/mk/bsd.kmodule.mk
 ===================================================================
 RCS file: /cvsroot/src/share/mk/bsd.kmodule.mk,v
 retrieving revision 1.81
 diff -u -r1.81 bsd.kmodule.mk
 --- share/mk/bsd.kmodule.mk	7 Aug 2022 23:42:09 -0000	1.81
 +++ share/mk/bsd.kmodule.mk	14 Apr 2024 12:06:03 -0000
 @@ -206,10 +206,12 @@
  _INST_DIRS+=	/netbsd/modules
  KMODULEDIR=	/netbsd/modules/${KMOD}
  .else
 -# Ensure these are recorded properly in METALOG on unprived installes:
 +# Ensure these are recorded properly in METALOG on unprived installs:
  _OSRELEASE!=	${HOST_SH} $S/conf/osrelease.sh -k
  KMODULEARCHDIR?= ${MACHINE}
 -_INST_DIRS=	/stand/${KMODULEARCHDIR}
 +_INST_DIRS=	/
 +_INST_DIRS+=	/stand
 +_INST_DIRS+=	/stand/${KMODULEARCHDIR}
  _INST_DIRS+=	/stand/${KMODULEARCHDIR}/${_OSRELEASE}
  _INST_DIRS+=	/stand/${KMODULEARCHDIR}/${_OSRELEASE}/modules
  KMODULEDIR=	/stand/${KMODULEARCHDIR}/${_OSRELEASE}/modules/${KMOD}
 @@ -242,7 +244,7 @@
  	${_MKTARGET_INSTALL}
  	dirs=${_INST_DIRS:Q}; \
  	for d in $$dirs; do \
 -		${INSTALL_DIR} ${DESTDIR}$$d; \
 +		${INSTALL_DIR} -o root -g wheel -m 0755 ${DESTDIR}$$d; \
  	done
  	${INSTALL_FILE} -o ${KMODULEOWN} -g ${KMODULEGRP} -m ${KMODULEMODE} \
  		${.ALLSRC} ${.TARGET}
 
 --Apple-Mail=_31BEBA01-8262-4223-97A5-8DDA861653FB
 Content-Transfer-Encoding: quoted-printable
 Content-Type: text/plain;
 	charset=us-ascii
 
 >> On Apr 5, 2024, at 8:47 AM, Martin Husemann <martin%duskware.de@localhost> =3D
 > wrote:
 
 [snip]
 
 >> This is a bug and should be fixed.
 >=20
 > I have included a patch below that fixes the problem, as well as a =
 typo =3D
 > and it also writes the owner and group for other directories, which =
 were =3D
 > missing in the METALOG. I also included the mode, even though 0755 is =
 =3D
 > the default and it was being written into the METALOG already.
 >=20
 > The patch does not address the issue that directories are written to =3D=
 
 > METALOG redundantly, however this doesn't seem to cause an issue =
 because =3D
 > METLOG.sanitized is created without the duplicates.
 
 I somehow missed that the previous patch fails when DESTDIR doesn't =
 exist. The attached patch corrects this.
 
 
 --Apple-Mail=_31BEBA01-8262-4223-97A5-8DDA861653FB--