On 7/10/18 7:44 AM, Ioan-Adrian Ratiu wrote: > 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 packages > conflict with eachother and can't be alternatives. > > lsb has a hardcoded dependency on lsbinitscripts which makes it > impossible to install on systems using initscripts (acl depends on > initscripts) and lsbinitscripts also has a runtime dependency on the > full util-linux package making it an unwanted dependency on busybox > systems. > > Therefore introduce VIRTUAL-RUNTIME_initscripts to choose between the > versions of /etc/init.d/functions and allow installing lsb alongside > initscripts avoiding the full util-linux dependency. > > Default it to lsbinitscripts so we don't have a change in the existing > behavior; distros/users can override it in their conf when needed. >
We already have PREFERRED_RPROVIDER_initd-functions I wonder if that is the right option to use here. > Signed-off-by: Ioan-Adrian Ratiu <adrian.ra...@ni.com> > --- > meta/conf/distro/include/default-providers.inc | 1 + > meta/recipes-extended/lsb/lsb_5.0.bb | 3 +-- > meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/meta/conf/distro/include/default-providers.inc > b/meta/conf/distro/include/default-providers.inc > index e65c1ed323..37e7478ea0 100644 > --- a/meta/conf/distro/include/default-providers.inc > +++ b/meta/conf/distro/include/default-providers.inc > @@ -23,6 +23,7 @@ VIRTUAL-RUNTIME_update-alternatives ?= > "update-alternatives-opkg" > VIRTUAL-RUNTIME_apm ?= "apm" > VIRTUAL-RUNTIME_alsa-state ?= "alsa-state" > VIRTUAL-RUNTIME_getopt ?= "util-linux-getopt" > +VIRTUAL-RUNTIME_initscripts ?= "lsbinitscripts" > VIRTUAL-RUNTIME_wireless-tools ?= "iw wireless-tools" > VIRTUAL-RUNTIME_base-utils ?= "busybox" > VIRTUAL-RUNTIME_base-utils-hwclock ?= "busybox-hwclock" > diff --git a/meta/recipes-extended/lsb/lsb_5.0.bb > b/meta/recipes-extended/lsb/lsb_5.0.bb > index df4812e4bc..6cb1751664 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} ${VIRTUAL-RUNTIME_initscripts}" > > 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 53d100ce74..74547b0773 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 \ > + ${VIRTUAL_RUNTIME-initscripts} \ > lsbtest \ > lsof \ > strace \ >
signature.asc
Description: OpenPGP digital signature
-- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core