NetBSD-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: install/57780: opensslcertsrehash limited to DEST_DIR=/



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

From: Taylor R Campbell <riastradh%NetBSD.org@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: install-manager%netbsd.org@localhost, gnats-admin%netbsd.org@localhost, netbsd-bugs%netbsd.org@localhost
Subject: Re: install/57780: opensslcertsrehash limited to DEST_DIR=/
Date: Sun, 17 Dec 2023 15:13:07 +0000

 This is a multi-part message in MIME format.
 --=_uYve6LJUJbusqt1t17g4r8OQ3Se97Nkl
 
 Should be fixed by this commit:
 
 https://mail-index.netbsd.org/source-changes/2023/09/08/msg147487.html
 
 Patch attached, can you give it a try, and maybe we can pull it up?
 
 --=_uYve6LJUJbusqt1t17g4r8OQ3Se97Nkl
 Content-Type: text/plain; charset="ISO-8859-1"; name="postinstalldestdirslash"
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: attachment; filename="postinstalldestdirslash.patch"
 
 From 5278b8e44df34702d8041b06cf76319dea99b5ed Mon Sep 17 00:00:00 2001
 From: riastradh <riastradh%NetBSD.org@localhost>
 Date: Fri, 8 Sep 2023 12:01:56 +0000
 Subject: [PATCH] Makefile: Run `postinstall -d /', not `postinstall -d //'.
 
 This happens when doing `build.sh install=3D/'.  The message is less
 confusing and it makes postinstall's job simpler for detecting when
 it's installing to / rather than somewhere else.
 ---
  Makefile | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/Makefile b/Makefile
 index 9694811ddb98..5c9d95ca29b9 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,4 +1,4 @@
 -#	$NetBSD: Makefile,v 1.337 2023/06/11 10:43:51 lukem Exp $
 +#	$NetBSD: Makefile,v 1.338 2023/09/08 12:01:56 riastradh Exp $
 =20
  #
  # This is the top-level makefile for building NetBSD. For an outline of
 @@ -190,23 +190,23 @@ _POSTINSTALL_X11=3D-x ${X11SRCDIR:Q}
 =20
  postinstall-check: .PHONY
  	@echo "   =3D=3D=3D Post installation checks =3D=3D=3D"
 -	${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTA=
 LL_X11} -d ${DESTDIR}/ check; if [ $$? -gt 1 ]; then exit 1; fi
 +	${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTA=
 LL_X11} -d ${DESTDIR:C/^\/$//}/ check; if [ $$? -gt 1 ]; then exit 1; fi
  	@echo "   =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D"
 =20
  postinstall-fix: .NOTMAIN .PHONY
  	@echo "   =3D=3D=3D Post installation fixes =3D=3D=3D"
 -	${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTA=
 LL_X11} -d ${DESTDIR}/ fix
 +	${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTA=
 LL_X11} -d ${DESTDIR:C/^\/$//}/ fix
  	@echo "   =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D"
 =20
  postinstall-fix-obsolete: .NOTMAIN .PHONY
  	@echo "   =3D=3D=3D Removing obsolete files =3D=3D=3D"
 -	${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTA=
 LL_X11} -d ${DESTDIR}/ fix obsolete
 +	${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTA=
 LL_X11} -d ${DESTDIR:C/^\/$//}/ fix obsolete
  	@echo "   =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D"
 =20
  postinstall-fix-obsolete_stand: .NOTMAIN .PHONY
  	@echo "   =3D=3D=3D Removing obsolete files =3D=3D=3D"
 -	${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTA=
 LL_X11} -d ${DESTDIR}/ fix obsolete_stand
 -	${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTA=
 LL_X11} -d ${DESTDIR}/ fix obsolete_stand_debug
 +	${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTA=
 LL_X11} -d ${DESTDIR:C/^\/$//}/ fix obsolete_stand
 +	${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTA=
 LL_X11} -d ${DESTDIR:C/^\/$//}/ fix obsolete_stand_debug
  	@echo "   =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D"
 =20
 =20
 
 --=_uYve6LJUJbusqt1t17g4r8OQ3Se97Nkl--
 


Home | Main Index | Thread Index | Old Index