summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2014-10-06 14:09:47 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2014-10-06 14:11:29 +0200
commit4a1970f999188b676b235f0adf5d5e6fd4747b2c (patch)
treec9733000113acd587342f3fdc989a0e75fa3e4ea /conf
parent40191483d8c97612067cdc05f8b5d532f87bb3bb (diff)
systemd: don't pull in systemd 216
meta-angstrom backported systemd 2.16 into daisy. Keep using 2.11 for now.
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/apalis-imx6.conf3
-rw-r--r--conf/machine/colibri-pxa.conf3
2 files changed, 6 insertions, 0 deletions
diff --git a/conf/machine/apalis-imx6.conf b/conf/machine/apalis-imx6.conf
index bdc7a40..d8e9e36 100644
--- a/conf/machine/apalis-imx6.conf
+++ b/conf/machine/apalis-imx6.conf
@@ -16,6 +16,9 @@ KERNEL_DEVICETREE = "imx6q-apalis-eval.dtb"
PREFERRED_VERSION_xserver-xorg_mx6 = "99:1.14%"
+# don't pull in systemd 216 backported into meta-angstrom
+PREFERRED_VERSION_systemd = "211%"
+
# Ensure boot scripts will be available at rootfs time
#do_rootfs[depends] += "u-boot-script-boundary:do_deploy"
diff --git a/conf/machine/colibri-pxa.conf b/conf/machine/colibri-pxa.conf
index 8428862..6f5195c 100644
--- a/conf/machine/colibri-pxa.conf
+++ b/conf/machine/colibri-pxa.conf
@@ -25,6 +25,9 @@ PREFERRED_PROVIDER_lxsession-lite_colibri-pxa = "lxsession"
PREFERRED_PROVIDER_virtual/psplash = "psplash-angstrom"
PREFERRED_PROVIDER_psplash-support = "psplash-angstrom"
+# don't pull in systemd 216 backported into meta-angstrom
+PREFERRED_VERSION_systemd = "211%"
+
MACHINE_FEATURES = "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g "
EXTRA_IMAGEDEPENDS += "u-boot"