Patchwork [2/2] lsbinitscripts: Add a linking for functions.lsbinitscripts

login
register
mail settings
Submitter Kang Kai
Date June 28, 2012, 9:35 a.m.
Message ID <e6f7a20a5b94c037c1f234180751ecceba8d2d41.1340873279.git.kai.kang@windriver.com>
Download mbox | patch
Permalink /patch/30791/
State New
Headers show

Comments

Kang Kai - June 28, 2012, 9:35 a.m.
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

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

[YOCTO #2133]

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
 meta/recipes-extended/lsb/lsbinitscripts_9.03.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Saul Wold - July 7, 2012, 12:43 a.m.
On 06/28/2012 02:35 AM, Kang Kai wrote:
> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
>
> Increase ALTERNATIVE_PRIORITY of functions to be higher than the
> value of package initscript. When lsbinitscripts installed, file
> functions provided by lsbinitscripts will be used.
>
> [YOCTO #2133]
>
> Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> Signed-off-by: Kang Kai <kai.kang@windriver.com>
> ---
>   meta/recipes-extended/lsb/lsbinitscripts_9.03.bb |    6 +++---
>   1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb b/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb
> index dd92a92..f324994 100644
> --- a/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb
> +++ b/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb
> @@ -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"
>
> @@ -23,5 +23,5 @@ do_configure[noexec] = "1"
>
>   do_install(){
>   	install -d ${D}/etc/init.d/
> -	install -m 0755 ${S}/rc.d/init.d/functions ${D}/etc/init.d/functions
> +	install -m 0755 ${S}/rc.d/init.d/functions ${D}/etc/init.d/functions.${BPN}
>   }
>
As Richard already pointed out, this rename during install is not 
needed, it happens automagically via the update-alternatives bbclass, 
this is true with the initscripts recipe also, please fix these two 
issues and we can move forward with this patch.

Thanks
	Sau!
Kang Kai - July 9, 2012, 1:33 a.m.
On 2012?07?07? 08:43, Saul Wold wrote:
> On 06/28/2012 02:35 AM, Kang Kai wrote:
>> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
>>
>> Increase ALTERNATIVE_PRIORITY of functions to be higher than the
>> value of package initscript. When lsbinitscripts installed, file
>> functions provided by lsbinitscripts will be used.
>>
>> [YOCTO #2133]
>>
>> Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
>> Signed-off-by: Kang Kai <kai.kang@windriver.com>
>> ---
>> meta/recipes-extended/lsb/lsbinitscripts_9.03.bb | 6 +++---
>> 1 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb 
>> b/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb
>> index dd92a92..f324994 100644
>> --- a/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb
>> +++ b/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb
>> @@ -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"
>>
>> @@ -23,5 +23,5 @@ do_configure[noexec] = "1"
>>
>> do_install(){
>> install -d ${D}/etc/init.d/
>> - install -m 0755 ${S}/rc.d/init.d/functions ${D}/etc/init.d/functions
>> + install -m 0755 ${S}/rc.d/init.d/functions 
>> ${D}/etc/init.d/functions.${BPN}
>> }
>>
> As Richard already pointed out, this rename during install is not 
> needed, it happens automagically via the update-alternatives bbclass, 
> this is true with the initscripts recipe also, please fix these two 
> issues and we can move forward with this patch.
Saul,

Thanks. I'll update them.

Regards,
Kai

>
> Thanks
> Sau!
>
>

Patch

diff --git a/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb b/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb
index dd92a92..f324994 100644
--- a/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb
+++ b/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb
@@ -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"
 
@@ -23,5 +23,5 @@  do_configure[noexec] = "1"
 
 do_install(){
 	install -d ${D}/etc/init.d/
-	install -m 0755 ${S}/rc.d/init.d/functions ${D}/etc/init.d/functions
+	install -m 0755 ${S}/rc.d/init.d/functions ${D}/etc/init.d/functions.${BPN}
 }