diff options
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/systemd/systemd-compat-units.bb | 3 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd-conf_1.0.bb | 3 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd-machine-units_1.0.bb | 3 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd-serialgetty.bb | 3 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd_254.bb | 6 |
5 files changed, 14 insertions, 4 deletions
diff --git a/meta/recipes-core/systemd/systemd-compat-units.bb b/meta/recipes-core/systemd/systemd-compat-units.bb index 55ebf99117..75b1045728 100644 --- a/meta/recipes-core/systemd/systemd-compat-units.bb +++ b/meta/recipes-core/systemd/systemd-compat-units.bb | |||
@@ -14,7 +14,8 @@ INHIBIT_DEFAULT_DEPS = "1" | |||
14 | 14 | ||
15 | ALLOW_EMPTY:${PN} = "1" | 15 | ALLOW_EMPTY:${PN} = "1" |
16 | 16 | ||
17 | REQUIRED_DISTRO_FEATURES = "systemd" | 17 | REQUIRED_DISTRO_FEATURES += "systemd" |
18 | REQUIRED_DISTRO_FEATURES += "usrmerge" | ||
18 | 19 | ||
19 | SYSTEMD_DISABLED_SYSV_SERVICES = " \ | 20 | SYSTEMD_DISABLED_SYSV_SERVICES = " \ |
20 | busybox-udhcpc \ | 21 | busybox-udhcpc \ |
diff --git a/meta/recipes-core/systemd/systemd-conf_1.0.bb b/meta/recipes-core/systemd/systemd-conf_1.0.bb index 61ce7939d3..2355936631 100644 --- a/meta/recipes-core/systemd/systemd-conf_1.0.bb +++ b/meta/recipes-core/systemd/systemd-conf_1.0.bb | |||
@@ -5,6 +5,9 @@ DefaultTimeoutStartSec setting." | |||
5 | LICENSE = "MIT" | 5 | LICENSE = "MIT" |
6 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 6 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
7 | 7 | ||
8 | inherit features_check | ||
9 | REQUIRED_DISTRO_FEATURES += "usrmerge" | ||
10 | |||
8 | PE = "1" | 11 | PE = "1" |
9 | 12 | ||
10 | PACKAGECONFIG ??= "dhcp-ethernet" | 13 | PACKAGECONFIG ??= "dhcp-ethernet" |
diff --git a/meta/recipes-core/systemd/systemd-machine-units_1.0.bb b/meta/recipes-core/systemd/systemd-machine-units_1.0.bb index 12f27d6ae3..7e59e86f9b 100644 --- a/meta/recipes-core/systemd/systemd-machine-units_1.0.bb +++ b/meta/recipes-core/systemd/systemd-machine-units_1.0.bb | |||
@@ -7,7 +7,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
7 | 7 | ||
8 | PR = "r19" | 8 | PR = "r19" |
9 | 9 | ||
10 | inherit systemd | 10 | inherit systemd features_check |
11 | REQUIRED_DISTRO_FEATURES += "usrmerge" | ||
11 | SYSTEMD_SERVICE:${PN} = "" | 12 | SYSTEMD_SERVICE:${PN} = "" |
12 | 13 | ||
13 | ALLOW_EMPTY:${PN} = "1" | 14 | ALLOW_EMPTY:${PN} = "1" |
diff --git a/meta/recipes-core/systemd/systemd-serialgetty.bb b/meta/recipes-core/systemd/systemd-serialgetty.bb index fd888bb834..c2c67e6fe0 100644 --- a/meta/recipes-core/systemd/systemd-serialgetty.bb +++ b/meta/recipes-core/systemd/systemd-serialgetty.bb | |||
@@ -14,7 +14,8 @@ S = "${WORKDIR}" | |||
14 | 14 | ||
15 | # As this package is tied to systemd, only build it when we're also building systemd. | 15 | # As this package is tied to systemd, only build it when we're also building systemd. |
16 | inherit features_check | 16 | inherit features_check |
17 | REQUIRED_DISTRO_FEATURES = "systemd" | 17 | REQUIRED_DISTRO_FEATURES += "systemd" |
18 | REQUIRED_DISTRO_FEATURES += "usrmerge" | ||
18 | 19 | ||
19 | do_install() { | 20 | do_install() { |
20 | if [ ! -z "${SERIAL_CONSOLES}" ] ; then | 21 | if [ ! -z "${SERIAL_CONSOLES}" ] ; then |
diff --git a/meta/recipes-core/systemd/systemd_254.bb b/meta/recipes-core/systemd/systemd_254.bb index d2ff157e44..f48f8c0b18 100644 --- a/meta/recipes-core/systemd/systemd_254.bb +++ b/meta/recipes-core/systemd/systemd_254.bb | |||
@@ -10,9 +10,13 @@ SECTION = "base/shell" | |||
10 | 10 | ||
11 | inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives qemu systemd gettext bash-completion manpages features_check | 11 | inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives qemu systemd gettext bash-completion manpages features_check |
12 | 12 | ||
13 | # unmerged-usr support is deprecated upstream, taints the system and will be | ||
14 | # removed in the near future. Fail the build if it is not enabled. | ||
15 | REQUIRED_DISTRO_FEATURES += "usrmerge" | ||
16 | |||
13 | # As this recipe builds udev, respect systemd being in DISTRO_FEATURES so | 17 | # 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. | 18 | # that we don't build both udev and systemd in world builds. |
15 | REQUIRED_DISTRO_FEATURES = "systemd" | 19 | REQUIRED_DISTRO_FEATURES += "systemd" |
16 | 20 | ||
17 | SRC_URI += " \ | 21 | SRC_URI += " \ |
18 | file://touchscreen.rules \ | 22 | file://touchscreen.rules \ |