V3: Fix lsbinitscripts link problem

Hi Saul,

As your comment, I remove the manual rename of file functions in both of lsbinitscripts and initscripts.

Regards,
Kai

The following changes since commit 8ce8d25bcda0e2e0b62204d5ca5875dedcaacf7d:

sanity.bbclass: Increase LAYER_CONF_VERSION to match bblayers change (2012-06-25 17:20:54 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib kangkai/distro
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/distro

Kang Kai (2):
initscripts: use update-alternative to handle file functions
lsbinitscripts: increase ALTERNATIVE_PRIORITY

 meta/recipes-core/initscripts/initscripts_1.0.bb |    8 +++++++-
 meta/recipes-extended/lsb/lsbinitscripts_9.03.bb |    4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

1.7.5.4

lsb need a more abundant /etc/init.d/functions file to handle lsb test. Use update-alternative to install file funtions in package initscripts, when package lsbinitscripts installed the file functions of lsbinitscripts will be used.

---
 meta/recipes-core/initscripts/initscripts_1.0.bb |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

index 829694b..1d80c55 100644
@@ -3,7 +3,7 @@ DESCRIPTION = "Initscripts provide the basic system startup initialization scrip
 SECTION = "base"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-PR = "r134"
+PR = "r135"
 
 INHIBIT_DEFAULT_DEPS = "1"
 

@@ -37,6 +37,12 @@ SRC_URI_append_arm = " file://alignment.sh"
 
 KERNEL_VERSION = ""
 
+inherit update-alternatives
+
+ALTERNATIVE_PRIORITY = "90"
+ALTERNATIVE_${PN} = "functions"
+ALTERNATIVE_LINK_NAME[functions] = "${sysconfdir}/init.d/functions"
+
 HALTARGS ?= "-d -f"
 
 do_configure() {

1.7.5.4

[YOCTO #2133]

Increase ALTERNATIVE_PRIORITY of file functions to be higher than the value in package initscript. Then when lsbinitscripts installed, file functions provided by lsbinitscripts will be used.

---
 meta/recipes-extended/lsb/lsbinitscripts_9.03.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

index dd92a92..da781da 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "SysV init scripts which only is used in an LSB image"
 SECTION = "base"
 LICENSE = "GPLv2"
 DEPENDS = "popt"
-PR = "r0"
+PR = "r1"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6"
 

@@ -15,7 +15,7 @@ SRC_URI[md5sum] = "668fa2762b57ef75436303857847bba3"
 SRC_URI[sha256sum] = "d56547a68ce223a7413b2676650b042125f047c8d6d139c5b970e118b3dc958a"
 inherit update-alternatives
 
-ALTERNATIVE_PRIORITY = "10"
+ALTERNATIVE_PRIORITY = "100"
 ALTERNATIVE_${PN} = "functions"
 ALTERNATIVE_LINK_NAME[functions] = "${sysconfdir}/init.d/functions"
 

1.7.5.4

Merged into OE-Core

Thanks
Sau!