Patchwork chkconfig: remove linuxstdbase symlinks

login
register
mail settings
Submitter Peter Bigot
Date Aug. 31, 2013, 11:40 p.m.
Message ID <1377992403-11165-1-git-send-email-pab@pabigot.com>
Download mbox | patch
Permalink /patch/57175/
State Accepted
Commit 77a0b904e18688ecf81a35544f3a5d6ba0aa61a8
Headers show

Comments

Peter Bigot - Aug. 31, 2013, 11:40 p.m.
In cffd1a933fese the links were moved to the lsb package because lsbsetup
was to be removed.  Subsequently an earlier patch 5283be2305b 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>
---
 meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb | 8 --------
 1 file changed, 8 deletions(-)

Patch

diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
index c6f8b1d..4560298 100644
--- 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"