mirror of
git://git.yoctoproject.org/meta-raspberrypi
synced 2026-04-02 02:49:12 +00:00
yocto-builder/entrypoint-build.sh: Remove init configuration
The init configuration is usually taken care of by setting INIT_MANAGER and systemd is the default since: https://git.openembedded.org/openembedded-core/commit/?id=0b4061c5d50261f826d0edb4b478d2d305274b7c so none of this should be needed, hopefully it will fix CI runs which currently fail with: https://github.com/agherzan/meta-raspberrypi/actions/runs/23234236947/job/67698405693 ERROR: Nothing PROVIDES 'systemd' (but /tmp/tmp.aSbUL7oQb7/openembedded-core/meta/recipes-core/psplash/psplash_git.bb DEPENDS on or otherwise requires it) systemd was skipped: conflicting distro feature 'sysvinit' (in DISTRO_FEATURES) NOTE: Runtime target 'psplash' is unbuildable, removing... Missing or unbuildable dependency chain was: ['psplash', 'systemd'] ERROR: Required build target 'rpi-test-image' has no buildable providers. Missing or unbuildable dependency chain was: ['rpi-test-image', 'psplash', 'systemd'] Summary: There was 1 WARNING message. Summary: There were 2 ERROR messages, returning a non-zero exit code. But I don't see where sysvinit would be getting into DISTRO_FEATURES here. Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
This commit is contained in:
parent
1e4a9929a9
commit
9720dc611c
@ -44,12 +44,6 @@ printf "\n# ------ ci ------\n" >> conf/local.conf
|
|||||||
cat <<EOCONF >>conf/local.conf
|
cat <<EOCONF >>conf/local.conf
|
||||||
BB_NUMBER_THREADS = "6"
|
BB_NUMBER_THREADS = "6"
|
||||||
PARALLEL_MAKE = "-j 6"
|
PARALLEL_MAKE = "-j 6"
|
||||||
# unmerged-usr is deprecated
|
|
||||||
# https://lore.kernel.org/all/3f2f03085301d22854e5429019fb010f27d98bc7.camel@linuxfoundation.org/t/
|
|
||||||
DISTRO_FEATURES:append = " systemd usrmerge"
|
|
||||||
VIRTUAL-RUNTIME_init_manager = "systemd"
|
|
||||||
DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " sysvinit"
|
|
||||||
VIRTUAL-RUNTIME_initscripts = "systemd-compat-units"
|
|
||||||
LICENSE_FLAGS_ACCEPTED = "synaptics-killswitch"
|
LICENSE_FLAGS_ACCEPTED = "synaptics-killswitch"
|
||||||
EOCONF
|
EOCONF
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user