diff options
author | Denys Dmytriyenko <denys@ti.com> | 2019-11-14 19:40:07 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-11-21 23:08:19 +0000 |
commit | 9702544b3e75d761d86cae7e8b36f3f2625b68ce (patch) | |
tree | b8db1573283245d3f7d7c8d9fc32b9bd67c76f14 /meta/recipes-core/systemd | |
parent | a616ffebdc6f761635f351432461010de1890b7d (diff) | |
download | poky-9702544b3e75d761d86cae7e8b36f3f2625b68ce.tar.gz |
distro_features_check: expand with MACHINE_FEATURES and COMBINED_FEATURES, rename
Besides checking DISTRO_FEATURES for required or conflicting features,
being able to check MACHINE_FEATURES and/or COMBINED_FEATURES may also
be useful at times.
Temporarily support the old class name with a warning about future
deprecation.
(From OE-Core rev: 5f4875b950ce199e91f99c8e945a0c709166dc14)
Signed-off-by: Denys Dmytriyenko <denys@ti.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-compat-units.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd-serialgetty.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd_243.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/systemd/systemd-compat-units.bb b/meta/recipes-core/systemd/systemd-compat-units.bb index d228a51c19..faa428b589 100644 --- a/meta/recipes-core/systemd/systemd-compat-units.bb +++ b/meta/recipes-core/systemd/systemd-compat-units.bb | |||
@@ -8,7 +8,7 @@ PACKAGE_WRITE_DEPS += "systemd-systemctl-native" | |||
8 | 8 | ||
9 | S = "${WORKDIR}" | 9 | S = "${WORKDIR}" |
10 | 10 | ||
11 | inherit distro_features_check | 11 | inherit features_check |
12 | 12 | ||
13 | ALLOW_EMPTY_${PN} = "1" | 13 | ALLOW_EMPTY_${PN} = "1" |
14 | 14 | ||
diff --git a/meta/recipes-core/systemd/systemd-serialgetty.bb b/meta/recipes-core/systemd/systemd-serialgetty.bb index 65a931f418..044c6c5b67 100644 --- a/meta/recipes-core/systemd/systemd-serialgetty.bb +++ b/meta/recipes-core/systemd/systemd-serialgetty.bb | |||
@@ -12,7 +12,7 @@ SRC_URI = "file://serial-getty@.service" | |||
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. | 14 | # As this package is tied to systemd, only build it when we're also building systemd. |
15 | inherit distro_features_check | 15 | inherit features_check |
16 | REQUIRED_DISTRO_FEATURES = "systemd" | 16 | REQUIRED_DISTRO_FEATURES = "systemd" |
17 | 17 | ||
18 | do_install() { | 18 | do_install() { |
diff --git a/meta/recipes-core/systemd/systemd_243.bb b/meta/recipes-core/systemd/systemd_243.bb index 7935380e78..df56e557ff 100644 --- a/meta/recipes-core/systemd/systemd_243.bb +++ b/meta/recipes-core/systemd/systemd_243.bb | |||
@@ -8,7 +8,7 @@ DEPENDS = "intltool-native gperf-native libcap util-linux" | |||
8 | 8 | ||
9 | SECTION = "base/shell" | 9 | SECTION = "base/shell" |
10 | 10 | ||
11 | inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives qemu systemd gettext bash-completion manpages distro_features_check | 11 | inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives qemu systemd gettext bash-completion manpages features_check |
12 | 12 | ||
13 | # As this recipe builds udev, respect systemd being in DISTRO_FEATURES so | 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. | 14 | # that we don't build both udev and systemd in world builds. |