From 55134d82c4bc0cef4926ca035c7fd6a6abfc499d Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 6 Oct 2014 14:09:47 +0200 Subject: systemd: don't pull in systemd 216 meta-angstrom backported systemd 2.16 into daisy. Keep using 2.11 for now. --- conf/machine/apalis-imx6.conf | 3 +++ conf/machine/apalis-t30.conf | 3 +++ conf/machine/colibri-pxa.conf | 3 +++ conf/machine/colibri-t20.conf | 3 +++ conf/machine/colibri-t30.conf | 3 +++ conf/machine/colibri-vf.conf | 3 +++ 6 files changed, 18 insertions(+) (limited to 'conf') 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-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" 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" 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" -- cgit v1.2.3