[gentoo-commits] proj/openrc:master commit in: sh/, /

[gentoo-commits] proj/openrc:master commit in: sh/, /

[William Hubbs]

commit:     2eea73bfd5ce2f9993d52293fe7d25c0c804d592
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Jul  9 23:02:54 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jul 10 00:44:40 2018 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=2eea73bf

rc-functions.sh: Remove addon support

This is an old relic from Gentoo baselayout-1.x which should not be used
any longer.

 NEWS.md                                    |  7 ++++++
 sh/.gitignore                              |  1 -
 sh/Makefile                                |  2 +-
 sh/{rc-functions.sh.in => rc-functions.sh} | 36 ------------------------------
 4 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 13c62d6e..e9605031 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,6 +4,13 @@ OpenRC NEWS
 This file will contain a list of notable changes for each release. Note
 the information in this file is in reverse order.
 
+## OpenRC 0.39
+
+This version removes the support for addons.
+The only place I know that this was used was Gentoo Baselayout 1.x, so
+it shouldn't affect anyone since baselayout-1 has been dead for a few
+years.
+
 ## OpenRC 0.37
 
 start-stop-daemon now supports logging stdout and stderr of daemons to

diff --git a/sh/.gitignore b/sh/.gitignore
index 8a007103..186a409c 100644
--- a/sh/.gitignore
+++ b/sh/.gitignore
@@ -1,6 +1,5 @@
 functions.sh
 gendepends.sh
-rc-functions.sh
 openrc-run.sh
 cgroup-release-agent.sh
 init.sh

diff --git a/sh/Makefile b/sh/Makefile
index 4d7148fb..e5029bcd 100644
--- a/sh/Makefile
+++ b/sh/Makefile
@@ -1,6 +1,6 @@
 DIR=	${LIBEXECDIR}/sh
 SRCS=	init.sh.in functions.sh.in gendepends.sh.in \
-	openrc-run.sh.in rc-functions.sh.in ${SRCS-${OS}}
+	openrc-run.sh.in ${SRCS-${OS}}
 INC=	rc-mount.sh functions.sh rc-functions.sh runit.sh s6.sh \
 		start-stop-daemon.sh supervise-daemon.sh
 BIN=	gendepends.sh init.sh openrc-run.sh ${BIN-${OS}}

diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh
similarity index 83%
rename from sh/rc-functions.sh.in
rename to sh/rc-functions.sh
index d6336a18..d77c5dd3 100644
--- a/sh/rc-functions.sh.in
+++ b/sh/rc-functions.sh
@@ -2,42 +2,6 @@
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
-has_addon()
-{
-	[ -e /@LIB@/rc/addons/"$1".sh -o -e /@LIB@/rcscripts/addons/"$1".sh ]
-}
-
-_addon_warn()
-{
-	eindent
-	ewarn "$RC_SVCNAME uses addon code which is deprecated"
-	ewarn "and may not be available in the future."
-	eoutdent
-}
-
-import_addon()
-{
-	if [ -e /@LIB@/rc/addons/"$1".sh ]; then
-		_addon_warn
-		. /@LIB@/rc/addons/"$1".sh
-	elif [ -e /@LIB@/rcscripts/addons/"$1".sh ]; then
-		_addon_warn
-		. /@LIB@/rcscripts/addons/"$1".sh
-	else
-		return 1
-	fi
-}
-
-start_addon()
-{
-	( import_addon "$1-start" )
-}
-
-stop_addon()
-{
-	( import_addon "$1-stop" )
-}
-
 net_fs_list="afs ceph cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre
 ncpfs nfs nfs4 ocfs2 shfs smbfs"
 is_net_fs()