aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuel Vadot <manu@FreeBSD.org>2019-09-05 14:08:45 +0000
committerEmmanuel Vadot <manu@FreeBSD.org>2019-09-05 14:08:45 +0000
commit8c15be73b6db4c0a826c5e7a08aaf7a08a16a645 (patch)
tree7c4480e012db1f60c403c6280e817515ad61f3bd
parentc2a7c3bedd9f6d0d97918c7253df31722c7d47fa (diff)
downloadsrc-8c15be73b6db4c0a826c5e7a08aaf7a08a16a645.tar.gz
src-8c15be73b6db4c0a826c5e7a08aaf7a08a16a645.zip
pkgbase: Move rc scripts and related files to their own packages
It doesn't need to be in runtime and might help people who want to experiment with other rc system or don't use one (like in small embedded mfsroot). Reviewed by: bapt, gjb Differential Revision: https://reviews.freebsd.org/D21499
Notes
Notes: svn path=/head/; revision=351851
-rw-r--r--libexec/rc/Makefile5
-rw-r--r--libexec/rc/rc.d/Makefile3
-rw-r--r--release/packages/Makefile.package2
-rw-r--r--sbin/rcorder/Makefile2
4 files changed, 8 insertions, 4 deletions
diff --git a/libexec/rc/Makefile b/libexec/rc/Makefile
index 3e75a15201b9..974eb8661182 100644
--- a/libexec/rc/Makefile
+++ b/libexec/rc/Makefile
@@ -5,6 +5,8 @@
CONFGROUPS= CONFETC CONFETCEXEC CONFETCDEFAULTS
CONFETCDIR= /etc
CONFETC= network.subr rc rc.initdiskless rc.subr rc.shutdown rc.bsdextended
+CONFETCPACKAGE= rc
+
.if ${MK_IPFW} != "no"
CONFETC+= rc.firewall
.endif
@@ -15,9 +17,10 @@ CONFETCMODE= 644
CONFETCEXEC= netstart pccard_ether rc.resume rc.suspend
CONFETCEXECDIR= /etc
CONFETCEXECMODE= 755
+CONFETCEXECPACKAGE= rc
CONFETCDEFAULTSDIR= /etc/defaults
CONFETCDEFAULTS= rc.conf
-#PACKAGE=rc
+CONFETCDEFAULTSPACKAGE= rc
SUBDIR+= rc.d
diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile
index 40e594bca570..06b365abb100 100644
--- a/libexec/rc/rc.d/Makefile
+++ b/libexec/rc/rc.d/Makefile
@@ -4,7 +4,7 @@
CONFDIR= /etc/rc.d
CONFGROUPS= CONFS
-#PACKAGE=rc
+CONFSPACKAGE= rc
CONFS= DAEMON \
FILESYSTEMS \
@@ -324,7 +324,6 @@ ZFS+= zfs
ZFS+= zfsbe
ZFS+= zfsd
ZFS+= zvol
-ZFSPACKAGE= zfs
.endif
.for fg in ${CONFGROUPS}
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index b590b4563351..03c7815231aa 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -57,6 +57,8 @@ kernel_COMMENT= FreeBSD Kernel
kernel_DESC= FreeBSD Kernel
manuals_COMMENT= Manual Pages
manuals_DESC= Manual Pages
+rc_COMMENT= RC Scripts
+rc_DESC= RC Scripts
rcmds_COMMENT= Remote Command Utilities
rcmds_DESC= Remote Command Utilities
rescue_COMMENT= Rescue Utilities
diff --git a/sbin/rcorder/Makefile b/sbin/rcorder/Makefile
index 71bc82c60b33..7bab197ed4ab 100644
--- a/sbin/rcorder/Makefile
+++ b/sbin/rcorder/Makefile
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.1 1999/11/23 05:28:20 mrg Exp $
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=rc
PROG= rcorder
SRCS= ealloc.c hash.c rcorder.c
MAN= rcorder.8