diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2017-12-20 09:53:13 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-04 12:57:43 +0000 |
commit | a91b286291c7401c5788c45a68f13f690f1a6d15 (patch) | |
tree | 9463891e17e36a0dd7e5e09eb4b036782ea041d6 /meta/recipes-core/systemd | |
parent | a8f78241be9b30a3ff851713f0b8fae97acee464 (diff) | |
download | poky-a91b286291c7401c5788c45a68f13f690f1a6d15.tar.gz |
systemd: inherit distro_features_check
Use distro_features_check so that we can have a uniform controller.
(From OE-Core rev: 9daf88713dedfb29fe926e18d76090a6b2582ac8)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd')
-rw-r--r-- | meta/recipes-core/systemd/systemd-serialgetty.bb | 10 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd_234.bb | 13 |
2 files changed, 9 insertions, 14 deletions
diff --git a/meta/recipes-core/systemd/systemd-serialgetty.bb b/meta/recipes-core/systemd/systemd-serialgetty.bb index d9347163b5..d67a3c91b4 100644 --- a/meta/recipes-core/systemd/systemd-serialgetty.bb +++ b/meta/recipes-core/systemd/systemd-serialgetty.bb | |||
@@ -11,6 +11,10 @@ SRC_URI = "file://serial-getty@.service" | |||
11 | 11 | ||
12 | S = "${WORKDIR}" | 12 | S = "${WORKDIR}" |
13 | 13 | ||
14 | # As this package is tied to systemd, only build it when we're also building systemd. | ||
15 | inherit distro_features_check | ||
16 | REQUIRED_DISTRO_FEATURES = "systemd" | ||
17 | |||
14 | do_install() { | 18 | do_install() { |
15 | if [ ! -z "${SERIAL_CONSOLES}" ] ; then | 19 | if [ ! -z "${SERIAL_CONSOLES}" ] ; then |
16 | default_baudrate=`echo "${SERIAL_CONSOLES}" | sed 's/\;.*//'` | 20 | default_baudrate=`echo "${SERIAL_CONSOLES}" | sed 's/\;.*//'` |
@@ -43,10 +47,4 @@ do_install() { | |||
43 | FILES_${PN} = "${systemd_unitdir}/system/*.service ${sysconfdir}" | 47 | FILES_${PN} = "${systemd_unitdir}/system/*.service ${sysconfdir}" |
44 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 48 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
45 | 49 | ||
46 | # As this package is tied to systemd, only build it when we're also building systemd. | ||
47 | python () { | ||
48 | if not bb.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d): | ||
49 | raise bb.parse.SkipPackage("'systemd' not in DISTRO_FEATURES") | ||
50 | } | ||
51 | |||
52 | ALLOW_EMPTY_${PN} = "1" | 50 | ALLOW_EMPTY_${PN} = "1" |
diff --git a/meta/recipes-core/systemd/systemd_234.bb b/meta/recipes-core/systemd/systemd_234.bb index 9a10a31881..4132cdf40f 100644 --- a/meta/recipes-core/systemd/systemd_234.bb +++ b/meta/recipes-core/systemd/systemd_234.bb | |||
@@ -8,7 +8,11 @@ DEPENDS = "kmod intltool-native gperf-native acl readline libcap libcgroup util- | |||
8 | 8 | ||
9 | SECTION = "base/shell" | 9 | SECTION = "base/shell" |
10 | 10 | ||
11 | inherit useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest gettext bash-completion manpages | 11 | inherit useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest gettext bash-completion manpages distro_features_check |
12 | |||
13 | # As this recipe builds udev, respect systemd being in DISTRO_FEATURES so | ||
14 | # that we don't build both udev and systemd in world builds. | ||
15 | REQUIRED_DISTRO_FEATURES = "systemd" | ||
12 | 16 | ||
13 | SRC_URI = "git://github.com/systemd/systemd.git;protocol=git \ | 17 | SRC_URI = "git://github.com/systemd/systemd.git;protocol=git \ |
14 | file://touchscreen.rules \ | 18 | file://touchscreen.rules \ |
@@ -630,10 +634,3 @@ pkg_postinst_udev-hwdb () { | |||
630 | pkg_prerm_udev-hwdb () { | 634 | pkg_prerm_udev-hwdb () { |
631 | rm -f $D${sysconfdir}/udev/hwdb.bin | 635 | rm -f $D${sysconfdir}/udev/hwdb.bin |
632 | } | 636 | } |
633 | |||
634 | # As this recipe builds udev, respect systemd being in DISTRO_FEATURES so | ||
635 | # that we don't build both udev and systemd in world builds. | ||
636 | python () { | ||
637 | if not bb.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d): | ||
638 | raise bb.parse.SkipPackage("'systemd' not in DISTRO_FEATURES") | ||
639 | } | ||