Skip to contentSkip to conversation

Correct lsb commands install_initd/remove_initd install directory

PATCH In review Kai Kang 2 participants 5 messages Nov 13, 2013 – Dec 11, 2013

lore
Share & tools
lore

Kai Kang

author
#0 lore raw

cover Correct lsb commands install_initd/remove_initd install directory

The following changes since commit ea92671d9823e3667d6ced7ac2af20f991da404d:

bitbake: cooker: replace "w" file opening mode with "a" mode (2013-11-12 17:01:37 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib kangkai/lsb
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/lsb

Kai Kang (1):
lsb: update directory of install_initd and remove_initd

 meta/recipes-extended/lsb/lsb_4.1.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
1.8.1.2
author
#1 lore raw

PATCH 1/1 lsb: update directory of install_initd and remove_initd

According to LSB specification:

http://refspecs.linuxfoundation.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/installinitd.html
http://refspecs.linuxfoundation.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/removeinitd.html

commands install_initd and remove_initd should under directory /usr/lib/lsb/.

lsb recipe creates these commands under directory ${libdir} which may expand to /usr/lib64 when multilib is enabled on qemux86-64. That will cause LSB command check for install_initd and remove_initd fail. So correct it.

---
 meta/recipes-extended/lsb/lsb_4.1.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-extended/lsb/lsb_4.1.bb +2 -2
index c80ff59..8105e59 100644
@@ -79,8 +79,8 @@ do_install_append(){
 
        # creat links for LSB test
        install -d ${D}/${libdir}/lsb
-       ln -sf ${sbindir}/chkconfig ${D}/${libdir}/lsb/install_initd
-       ln -sf ${sbindir}/chkconfig ${D}/${libdir}/lsb/remove_initd
+       ln -sf ${sbindir}/chkconfig ${D}/usr/lib/lsb/install_initd
+       ln -sf ${sbindir}/chkconfig ${D}/usr/lib/lsb/remove_initd
        ln -sf ${sbindir}/sendmail ${D}/${libdir}/sendmail
 
        if [ "${TARGET_ARCH}" = "x86_64" ];then
Signature · 1 line
1.8.1.2
author
#2 lore raw

Re: [PATCH 1/1] lsb: update directory of install_initd and remove_initd

On 2013年11月13日 16:27, Kai Kang wrote:

ping?

Quoted 32 lines

According to LSB specification:

http://refspecs.linuxfoundation.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/installinitd.html
http://refspecs.linuxfoundation.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/removeinitd.html

commands install_initd and remove_initd should under directory /usr/lib/lsb/.

lsb recipe creates these commands under directory ${libdir} which may expand to /usr/lib64 when multilib is enabled on qemux86-64. That will cause LSB command check for install_initd and remove_initd fail. So correct it.

---
  meta/recipes-extended/lsb/lsb_4.1.bb | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-extended/lsb/lsb_4.1.bb +2 -2
index c80ff59..8105e59 100644
@@ -79,8 +79,8 @@ do_install_append(){
 
         # creat links for LSB test
         install -d ${D}/${libdir}/lsb
-       ln -sf ${sbindir}/chkconfig ${D}/${libdir}/lsb/install_initd
-       ln -sf ${sbindir}/chkconfig ${D}/${libdir}/lsb/remove_initd
+       ln -sf ${sbindir}/chkconfig ${D}/usr/lib/lsb/install_initd
+       ln -sf ${sbindir}/chkconfig ${D}/usr/lib/lsb/remove_initd
         ln -sf ${sbindir}/sendmail ${D}/${libdir}/sendmail
 
         if [ "${TARGET_ARCH}" = "x86_64" ];then
Signature · 2 lines
Regards,
Neil | Kai Kang
#3 lore raw

Re: [PATCH 1/1] lsb: update directory of install_initd and remove_initd

In reply to Kai Kang
Quoted 22 lines · Kai Kang

According to LSB specification:

http://refspecs.linuxfoundation.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/installinitd.html
http://refspecs.linuxfoundation.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/removeinitd.html

commands install_initd and remove_initd should under directory /usr/lib/lsb/.

lsb recipe creates these commands under directory ${libdir} which may expand to /usr/lib64 when multilib is enabled on qemux86-64. That will cause LSB command check for install_initd and remove_initd fail. So correct it.

---
  meta/recipes-extended/lsb/lsb_4.1.bb | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-extended/lsb/lsb_4.1.bb +0 -0
index c80ff59..8105e59 100644

meta/recipes-extended/lsb/lsb_4.1.bb do_install_append(){ · line 83

Quoted 7 lines
meta/recipes-extended/lsb/lsb_4.1.bb +2 -2
@@ -79,8 +79,8 @@ do_install_append(){
 
         # creat links for LSB test
         install -d ${D}/${libdir}/lsb
-       ln -sf ${sbindir}/chkconfig ${D}/${libdir}/lsb/install_initd
-       ln -sf ${sbindir}/chkconfig ${D}/${libdir}/lsb/remove_initd
+       ln -sf ${sbindir}/chkconfig ${D}/usr/lib/lsb/install_initd
+       ln -sf ${sbindir}/chkconfig ${D}/usr/lib/lsb/remove_initd

It's arguable that this should be ${prefix}/lib since there is a possibly case of libdir not being /usr/lib or /usr/lib64. It also goes to LSB explictly requires /usr/lib/lsb so for an LSB machine /usr/lib will aways exist.

I will put this in the next C-Pull.

Sau!

Quoted 4 lines
meta/recipes-extended/lsb/lsb_4.1.bb +0 -0
         ln -sf ${sbindir}/sendmail ${D}/${libdir}/sendmail
 
         if [ "${TARGET_ARCH}" = "x86_64" ];then
author
#4 lore raw

Re: [PATCH 1/1] lsb: update directory of install_initd and remove_initd

Quoted 39 lines · Saul Wold
Quoted 28 lines · Kai Kang

According to LSB specification:

http://refspecs.linuxfoundation.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/installinitd.html

http://refspecs.linuxfoundation.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/removeinitd.html

commands install_initd and remove_initd should under directory /usr/lib/lsb/.

lsb recipe creates these commands under directory ${libdir} which may expand to /usr/lib64 when multilib is enabled on qemux86-64. That will cause LSB command check for install_initd and remove_initd fail. So correct it.

---
meta/recipes-extended/lsb/lsb_4.1.bb | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-extended/lsb/lsb_4.1.bb +0 -0
index c80ff59..8105e59 100644
@@ -79,8 +79,8 @@ do_install_append(){
 
 # creat links for LSB test
Quoted 5 lines

install -d ${D}/${libdir}/lsb
- ln -sf ${sbindir}/chkconfig ${D}/${libdir}/lsb/install_initd
- ln -sf ${sbindir}/chkconfig ${D}/${libdir}/lsb/remove_initd
+ ln -sf ${sbindir}/chkconfig ${D}/usr/lib/lsb/install_initd
+ ln -sf ${sbindir}/chkconfig ${D}/usr/lib/lsb/remove_initd

It's arguable that this should be ${prefix}/lib since there is a possibly case of libdir not being /usr/lib or /usr/lib64. It also goes to LSB explictly requires /usr/lib/lsb so for an LSB machine /usr/lib will aways exist.

Quoted 1 line

I will put this in the next C-Pull.

Hi Saul,

Sorry, please drop it for now and there is something wrong with this patch. I intended to send a V2 version and with other changes for lsbtest.

Thanks,
Kai

Quoted 9 lines

Sau!

Quoted 4 lines

ln -sf ${sbindir}/sendmail ${D}/${libdir}/sendmail

if [ "${TARGET_ARCH}" = "x86_64" ];then

Signature · 2 lines
Regards,
Neil | Kai Kang