Skip to contentSkip to conversation

Chen Qi : initscripts: split the functions script into a separate package

oe-commits Martin Jansa 2 participants 2 messages Jan 9, 2014 – Jan 10, 2014 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 20140106221511.568935049A@opal

Martin Jansa

author
#1 lore raw
Quoted 20 lines · On Mon, Jan 06, 2014 at 10:15:11PM +0000, [email protected] wrote:
Module: openembedded-core.git
Branch: master
Commit: 736dd8380f41d6ff1d3d0e4fe33cc01e2e873ef6
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=736dd8380f41d6ff1d3d0e4fe33cc01e2e873ef6
Author: Chen Qi <[email protected]>
Date:   Mon Jan  6 15:27:34 2014 +0800

initscripts: split the functions script into a separate package

Many SysV init scripts need the /etc/init.d/functions script. But this script is part of the initscripts package. As a result, the initscripts package should always be installed into the system to avoid errors when starting daemons. However, it makes no sense to install the initscripts package into a systemd based image, because what the init scripts provide has already been provided by the systemd. On the other hand, the functions script might be still needed in a systemd based image because other init scripts such as distcc might need it.

Quoted 3 lines

The above situation leads to a natural separation of the functions script from the initscripts package. And this patch does so. It separates the functions script into initscripts-functions packages.

FYI: In cases where alternative initscripts are used (and VIRTUAL-RUNTIME_initscripts) respected, these alternatives also need to rprovide initscripts-functions (or at least u-a for functions), otherwise u-a fails in do_rootfs which is fatal for read-only:

| ERROR: The following packages could not be configured offline and rootfs is read-only: initscripts-functions

Quoted 33 lines
Signed-off-by Chen Qi <[email protected]>
Signed-off-by Richard Purdie <[email protected]>

---

 meta/recipes-core/initscripts/initscripts_1.0.bb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
meta/recipes-core/initscripts/initscripts_1.0.bb +6 -2
index 5951e0c..d1644a3 100644
@@ -42,8 +42,12 @@ KERNEL_VERSION = ""
 inherit update-alternatives
 DEPENDS_append = " update-rc.d-native"
 
-ALTERNATIVE_PRIORITY = "90"
-ALTERNATIVE_${PN} = "functions"
+PACKAGES =+ "${PN}-functions"
+RDEPENDS_${PN} = "${PN}-functions"
+FILES_${PN}-functions = "${sysconfdir}/init.d/functions*"
+
+ALTERNATIVE_PRIORITY_${PN}-functions = "90"
+ALTERNATIVE_${PN}-functions = "functions"
 ALTERNATIVE_LINK_NAME[functions] = "${sysconfdir}/init.d/functions"
 
 HALTARGS ?= "-d -f"

_______________________________________________
Openembedded-commits mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-commits

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#2 lore raw
Quoted 24 lines · Martin Jansa
Quoted 20 lines · On Mon, Jan 06, 2014 at 10:15:11PM +0000, [email protected] wrote:
Module: openembedded-core.git
Branch: master
Commit: 736dd8380f41d6ff1d3d0e4fe33cc01e2e873ef6
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=736dd8380f41d6ff1d3d0e4fe33cc01e2e873ef6
Author: Chen Qi <[email protected]>
Date:   Mon Jan  6 15:27:34 2014 +0800

initscripts: split the functions script into a separate package

Many SysV init scripts need the /etc/init.d/functions script. But this script is part of the initscripts package. As a result, the initscripts package should always be installed into the system to avoid errors when starting daemons. However, it makes no sense to install the initscripts package into a systemd based image, because what the init scripts provide has already been provided by the systemd. On the other hand, the functions script might be still needed in a systemd based image because other init scripts such as distcc might need it.

Quoted 3 lines

The above situation leads to a natural separation of the functions script from the initscripts package. And this patch does so. It separates the functions script into initscripts-functions packages.

Quoted 8 lines

FYI: In cases where alternative initscripts are used (and VIRTUAL-RUNTIME_initscripts) respected, these alternatives also need to rprovide initscripts-functions (or at least u-a for functions), otherwise u-a fails in do_rootfs which is fatal for read-only:

| ERROR: The following packages could not be configured offline and rootfs is read-only: initscripts-functions

Thanks a lot for your information.

Best Regards,
Chen Qi

Quoted 32 lines
Quoted 32 lines
Signed-off-by Chen Qi <[email protected]>
Signed-off-by Richard Purdie <[email protected]>

---

  meta/recipes-core/initscripts/initscripts_1.0.bb | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
meta/recipes-core/initscripts/initscripts_1.0.bb +6 -2
index 5951e0c..d1644a3 100644
@@ -42,8 +42,12 @@ KERNEL_VERSION = ""
  inherit update-alternatives
  DEPENDS_append = " update-rc.d-native"
 
-ALTERNATIVE_PRIORITY = "90"
-ALTERNATIVE_${PN} = "functions"
+PACKAGES =+ "${PN}-functions"
+RDEPENDS_${PN} = "${PN}-functions"
+FILES_${PN}-functions = "${sysconfdir}/init.d/functions*"
+
+ALTERNATIVE_PRIORITY_${PN}-functions = "90"
+ALTERNATIVE_${PN}-functions = "functions"
  ALTERNATIVE_LINK_NAME[functions] = "${sysconfdir}/init.d/functions"
 
  HALTARGS ?= "-d -f"

_______________________________________________
Openembedded-commits mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-commits