Patchwork [1/4] LSB Command Check: fix install_initd and remove_initd not found

login
register
mail settings
Submitter Hongxu Jia
Date Sept. 13, 2013, 5:33 a.m.
Message ID <772c186481bec298466fe249f6be7a661e7c6c7b.1379049723.git.hongxu.jia@windriver.com>
Download mbox | patch
Permalink /patch/57925/
State New
Headers show

Comments

Hongxu Jia - Sept. 13, 2013, 5:33 a.m.
The install_initd and remove_initd are linked to /sbin/chkconfig for lsb
core test, and chkconfig has been moved from /sbin to /usr/sbin in order
to fix QA warning about unsafe references in binaries.
(In commit e486242db83297701803866bea971a2f1a1135fe)

Let install_initd and remove_initd link to /usr/sbin/chkconfig could fix
this issue.

[YOCTO #5152]

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb | 4 ++--
 meta/recipes-extended/lsb/lsb_4.1.bb                | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
Peter Bigot - Sept. 13, 2013, 7:56 a.m.
On 09/13/2013 12:33 AM, Hongxu Jia wrote:
> The install_initd and remove_initd are linked to /sbin/chkconfig for lsb
> core test, and chkconfig has been moved from /sbin to /usr/sbin in order
> to fix QA warning about unsafe references in binaries.
> (In commit e486242db83297701803866bea971a2f1a1135fe)
>
> Let install_initd and remove_initd link to /usr/sbin/chkconfig could fix
> this issue.
>
> [YOCTO #5152]
>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
>   meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb | 4 ++--
>   meta/recipes-extended/lsb/lsb_4.1.bb                | 4 ++--
>   2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
> index c6f8b1d..38c3cdf 100644
> --- a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
> +++ b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
> @@ -50,8 +50,8 @@ do_install() {
>   
>   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
> +	ln -sf ${sbindir}/chkconfig ${D}/${libdir}/lsb/install_initd
> +	ln -sf ${sbindir}/chkconfig ${D}/${libdir}/lsb/remove_initd
>   }
>   

Your repository appears to be out of date; this append was removed in 
oe-core 77a0b904e18688ecf81a35544f3a5d6ba0aa61a8

>   PACKAGES =+ "${PN}-alternatives ${PN}-alternatives-doc"
> diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb b/meta/recipes-extended/lsb/lsb_4.1.bb
> index 59d5bca..c80ff59 100644
> --- a/meta/recipes-extended/lsb/lsb_4.1.bb
> +++ b/meta/recipes-extended/lsb/lsb_4.1.bb
> @@ -79,8 +79,8 @@ do_install_append(){
>   
>          # creat links for LSB test
>          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
> +       ln -sf ${sbindir}/chkconfig ${D}/${libdir}/lsb/install_initd
> +       ln -sf ${sbindir}/chkconfig ${D}/${libdir}/lsb/remove_initd
>          ln -sf ${sbindir}/sendmail ${D}/${libdir}/sendmail
>   
>          if [ "${TARGET_ARCH}" = "x86_64" ];then
Hongxu Jia - Sept. 13, 2013, 8:01 a.m.
On 09/13/2013 03:56 PM, Peter A. Bigot wrote:
> On 09/13/2013 12:33 AM, Hongxu Jia wrote:
>> The install_initd and remove_initd are linked to /sbin/chkconfig for lsb
>> core test, and chkconfig has been moved from /sbin to /usr/sbin in order
>> to fix QA warning about unsafe references in binaries.
>> (In commit e486242db83297701803866bea971a2f1a1135fe)
>>
>> Let install_initd and remove_initd link to /usr/sbin/chkconfig could fix
>> this issue.
>>
>> [YOCTO #5152]
>>
>> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
>> ---
>>   meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb | 4 ++--
>>   meta/recipes-extended/lsb/lsb_4.1.bb                | 4 ++--
>>   2 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb 
>> b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
>> index c6f8b1d..38c3cdf 100644
>> --- a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
>> +++ b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
>> @@ -50,8 +50,8 @@ do_install() {
>>     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
>> +    ln -sf ${sbindir}/chkconfig ${D}/${libdir}/lsb/install_initd
>> +    ln -sf ${sbindir}/chkconfig ${D}/${libdir}/lsb/remove_initd
>>   }
>
> Your repository appears to be out of date; this append was removed in 
> oe-core 77a0b904e18688ecf81a35544f3a5d6ba0aa61a8
>

Ok, I will rebase it.

Thanks,
Hongxu

>>   PACKAGES =+ "${PN}-alternatives ${PN}-alternatives-doc"
>> diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb 
>> b/meta/recipes-extended/lsb/lsb_4.1.bb
>> index 59d5bca..c80ff59 100644
>> --- a/meta/recipes-extended/lsb/lsb_4.1.bb
>> +++ b/meta/recipes-extended/lsb/lsb_4.1.bb
>> @@ -79,8 +79,8 @@ do_install_append(){
>>            # creat links for LSB test
>>          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
>> +       ln -sf ${sbindir}/chkconfig ${D}/${libdir}/lsb/install_initd
>> +       ln -sf ${sbindir}/chkconfig ${D}/${libdir}/lsb/remove_initd
>>          ln -sf ${sbindir}/sendmail ${D}/${libdir}/sendmail
>>            if [ "${TARGET_ARCH}" = "x86_64" ];then
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

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..38c3cdf 100644
--- a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
+++ b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
@@ -50,8 +50,8 @@  do_install() {
 
 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
+	ln -sf ${sbindir}/chkconfig ${D}/${libdir}/lsb/install_initd
+	ln -sf ${sbindir}/chkconfig ${D}/${libdir}/lsb/remove_initd
 }
 
 PACKAGES =+ "${PN}-alternatives ${PN}-alternatives-doc"
diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb b/meta/recipes-extended/lsb/lsb_4.1.bb
index 59d5bca..c80ff59 100644
--- a/meta/recipes-extended/lsb/lsb_4.1.bb
+++ b/meta/recipes-extended/lsb/lsb_4.1.bb
@@ -79,8 +79,8 @@  do_install_append(){
 
        # creat links for LSB test
        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
+       ln -sf ${sbindir}/chkconfig ${D}/${libdir}/lsb/install_initd
+       ln -sf ${sbindir}/chkconfig ${D}/${libdir}/lsb/remove_initd
        ln -sf ${sbindir}/sendmail ${D}/${libdir}/sendmail
 
        if [ "${TARGET_ARCH}" = "x86_64" ];then