Patchwork [V2,1/2] initscripts: split the functions script into a separate package

login
register
mail settings
Submitter Qi.Chen@windriver.com
Date Jan. 2, 2014, 2:25 a.m.
Message ID <7ddc616565a80346dd323664d0c36490a698fb89.1388629298.git.Qi.Chen@windriver.com>
Download mbox | patch
Permalink /patch/63971/
State New
Headers show

Comments

Qi.Chen@windriver.com - Jan. 2, 2014, 2:25 a.m.
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.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-core/initscripts/initscripts_1.0.bb |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
Saul Wold - Jan. 3, 2014, 9:23 p.m.
On 01/01/2014 06:25 PM, Chen Qi wrote:
> 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.
>

There seems to be a problem with the multi-lib build, please check this 
logfile for errors.

http://autobuilder.yoctoproject.org/main/builders/nightly-multilib/builds/71/steps/Building%20Images/logs/stdio

Thanks	
	Sau!


> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> ---
>   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..ea28672 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.${PN}"
> +
> +ALTERNATIVE_PRIORITY_${PN}-functions = "90"
> +ALTERNATIVE_${PN}-functions = "functions"
>   ALTERNATIVE_LINK_NAME[functions] = "${sysconfdir}/init.d/functions"
>
>   HALTARGS ?= "-d -f"
>
Qi.Chen@windriver.com - Jan. 6, 2014, 7:29 a.m.
On 01/04/2014 05:23 AM, Saul Wold wrote:
> On 01/01/2014 06:25 PM, Chen Qi wrote:
>> 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.
>>
>
> There seems to be a problem with the multi-lib build, please check 
> this logfile for errors.
>
> http://autobuilder.yoctoproject.org/main/builders/nightly-multilib/builds/71/steps/Building%20Images/logs/stdio 
>
>
> Thanks
>     Sau!
>
>

Thanks for pointing it out.

I've fixed it and sent out V3.
I also modified the patch a little so that it could apply to the latest 
master cleanly.

Best Regards,
Chen Qi

>> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
>> ---
>>   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..ea28672 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.${PN}"
>> +
>> +ALTERNATIVE_PRIORITY_${PN}-functions = "90"
>> +ALTERNATIVE_${PN}-functions = "functions"
>>   ALTERNATIVE_LINK_NAME[functions] = "${sysconfdir}/init.d/functions"
>>
>>   HALTARGS ?= "-d -f"
>>
>
>

Patch

diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index 5951e0c..ea28672 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.${PN}"
+
+ALTERNATIVE_PRIORITY_${PN}-functions = "90"
+ALTERNATIVE_${PN}-functions = "functions"
 ALTERNATIVE_LINK_NAME[functions] = "${sysconfdir}/init.d/functions"
 
 HALTARGS ?= "-d -f"