svn commit: r465960 - in head/sysutils/runit-faster: . files
Tobias Kortkamp
tobik at FreeBSD.org
Fri Mar 30 11:09:47 UTC 2018
Author: tobik
Date: Fri Mar 30 11:09:45 2018
New Revision: 465960
URL: https://svnweb.freebsd.org/changeset/ports/465960
Log:
sysutils/runit-faster: Update scripts to 0.1.18
- Add svclone script for creating copies of services, adding/updating
supervise symlinks, etc.
- Stop resetting the current runlevel to the default on every update
- When /var/service already exists on the system make sure to try and
update it on install and not just create a symlink under it
- With ROOT=on be more conservative with what's installed into /sbin,
just enough to bootstrap the system until /usr/local is mounted
Added:
head/sysutils/runit-faster/files/pkg-message.in
- copied, changed from r465959, head/sysutils/runit-faster/pkg-message
Deleted:
head/sysutils/runit-faster/pkg-message
Modified:
head/sysutils/runit-faster/Makefile
head/sysutils/runit-faster/distinfo
head/sysutils/runit-faster/files/runsvdir.in
head/sysutils/runit-faster/pkg-plist
Modified: head/sysutils/runit-faster/Makefile
==============================================================================
--- head/sysutils/runit-faster/Makefile Fri Mar 30 11:08:35 2018 (r465959)
+++ head/sysutils/runit-faster/Makefile Fri Mar 30 11:09:45 2018 (r465960)
@@ -4,7 +4,7 @@
PORTNAME= runit
DISTVERSION= ${RUNITVERSION}-${CONFVERSION}
RUNITVERSION= 2.1.2
-CONFVERSION= 0.1.17
+CONFVERSION= 0.1.18
CATEGORIES= sysutils
MASTER_SITES= http://smarden.org/runit/ \
http://www.bayofrum.net/dist/runit/ \
@@ -25,17 +25,20 @@ RUN_DEPENDS= snooze:sysutils/snooze
CONFLICTS_INSTALL= runit
PLIST_SUB= RUNITDIR=${RUNITDIR}
+SUB_FILES= pkg-message
+SUB_LIST= RUNITDIR=${RUNITDIR}
USE_RC_SUBR= runsvdir
WRKSRC= ${WRKDIR}/admin/runit-${RUNITVERSION}
OPTIONS_DEFINE= DOCS ROOT
+OPTIONS_SUB= yes
ROOT_DESC= Install bootstrap files into /etc/runit and /sbin
PORTDOCS= *
ROOT_VARS= RUNITDIR=/etc/runit SBINDIR=/sbin
-ROOT_VARS_OFF= RUNITDIR=${PREFIX}/etc/runit SBINDIR=${PREFIX}/sbin
+ROOT_VARS_OFF= RUNITDIR=${ETCDIR} SBINDIR=${PREFIX}/sbin
post-patch:
@${REINPLACE_CMD} -e 's,/service/,/var/service,' \
@@ -56,7 +59,11 @@ do-build:
do-install:
@${MKDIR} ${STAGEDIR}${RUNITDIR} ${STAGEDIR}${SBINDIR}
- ${INSTALL_PROGRAM} ${WRKSRC}/command/* ${STAGEDIR}${SBINDIR}
+ cd ${WRKSRC}/command && ${INSTALL_PROGRAM} runit runit-init \
+ ${STAGEDIR}${SBINDIR}
+ cd ${WRKSRC}/command && ${INSTALL_PROGRAM} \
+ chpst runsv runsvchdir runsvdir sv svlogd utmpset \
+ ${STAGEDIR}${PREFIX}/sbin
${INSTALL_MAN} ${WRKSRC}/man/*.8 ${STAGEDIR}${PREFIX}/man/man8
@${DO_MAKE_BUILD} -C ${WRKDIR}/freebsd-runit-${CONFVERSION} \
DESTDIR=${STAGEDIR} \
@@ -76,20 +83,15 @@ do-install-DOCS-on:
cd ${WRKSRC} && ${INSTALL_DATA} \
package/CHANGES package/README package/THANKS doc/*.html \
${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKDIR}/freebsd-runit-${CONFVERSION}/docs/runit-faster.md \
+ ${STAGEDIR}${DOCSDIR}
post-install:
# Micromanaging pkg-plist is no fun here... Generate it on the fly
# instead.
- @${FIND} -s ${STAGEDIR}${RUNITDIR} ${STAGEDIR}${PREFIX}/etc/sv ${STAGEDIR}${SBINDIR} \
- -not -type d | ${SORT} | ${SED} \
- -e 's,^${STAGEDIR},,' \
- -e 's,^${PREFIX}/,,' \
+ @${FIND} -s ${STAGEDIR}${PREFIX}/etc/sv -not -type d | ${SORT} | \
+ ${SED} -e 's,^${STAGEDIR},,' -e 's,^${PREFIX}/,,' \
>> ${TMPPLIST}
- @${FIND} -s ${STAGEDIR}${RUNITDIR} ${STAGEDIR}${PREFIX}/etc/sv ${STAGEDIR}${SBINDIR} \
- -type d | ${SORT} | ${SED} \
- -e 's,^${STAGEDIR},,' \
- -e 's,^${PREFIX}/,,' \
- -e 's,^, at dir ,' >> ${TMPPLIST}
do-test:
@cd ${WRKSRC} && package/check
Modified: head/sysutils/runit-faster/distinfo
==============================================================================
--- head/sysutils/runit-faster/distinfo Fri Mar 30 11:08:35 2018 (r465959)
+++ head/sysutils/runit-faster/distinfo Fri Mar 30 11:09:45 2018 (r465960)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1521729148
+TIMESTAMP = 1522395709
SHA256 (runit-2.1.2.tar.gz) = 6fd0160cb0cf1207de4e66754b6d39750cff14bb0aa66ab49490992c0c47ba18
SIZE (runit-2.1.2.tar.gz) = 110916
-SHA256 (freebsd-runit-0.1.17.tar.gz) = 8d560ebb27f5b1f76c74571f18a1341ee05a1a5168dc726e036fa4e962d4fab8
-SIZE (freebsd-runit-0.1.17.tar.gz) = 17399
+SHA256 (freebsd-runit-0.1.18.tar.gz) = 513edafe8ceb5a38ee9a9c2f9c026e8d06ca3b839949ce183351c645a382db07
+SIZE (freebsd-runit-0.1.18.tar.gz) = 22398
Copied and modified: head/sysutils/runit-faster/files/pkg-message.in (from r465959, head/sysutils/runit-faster/pkg-message)
==============================================================================
--- head/sysutils/runit-faster/pkg-message Fri Mar 30 11:08:35 2018 (r465959, copy source)
+++ head/sysutils/runit-faster/files/pkg-message.in Fri Mar 30 11:09:45 2018 (r465960)
@@ -1,2 +1,2 @@
-Please see https://people.freebsd.org/~tobik/runit-faster.html for
-usage instructions.
+Please see https://people.freebsd.org/~tobik/runit-faster.html or
+%%DOCSDIR%%/runit-faster.md for usage instructions.
Modified: head/sysutils/runit-faster/files/runsvdir.in
==============================================================================
--- head/sysutils/runit-faster/files/runsvdir.in Fri Mar 30 11:08:35 2018 (r465959)
+++ head/sysutils/runit-faster/files/runsvdir.in Fri Mar 30 11:09:45 2018 (r465960)
@@ -28,6 +28,8 @@ stop_postcmd="%%PREFIX%%/sbin/sv exit ${runsvdir_path}
runsvdir_start()
{
+ /bin/mkdir -p /var/run/runit/runsvdir
+ /bin/ln -sF %%RUNITDIR%%/runsvdir/current /var/run/runit/runsvdir/current
/bin/test -d ${runsvdir_path} || /bin/mkdir -p ${runsvdir_path}
/usr/bin/env -i \
PATH=/bin:/sbin:/usr/bin:/usr/sbin:%%PREFIX%%/bin:%%PREFIX%%/sbin:/rescue \
Modified: head/sysutils/runit-faster/pkg-plist
==============================================================================
--- head/sysutils/runit-faster/pkg-plist Fri Mar 30 11:08:35 2018 (r465959)
+++ head/sysutils/runit-faster/pkg-plist Fri Mar 30 11:09:45 2018 (r465960)
@@ -1,3 +1,37 @@
+bin/svclone
+%%ROOT%%@dir %%RUNITDIR%%
+%%ROOT%%@dir %%RUNITDIR%%/core-services
+%%RUNITDIR%%/1
+%%RUNITDIR%%/2
+%%RUNITDIR%%/3
+%%RUNITDIR%%/core-services/11-kld.sh
+%%RUNITDIR%%/core-services/11-set-defaults.sh
+%%RUNITDIR%%/core-services/21-swap.sh
+%%RUNITDIR%%/core-services/31-enable-dumpdev.sh
+%%RUNITDIR%%/core-services/31-fsck.sh
+%%RUNITDIR%%/core-services/31-mount.sh
+%%RUNITDIR%%/core-services/33-microcode_update.sh
+%%RUNITDIR%%/core-services/33-var.sh
+%%RUNITDIR%%/core-services/41-entropy.sh
+%%RUNITDIR%%/core-services/41-hostid.sh
+%%RUNITDIR%%/core-services/41-hostname.sh
+%%RUNITDIR%%/core-services/41-ldconfig.sh
+%%RUNITDIR%%/core-services/41-loopback.sh
+%%RUNITDIR%%/core-services/41-mixer.sh
+%%RUNITDIR%%/core-services/41-nextboot.sh
+%%RUNITDIR%%/core-services/41-rctl.sh
+%%RUNITDIR%%/core-services/43-bhyve-bridge.sh
+%%RUNITDIR%%/core-services/51-pf.sh
+%%RUNITDIR%%/core-services/99-cleanup.sh
+%%RUNITDIR%%/core-services/99-mount-late.sh
+%%RUNITDIR%%/core-services/99-qemu_user_static.sh
+%%RUNITDIR%%/ctrlaltdel
+%%RUNITDIR%%/functions
+%%RUNITDIR%%/jail
+%%RUNITDIR%%/reboot
+ at dir %%RUNITDIR%%/runsvdir
+ at dir %%RUNITDIR%%/runsvdir/default
+%%RUNITDIR%%/stopit
man/man8/chpst.8.gz
man/man8/runit-init.8.gz
man/man8/runit.8.gz
@@ -7,7 +41,17 @@ man/man8/runsvdir.8.gz
man/man8/sv.8.gz
man/man8/svlogd.8.gz
man/man8/utmpset.8.gz
+sbin/chpst
+%%ROOT%%/sbin/runit
+%%NO_ROOT%%sbin/runit
+%%ROOT%%/sbin/runit-init
+%%NO_ROOT%%sbin/runit-init
+sbin/runsv
+sbin/runsvchdir
+sbin/runsvdir
+sbin/sv
+sbin/svlogd
+sbin/utmpset
@postexec [ ! -e %%RUNITDIR%%/runsvdir/current ] && cd %%RUNITDIR%%/runsvdir && ln -s default current
- at postunexec rm -f %%RUNITDIR%%/runsvdir/current
- at postexec ln -sf /var/run/runit/runsvdir/current /var/service
- at postunexec rm -f /var/service
+ at postexec ln -sF /var/run/runit/runsvdir/current /var/service
+ at rmtry /var/service
More information about the svn-ports-all
mailing list