chkconfig: remove linuxstdbase symlinks

These links were moved to the lsb package because lsbsetup was to be
removed.  Subsequently an earlier patch that moved them to chkconfig was
also merged.  This results in duplicate installations that generate a
warning when building core-image-lsb under DISTRO=poky-lsb which enables the
linuxstdbase feature.

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
index c6f8b1d44fd5b6044ea4d946c97d2c15a233029a..4560298ecab36410830e8d7ebd4ced10fea417ad 100644 (file)
--- a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
+++ b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
@@ -48,12 +48,6 @@ do_install() {
        install -d ${D}${sysconfdir}/chkconfig.d
 }
 
-do_install_append_linuxstdbase() {
-       install -d ${D}${libdir}/lsb/
-       ln -sf ${base_sbindir}/chkconfig ${D}/${libdir}/lsb/install_initd
-       ln -sf ${base_sbindir}/chkconfig ${D}/${libdir}/lsb/remove_initd
-}
-
 PACKAGES =+ "${PN}-alternatives ${PN}-alternatives-doc"
 SUMMARY_${PN}-alternatives = "Maintain symbolic links determining default commands"
 DESCRIPTION_${PN}-alternatives = "alternatives creates, removes, maintains and displays \
@@ -67,5 +61,3 @@ FILES_${PN}-alternatives = "${sbindir}/alternatives ${sbindir}/update-alternativ
                            ${sysconfdir}/alternatives ${localstatedir}/lib/alternatives"
 FILES_${PN}-alternatives-doc = "${mandir}/man8/alternatives.8 \
                                 ${mandir}/man8/update-alternatives.8"
-
-FILES_${PN}_append_linuxstdbase += "${libdir}/lsb"