[OE-core] [PATCH v3] lsbinitscripts: replace dependency with initd-functions

[Ioan-Adrian Ratiu]

Commits 1202307b24 ("lsbinitscripts: don't use update-alternatives")
cdcebd81c87 ("initscripts: don't use update-alternatives") and
061fa614cec ("update-alternatives.bbclass: refuse to manage SysV init
scripts") make sure that the lsbinitscripts and initscripts conflict
with eachother and can't be alternatives on target devices.

lsb has a hardcoded dependency on lsbinitscripts which makes it
impossible to install on systems using initscripts and lsbinitscripts
in turn has a runtime dependency on the full util-linux package,
making it an unwanted dependency on busybox systems.

Therefore make lsb depend on initd-functions, which lsbinitscripts
RPROVIDES, allowing for multiple versions of /etc/init.d/functions and
installing lsb depending on initscripts without the full util-linux.

The default initd-functions provider is initscripts, so this changes
the dependency of lsb (but no the runtime behaviour AFAIK). I did not
change the default provider because sysvinit depends on initscripts
being the default.

The old dependency, previous to this change, can be brought back with
PREFERRED_RPROVIDER_initd-functions = "lsbinitscripts".

Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu at ni.com>
---
 meta/recipes-extended/lsb/lsb_5.0.bb                         | 3 +--
 meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-extended/lsb/lsb_5.0.bb b/meta/recipes-extended/lsb/lsb_5.0.bb
index df4812e4bc..746204b6ec 100644
--- a/meta/recipes-extended/lsb/lsb_5.0.bb
+++ b/meta/recipes-extended/lsb/lsb_5.0.bb
@@ -8,8 +8,7 @@ LSB_CORE_x86 = "lsb-core-ia32"
 LSB_CORE_x86-64 = "lsb-core-amd64"
 RPROVIDES_${PN} += "${LSB_CORE}"
 
-# lsb_release needs getopt, lsbinitscripts
-RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_getopt} lsbinitscripts"
+RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_getopt} initd-functions"
 
 LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf"
 
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
index ef6347c712..47789d556a 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
@@ -118,7 +118,7 @@ RDEPENDS_packagegroup-core-lsb-misc = "\
     gettext \
     gettext-runtime \
     groff \
-    lsbinitscripts \
+    initd-functions \
     lsbtest \
     lsof \
     strace \
-- 
2.18.0