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
commit5d4ccacff64c9c0440e2d27b6e5b5fa598b5dbe2 (patch)
tree86767ac1dc4dc478513a7925ddd398134bbcc222 /conf
parentcc891785bbe41582c4e02468508f629ec1efbbf1 (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-vf.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-vf.conf b/conf/machine/colibri-vf.conf
index d7299a9..dd62253 100644
--- a/conf/machine/colibri-vf.conf
+++ b/conf/machine/colibri-vf.conf
@@ -33,6 +33,9 @@ IMAGE_FSTYPES ?= "tar.bz2 ext3 sdcard"
SERIAL_CONSOLE = "115200 ttymxc0"
+# 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"