From: Ross Burton <ross.burton@intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 09/10] packagegroup-core-boot: only install initscripts if we're using sysvinit
Date: Sat, 19 Jan 2013 22:47:12 +0000 [thread overview]
Message-ID: <f2c8ee8bb2e7406a46ee9c63cddc2553931553bb.1358635193.git.ross.burton@intel.com> (raw)
In-Reply-To: <cover.1358635193.git.ross.burton@intel.com>
In-Reply-To: <cover.1358635193.git.ross.burton@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-core/packagegroups/packagegroup-core-boot.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
index fbc50c7..edb9e74 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
@@ -27,7 +27,7 @@ RCONFLICTS_${PN} = "task-core-boot"
VIRTUAL-RUNTIME_dev_manager ?= "udev"
VIRTUAL-RUNTIME_login_manager ?= "tinylogin"
VIRTUAL-RUNTIME_init_manager ?= "${DISTRO_FEATURES_INITMAN}"
-VIRTUAL-RUNTIME_initscripts ?= "initscripts"
+VIRTUAL-RUNTIME_initscripts ?= "${@base_contains('DISTRO_FEATURES', 'sysvinit', 'initscripts', '',d)}"
VIRTUAL-RUNTIME_keymaps ?= "keymaps"
RDEPENDS_${PN} = "\
@@ -35,12 +35,12 @@ RDEPENDS_${PN} = "\
base-passwd \
busybox \
${@base_contains("MACHINE_FEATURES", "rtc", "busybox-hwclock", "", d)} \
- ${VIRTUAL-RUNTIME_initscripts} \
${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \
modutils-initscripts \
netbase \
${VIRTUAL-RUNTIME_login_manager} \
${VIRTUAL-RUNTIME_init_manager} \
+ ${VIRTUAL-RUNTIME_initscripts} \
${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd-compat-units', '',d)} \
${VIRTUAL-RUNTIME_dev_manager} \
${VIRTUAL-RUNTIME_update-alternatives} \
--
1.7.10.4
next prev parent reply other threads:[~2013-01-19 23:04 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-19 22:47 [PATCH 00/10] Initial systemd integration Ross Burton
2013-01-19 22:47 ` [PATCH 01/10] default-distrovars: Add DISTRO_FEATURES_INITMAN to DISTRO_FEATURES Ross Burton
2013-01-23 11:38 ` [PATCH] bitbake.conf: unbreak all builds with custom DISTRO_FEATURES Marcin Juszkiewicz
2013-01-23 11:43 ` Burton, Ross
2013-01-23 11:47 ` Marcin Juszkiewicz
2013-01-19 22:47 ` [PATCH 02/10] default-providers: Automatically set PREFERRED_PROVIDER_udev Ross Burton
2013-01-20 23:12 ` Martin Jansa
2013-01-20 23:15 ` Martin Jansa
2013-01-19 22:47 ` [PATCH 03/10] dbus: respect systemd distro feature Ross Burton
2013-01-19 22:47 ` [PATCH 04/10] systemd: add systemd recipes Ross Burton
2013-01-20 23:11 ` Martin Jansa
2013-01-21 12:07 ` Burton, Ross
2013-01-19 22:47 ` [PATCH 05/10] default-providers: Add systemd option to PREFERRED_PROVIDER_udev Ross Burton
2013-01-19 22:47 ` [PATCH 06/10] packagegroup-core-boot: install systemd-compat-units on systemd images Ross Burton
2013-01-19 22:47 ` [PATCH 07/10] update-rc.d: disable update-rc.d.bbclass when systemd enabled Ross Burton
2013-01-19 22:47 ` [PATCH 08/10] base-files: add fstab for systemd based systems Ross Burton
2013-01-19 22:47 ` Ross Burton [this message]
2013-01-19 22:47 ` [PATCH 10/10] libpam: register PAM session with logind Ross Burton
2013-01-20 18:34 ` [PATCH 00/10] Initial systemd integration Saul Wold
2013-01-20 20:21 ` Burton, Ross
2013-01-21 8:59 ` Martin Jansa
2013-01-21 9:21 ` Burton, Ross
2013-01-21 3:57 ` Saul Wold
2013-01-21 8:08 ` Burton, Ross
2013-01-21 8:19 ` Eric Bénard
2013-01-21 8:47 ` Radu Moisan
2013-01-21 10:14 ` Richard Purdie
2013-01-21 12:09 ` Burton, Ross
2013-01-21 12:10 ` Burton, Ross
2013-01-21 3:30 ` Ciprian Ciubotariu
2013-01-21 12:12 ` Burton, Ross
2013-01-21 16:57 ` Saul Wold
2013-01-21 17:00 ` Burton, Ross
2013-01-22 22:04 ` Ciprian Ciubotariu
2013-01-22 22:29 ` Richard Purdie
2013-01-22 9:30 ` ChenQi
2013-01-22 10:48 ` Radu Moisan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f2c8ee8bb2e7406a46ee9c63cddc2553931553bb.1358635193.git.ross.burton@intel.com \
--to=ross.burton@intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox