Date: Sun, 19 Feb 2006 05:17:59 +0800 (CST) From: Xin LI <delphij@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: re@FreeBSD.org, portmgr@FreeBSD.org Subject: ports/93536: [PATCH] Correct rc.d installation in bsd.port.mk for RELENG_6 Message-ID: <200602182117.k1ILHxEB012222@tarsier.delphij.net> Resent-Message-ID: <200602182120.k1ILK8YF040124@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 93536
>Category: ports
>Synopsis: [PATCH] Correct rc.d installation in bsd.port.mk for RELENG_6
>Confidential: no
>Severity: critical
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Feb 18 21:20:08 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Xin LI
>Release: FreeBSD 6.1-PRERELEASE i386
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD tarsier.delphij.net 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #8: Sat Feb 18 01:46:38 CST 2006 delphij@tarsier.delphij.net:/usr/obj/usr/src/sys/TARSIER i386
>Description:
The new rc.d order was MFC'ed by __FreeBSD_version 600101,
however, bsd.port.mk does not have knowledge about it.
This is a show-stopper that must be corrected before
6.1-RELEASE or rc.d scripts installed by ports would be
unable to run.
>How-To-Repeat:
Install a port that uses rc.d script on new RELENG_6 system.
>Fix:
Because 700007 is greater than 600101, we should change it
to 600101.
--- patch-bsd.port.mk begins here ---
Index: bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.525
diff -u -r1.525 bsd.port.mk
--- bsd.port.mk 11 Feb 2006 02:34:48 -0000 1.525
+++ bsd.port.mk 18 Feb 2006 21:12:17 -0000
@@ -5123,7 +5123,7 @@
.if defined(USE_RC_SUBR) && ${USE_RC_SUBR:U} != "YES"
@${ECHO_CMD} "===> Installing rc.d startup script(s)"
@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
-.if ${OSVERSION} >= 700007
+.if ${OSVERSION} >= 600101
@for i in ${USE_RC_SUBR}; do \
${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${PREFIX}/etc/rc.d/$${i%.sh}; \
${ECHO_CMD} "etc/rc.d/$${i%.sh}" >> ${TMPPLIST}; \
--- patch-bsd.port.mk ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200602182117.k1ILHxEB012222>