summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2012-01-25 13:06:55 -0600
committerWilliam Hubbs <williamh@gentoo.org>2012-02-20 20:13:11 -0600
commit32c506a4c813b77f9cad4051409bac15f9696e14 (patch)
treed5c8ec1fd7b74cbd4ca16e9e01e3c09df8434b74
parent04db6c3d39f1c2e81e7d6d98f17388e2003bc17f (diff)
downloadopenrc-32c506a4c813b77f9cad4051409bac15f9696e14.tar.gz
openrc-32c506a4c813b77f9cad4051409bac15f9696e14.tar.bz2
openrc-32c506a4c813b77f9cad4051409bac15f9696e14.tar.xz
Drop rc_sys definition from build system
-rw-r--r--README15
-rw-r--r--etc/Makefile9
-rw-r--r--etc/rc.conf.FreeBSD2
-rw-r--r--etc/rc.conf.Linux2
-rw-r--r--etc/rc.conf.NetBSD2
-rw-r--r--mk/scripts.mk2
6 files changed, 4 insertions, 28 deletions
diff --git a/README b/README
index 238af5f..e43fcb9 100644
--- a/README
+++ b/README
@@ -12,7 +12,6 @@ LIBNAME=lib64
DESTDIR=/tmp/openrc-image
MKPAM=pam
MKPKGCONFIG=no
-MKRCSYS=prefix
MKSELINUX=yes
MKSTATICLIBS=no
MKTERMCAP=ncurses
@@ -34,20 +33,6 @@ LOCAL_PREFIX should be set when to where user maintained packages are.
Only set LOCAL_PREFIX if different from PKG_PREFIX.
PREFIX should be set when OpenRC is not installed to /.
-MKRCSYS should be set only if you need to specify a default system
-subtype. The subtype should be set to match the type of environment the
-file is installed into, not the virtualization the environment is
-capable of handling. Here is a list of subtypes and their meanings.
-
-jail FreeBSD jail
-lxc Linux container
-openvz Linux OpenVZ
-prefix Linux and *BSD prefix system
-uml UsermodeLinux
-vserver Linux vserver
-xen0 Linux and NetBSD xen0 Domain
-xenU Linux and NetBSD xenU Domain
-
If any of the following files exist then we do not overwrite them
/etc/devd.conf
/etc/rc
diff --git a/etc/Makefile b/etc/Makefile
index 8bcf19b..53bf47c 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -24,14 +24,5 @@ SED_EXTRA= ${SED_EXTRA-${OS}}
include ${MK}/scripts.mk
-# We can't use "ifndef" here because that treats set-but-empty
-# as not-set which is not what we want
-MKRCSYS ?= automagicplease
-ifeq (${MKRCSYS},automagicplease)
-# If the user isn't picking a default, then have the
-# config go with runtime automagic detection #357247
-rc.conf: SED_EXTRA += -e '/^rc_sys=""/s:^:\#:'
-MKRCSYS =
-endif
rc.conf: rc.conf.in rc.conf.${OS}
${SED} ${SED_REPLACE} ${SED_EXTRA} $^ > $@
diff --git a/etc/rc.conf.FreeBSD b/etc/rc.conf.FreeBSD
index d557213..d2b6d94 100644
--- a/etc/rc.conf.FreeBSD
+++ b/etc/rc.conf.FreeBSD
@@ -10,5 +10,5 @@
#
# This should be set to the value representing the environment this file is
# PRESENTLY in, not the virtualization the environment is capable of.
-rc_sys="@RC_SYS_DEFAULT@"
+#rc_sys=""
diff --git a/etc/rc.conf.Linux b/etc/rc.conf.Linux
index e88fc53..d79165d 100644
--- a/etc/rc.conf.Linux
+++ b/etc/rc.conf.Linux
@@ -16,7 +16,7 @@
#
# This should be set to the value representing the environment this file is
# PRESENTLY in, not the virtualization the environment is capable of.
-rc_sys="@RC_SYS_DEFAULT@"
+#rc_sys=""
# This is the number of tty's used in most of the rc-scripts (like
# consolefont, numlock, etc ...)
diff --git a/etc/rc.conf.NetBSD b/etc/rc.conf.NetBSD
index 864aa55..af7adf6 100644
--- a/etc/rc.conf.NetBSD
+++ b/etc/rc.conf.NetBSD
@@ -11,5 +11,5 @@
#
# This should be set to the value representing the environment this file is
# PRESENTLY in, not the virtualization the environment is capable of.
-rc_sys="@RC_SYS_DEFAULT@"
+#rc_sys=""
diff --git a/mk/scripts.mk b/mk/scripts.mk
index 7528c27..7a79821 100644
--- a/mk/scripts.mk
+++ b/mk/scripts.mk
@@ -12,7 +12,7 @@ _PKG_SED:= $(shell ${_PKG_SED_SH})
_LCL_SED_SH= if test "${PREFIX}" = "${LOCAL_PREFIX}"; then echo "-e 's:@LOCAL_PREFIX@::g'"; else echo "-e 's:@LOCAL_PREFIX@:${LOCAL_PREFIX}:g'"; fi
_LCL_SED:= $(shell ${_LCL_SED_SH})
-SED_REPLACE= -e 's:@SHELL@:${SH}:g' -e 's:@LIB@:${LIBNAME}:g' -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' -e 's:@LIBEXECDIR@:${LIBEXECDIR}:g' -e 's:@PREFIX@:${PREFIX}:g' -e 's:@RC_SYS_DEFAULT@:${MKRCSYS}:g' ${_PKG_SED} ${_LCL_SED}
+SED_REPLACE= -e 's:@SHELL@:${SH}:g' -e 's:@LIB@:${LIBNAME}:g' -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' -e 's:@LIBEXECDIR@:${LIBEXECDIR}:g' -e 's:@PREFIX@:${PREFIX}:g' ${_PKG_SED} ${_LCL_SED}
# Tweak our shell scripts
%.sh: %.sh.in