summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/systemd/systemd-serialgetty.bb10
-rw-r--r--meta/recipes-core/systemd/systemd_234.bb13
-rw-r--r--meta/recipes-core/udev/eudev_3.2.2.bb9
3 files changed, 12 insertions, 20 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
12S = "${WORKDIR}" 12S = "${WORKDIR}"
13 13
14# As this package is tied to systemd, only build it when we're also building systemd.
15inherit distro_features_check
16REQUIRED_DISTRO_FEATURES = "systemd"
17
14do_install() { 18do_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() {
43FILES_${PN} = "${systemd_unitdir}/system/*.service ${sysconfdir}" 47FILES_${PN} = "${systemd_unitdir}/system/*.service ${sysconfdir}"
44PACKAGE_ARCH = "${MACHINE_ARCH}" 48PACKAGE_ARCH = "${MACHINE_ARCH}"
45 49
46# As this package is tied to systemd, only build it when we're also building systemd.
47python () {
48 if not bb.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d):
49 raise bb.parse.SkipPackage("'systemd' not in DISTRO_FEATURES")
50}
51
52ALLOW_EMPTY_${PN} = "1" 50ALLOW_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
9SECTION = "base/shell" 9SECTION = "base/shell"
10 10
11inherit useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest gettext bash-completion manpages 11inherit 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.
15REQUIRED_DISTRO_FEATURES = "systemd"
12 16
13SRC_URI = "git://github.com/systemd/systemd.git;protocol=git \ 17SRC_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 () {
630pkg_prerm_udev-hwdb () { 634pkg_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.
636python () {
637 if not bb.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d):
638 raise bb.parse.SkipPackage("'systemd' not in DISTRO_FEATURES")
639}
diff --git a/meta/recipes-core/udev/eudev_3.2.2.bb b/meta/recipes-core/udev/eudev_3.2.2.bb
index 70e3568dc2..d01104746d 100644
--- a/meta/recipes-core/udev/eudev_3.2.2.bb
+++ b/meta/recipes-core/udev/eudev_3.2.2.bb
@@ -23,7 +23,9 @@ SRC_URI = "http://dev.gentoo.org/~blueness/${BPN}/${BP}.tar.gz \
23SRC_URI[md5sum] = "41e19b70462692fefd072a3f38818b6e" 23SRC_URI[md5sum] = "41e19b70462692fefd072a3f38818b6e"
24SRC_URI[sha256sum] = "3e4c56ec2fc1854afd0a31f3affa48f922c62d40ee12a0c1a4b4f152ef5b0f63" 24SRC_URI[sha256sum] = "3e4c56ec2fc1854afd0a31f3affa48f922c62d40ee12a0c1a4b4f152ef5b0f63"
25 25
26inherit autotools update-rc.d qemu pkgconfig 26inherit autotools update-rc.d qemu pkgconfig distro_features_check
27
28CONFLICT_DISTRO_FEATURES = "systemd"
27 29
28EXTRA_OECONF = " \ 30EXTRA_OECONF = " \
29 --sbindir=${base_sbindir} \ 31 --sbindir=${base_sbindir} \
@@ -75,11 +77,6 @@ RDEPENDS_eudev-hwdb += "eudev"
75RPROVIDES_${PN} = "hotplug udev" 77RPROVIDES_${PN} = "hotplug udev"
76RPROVIDES_eudev-hwdb += "udev-hwdb" 78RPROVIDES_eudev-hwdb += "udev-hwdb"
77 79
78python () {
79 if bb.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d):
80 raise bb.parse.SkipPackage("'systemd' in DISTRO_FEATURES")
81}
82
83PACKAGE_WRITE_DEPS += "qemu-native" 80PACKAGE_WRITE_DEPS += "qemu-native"
84pkg_postinst_eudev-hwdb () { 81pkg_postinst_eudev-hwdb () {
85 if test -n "$D"; then 82 if test -n "$D"; then