[OE-core] [oe-commits] Chen Qi : initscripts: split the functions script into a separate package

[Martin Jansa]

On Mon, Jan 06, 2014 at 10:15:11PM +0000, git at git.openembedded.org 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 <Qi.Chen at windriver.com>
> 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.
> 
> 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


> 
> Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
> Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
> 
> ---
> 
>  meta/recipes-core/initscripts/initscripts_1.0.bb | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
> index 5951e0c..d1644a3 100644
> --- a/meta/recipes-core/initscripts/initscripts_1.0.bb
> +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
> @@ -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
> Openembedded-commits at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-commits

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20140109/d0bf6c32/attachment-0002.sig>