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
commitc68dc5502d6dec8a9efe47194050e410f1075558 (patch)
tree927c64d6a9657990e3c2525e528ee2629658406a /conf
parentf0530a39daa4ebeb8d9b2fd790ce684926599ce7 (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/apalis-t30.conf3
-rw-r--r--conf/machine/colibri-t20.conf3
-rw-r--r--conf/machine/colibri-t30.conf3
4 files changed, 12 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/apalis-t30.conf b/conf/machine/apalis-t30.conf
index 169049c..32fc942 100644
--- a/conf/machine/apalis-t30.conf
+++ b/conf/machine/apalis-t30.conf
@@ -37,6 +37,9 @@ PREFERRED_PROVIDER_virtual/egl = "trdx-nv-binaries"
PREFERRED_PROVIDER_virtual/libgles1 = "trdx-nv-binaries"
PREFERRED_PROVIDER_virtual/libgles2 = "trdx-nv-binaries"
+# 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 pci "
EXTRA_IMAGEDEPENDS += "u-boot"
diff --git a/conf/machine/colibri-t20.conf b/conf/machine/colibri-t20.conf
index 70737bd..308356e 100644
--- a/conf/machine/colibri-t20.conf
+++ b/conf/machine/colibri-t20.conf
@@ -35,6 +35,9 @@ PREFERRED_PROVIDER_virtual/egl = "trdx-nv-binaries"
PREFERRED_PROVIDER_virtual/libgles1 = "trdx-nv-binaries"
PREFERRED_PROVIDER_virtual/libgles2 = "trdx-nv-binaries"
+# 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"
diff --git a/conf/machine/colibri-t30.conf b/conf/machine/colibri-t30.conf
index 2c7fa0e..35465dc 100644
--- a/conf/machine/colibri-t30.conf
+++ b/conf/machine/colibri-t30.conf
@@ -37,6 +37,9 @@ PREFERRED_PROVIDER_virtual/egl = "trdx-nv-binaries"
PREFERRED_PROVIDER_virtual/libgles1 = "trdx-nv-binaries"
PREFERRED_PROVIDER_virtual/libgles2 = "trdx-nv-binaries"
+# 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"