[OE-core] [oe-commits] Muhammad Shakeel : systemd: Remove init. d dir if systemd unit file is present and sysvinit not a distro feature

[Martin Jansa]

On Wed, Jul 31, 2013 at 05:51:34AM +0000, git at git.openembedded.org wrote:
> Module: openembedded-core.git
> Branch: master
> Commit: 823c90ad344ca2205f3055e2dcae08c6616f29b7
> URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=823c90ad344ca2205f3055e2dcae08c6616f29b7
> 
> Author: Muhammad Shakeel <muhammad_shakeel at mentor.com>
> Date:   Mon Jul 29 13:09:51 2013 +0500
> 
> systemd: Remove init.d dir if systemd unit file is present and sysvinit not a distro feature
> 
> If systemd is supported DISTRO_FEATURE and sysvinit is not and also if
> systemd_unitdir contains anything then no need to keep init.d scripts
> for sysvinit compatibility.
> 
> Signed-off-by: Muhammad Shakeel <muhammad_shakeel at mentor.com>
> Signed-off-by: Saul Wold <sgw at linux.intel.com>

There is small issue with this patch applied:

do_rootfs failing:
| Collected errors:
|  * satisfy_dependencies_for: Cannot satisfy the following dependencies
for packagegroup-core-boot:
|  *    busybox-hwclock *
|  * opkg_install_cmd: Cannot install package packagegroup-core-boot.

Systemd images with packagegroup-core-boot RDEPEND on busybox-hwclock:
meta/recipes-core/packagegroups/packagegroup-core-boot.bb:
${@base_contains("MACHINE_FEATURES", "rtc", "busybox-hwclock", "", d)} \

Which is created only when there is /etc/init.d/hwclock.sh file:
FILES_${PN}-hwclock = "${sysconfdir}/init.d/hwclock.sh"

There are at least 3 options
1) ALLOW_EMPTY_${PN}-hwclock = "1"
in busybox.inc
2) add hwclock.service to the same package
3) change packagegroup-core-boot to depend on busybox-hwclock only with
sysvinit enabled

I think the best way to resolve this is 2), any volunteer?

-- 
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/20130804/38760c59/attachment-0002.sig>