Fix lsbinitscripts link problem

PATCH In review Kang Kai 3 participants 9 messages Jun 28, 2012 – Jul 9, 2012

lore

Share & tools

lore

Kang Kai

author

2012-06-28 09:46 UTC #0 lore raw

cover Fix lsbinitscripts link problem

Hi Saul,

I update the initscripts to use update alternative way to install file functions. That make file functions provided by lsbinitscripts will be used instead of 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 (1):
initscripts: use update-alternative to handle file functions

Xiaofeng Yan (1):
lsbinitscripts: Add a linking for functions.lsbinitscripts

 meta/recipes-core/initscripts/initscripts_1.0.bb |   10 ++++++++--
 meta/recipes-extended/lsb/lsbinitscripts_9.03.bb |    6 +++---
 2 files changed, 11 insertions(+), 5 deletions(-)

Signature · 1 line

1.7.5.4

Kang Kai

author

2012-06-28 09:46 UTC #1 lore raw

PATCH 1/2 initscripts: use update-alternative to handle file functions

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.

Signed-off-by Kang Kai <[email protected]>

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

meta/recipes-core/initscripts/initscripts_1.0.bb +8 -2

index 829694b..78c27a3 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() {

@@ -60,7 +66,7 @@ do_install () {
 	install -d ${D}${sysconfdir}/default
 	install -d ${D}${sysconfdir}/default/volatiles
 
-	install -m 0644    ${WORKDIR}/functions		${D}${sysconfdir}/init.d
+	install -m 0644    ${WORKDIR}/functions		${D}${sysconfdir}/init.d/functions.${BPN}
 	install -m 0755    ${WORKDIR}/bootmisc.sh	${D}${sysconfdir}/init.d
 	install -m 0755    ${WORKDIR}/checkroot.sh	${D}${sysconfdir}/init.d
 #	install -m 0755    ${WORKDIR}/finish.sh		${D}${sysconfdir}/init.d

Signature · 1 line

1.7.5.4

Richard Purdie

2012-07-03 14:04 UTC #2 lore raw

Re: [PATCH 1/2] initscripts: use update-alternative to handle file functions

Quoted 37 lines · Kang Kai

Signed-off-by Kang Kai <[email protected]>

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

meta/recipes-core/initscripts/initscripts_1.0.bb +7 -1

index 829694b..78c27a3 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() {

meta/recipes-core/initscripts/initscripts_1.0.bb do_install () { · line 72

Quoted 8 lines

meta/recipes-core/initscripts/initscripts_1.0.bb +1 -1

@@ -60,7 +66,7 @@ do_install () {
 	install -d ${D}${sysconfdir}/default
 	install -d ${D}${sysconfdir}/default/volatiles
 
-	install -m 0644    ${WORKDIR}/functions		${D}${sysconfdir}/init.d
+	install -m 0644    ${WORKDIR}/functions		${D}${sysconfdir}/init.d/functions.${BPN}
 	install -m 0755    ${WORKDIR}/bootmisc.sh	${D}${sysconfdir}/init.d
 	install -m 0755    ${WORKDIR}/checkroot.sh	${D}${sysconfdir}/init.d
 #	install -m 0755    ${WORKDIR}/finish.sh		${D}${sysconfdir}/init.d

Won't the code in the class handling this renaming itself?

Cheers,

Richard

Kang Kai

author

2012-06-28 09:46 UTC #3 lore raw

PATCH 2/2 lsbinitscripts: Add a linking for functions.lsbinitscripts

In reply to Kang Kai

From: Xiaofeng Yan <[email protected]>

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 <[email protected]>

Signed-off-by Kang Kai <[email protected]>

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

meta/recipes-extended/lsb/lsbinitscripts_9.03.bb +3 -3

index dd92a92..f324994 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"

@@ -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}
 }

Signature · 1 line

1.7.5.4

Saul Wold

2012-07-07 00:54 UTC #4 lore raw

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

Quoted 38 lines · Kang Kai

From: Xiaofeng Yan <[email protected]>
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 <[email protected]>
Signed-off-by Kang Kai <[email protected]>
---
  meta/recipes-extended/lsb/lsbinitscripts_9.03.bb |    6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-extended/lsb/lsbinitscripts_9.03.bb +2 -2
index dd92a92..f324994 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"
 

meta/recipes-extended/lsb/lsbinitscripts_9.03.bb do_configure[noexec] = "1" · line 27

Quoted 6 lines

meta/recipes-extended/lsb/lsbinitscripts_9.03.bb +1 -1

@@ -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

author

2012-07-09 01:44 UTC #5 lore raw

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

Quoted 40 lines · Saul Wold

Quoted 39 lines · Kang Kai
From: Xiaofeng Yan <[email protected]>
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 <[email protected]>
Signed-off-by Kang Kai <[email protected]>
---
meta/recipes-extended/lsb/lsbinitscripts_9.03.bb | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-extended/lsb/lsbinitscripts_9.03.bb +0 -0
index dd92a92..f324994 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "SysV init scripts which only is used 
in an LSB image"
SECTION = "base"
LICENSE = "GPLv2"
DEPENDS = "popt"
meta/recipes-extended/lsb/lsbinitscripts_9.03.bb +1 -1
-PR = "r0"
+PR = "r1"
LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6"
meta/recipes-extended/lsb/lsbinitscripts_9.03.bb +0 -0
@@ -15,7 +15,7 @@ SRC_URI[md5sum] = "668fa2762b57ef75436303857847bba3"
SRC_URI[sha256sum] = "d56547a68ce223a7413b2676650b042125f047c8d6d139c5b970e118b3dc958a" inherit update-alternatives
meta/recipes-extended/lsb/lsbinitscripts_9.03.bb +1 -1
-ALTERNATIVE_PRIORITY = "10"
+ALTERNATIVE_PRIORITY = "100"
ALTERNATIVE_${PN} = "functions" ALTERNATIVE_LINK_NAME[functions] = "${sysconfdir}/init.d/functions"
meta/recipes-extended/lsb/lsbinitscripts_9.03.bb +0 -0
@@ -23,5 +23,5 @@ do_configure[noexec] = "1"
 

Quoted 8 lines

Quoted 7 lines
meta/recipes-extended/lsb/lsbinitscripts_9.03.bb +0 -0
 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

Quoted 5 lines

Thanks
Sau!

Kang Kai

author

2012-07-03 01:53 UTC #6 lore raw

In reply to Kang Kai

Quoted 4 lines · Kang Kai

Hi Saul,
I update the initscripts to use update alternative way to install file functions. That make file functions provided by lsbinitscripts will be used instead of initscripts.

Could anyone give comments of these two patches?
Thanks.

Regards,
Kai

Quoted 22 lines

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 (1):
initscripts: use update-alternative to handle file functions
Xiaofeng Yan (1):
lsbinitscripts: Add a linking for functions.lsbinitscripts
  meta/recipes-core/initscripts/initscripts_1.0.bb |   10 ++++++++--
  meta/recipes-extended/lsb/lsbinitscripts_9.03.bb |    6 +++---
  2 files changed, 11 insertions(+), 5 deletions(-)

Saul Wold

2012-07-03 04:15 UTC #7 lore raw

Quoted 9 lines · Kang Kai

Quoted 6 lines · Kang Kai
Hi Saul,
I update the initscripts to use update alternative way to install file functions.
That make file functions provided by lsbinitscripts will be used instead of initscripts.
Could anyone give comments of these two patches?

Kai,

I commented on this patch already on 6/27, please see attached email

Sau!

Quoted 32 lines

Thanks.
Regards,
Kai
Quoted 24 lines
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 (1):
initscripts: use update-alternative to handle file functions
Xiaofeng Yan (1):
lsbinitscripts: Add a linking for functions.lsbinitscripts
meta/recipes-core/initscripts/initscripts_1.0.bb | 10 ++++++++-- meta/recipes-extended/lsb/lsbinitscripts_9.03.bb | 6 +++---
2 files changed, 11 insertions(+), 5 deletions(-)

Quoted 34 lines · Kang Kai

From: Xiaofeng Yan<[email protected]>

The linking will fail when an original file "functions" exists. So using the new linking replace the previous "functions".

[YOCTO #2133]

Signed-off-by Xiaofeng Yan<[email protected]>

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

meta/recipes-extended/lsb/lsbinitscripts_9.03.bb +1 -6

index dd92a92..990da2e 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"

@@ -13,15 +13,12 @@ SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-${PV}
 
  SRC_URI[md5sum] = "668fa2762b57ef75436303857847bba3"
  SRC_URI[sha256sum] = "d56547a68ce223a7413b2676650b042125f047c8d6d139c5b970e118b3dc958a"
-inherit update-alternatives
-
-ALTERNATIVE_PRIORITY = "10"
-ALTERNATIVE_${PN} = "functions"
-ALTERNATIVE_LINK_NAME[functions] = "${sysconfdir}/init.d/functions"

meta/recipes-extended/lsb/lsbinitscripts_9.03.bb SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-${PV} · line 24

Quoted 10 lines

meta/recipes-extended/lsb/lsbinitscripts_9.03.bb +3 -1

 
  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.lsbinitscripts
+        cd ${D}/etc/init.d/
+        ln -sf functions.lsbinitscripts functions
  }

This is still not correct, you are disabling the usage update ALTERNATIVE here. What you should really be doing is adding that support to the original initscripts_1.0.bb recipes for the function file and give this a higher ALTERNATIVE_PRIORITY, so that when it is installed it will do the right thing (tm) via the update alternative functionality.

Sau!

Kang Kai

author

2012-07-03 06:00 UTC #8 lore raw

Quoted 9 lines · Saul Wold

Quoted 8 lines · Kang Kai
Quoted 6 lines · Kang Kai
Hi Saul,
I update the initscripts to use update alternative way to install file functions.
That make file functions provided by lsbinitscripts will be used instead of initscripts.

Quoted 5 lines

Quoted 1 line
Could anyone give comments of these two patches?
Kai,
I commented on this patch already on 6/27, please see attached email

Hi Saul,

I saw your comments and updated initscripts with update-alternatives too. Sorry for didn't add "V2".
Please help to review them.

Thanks,
Kai

Quoted 35 lines

Sau!
Quoted 32 lines
Thanks.
Regards,
Kai
Quoted 24 lines
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 (1):
initscripts: use update-alternative to handle file functions
Xiaofeng Yan (1):
lsbinitscripts: Add a linking for functions.lsbinitscripts
meta/recipes-core/initscripts/initscripts_1.0.bb | 10 ++++++++-- meta/recipes-extended/lsb/lsbinitscripts_9.03.bb | 6 +++---
2 files changed, 11 insertions(+), 5 deletions(-)