From e0381499e89c7da0b0741a7e708524d8d27dddc3 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 12 May 2015 11:25:56 +0200 Subject: machines: don't pin systemd version anymore Use systemd V2.18 from meta-angstrom. Issues with firmware loading and the 3.1.10 kernel for the tegra machines are fixed with a backport from oe-core. --- conf/machine/apalis-imx6.conf | 3 --- conf/machine/apalis-t30.conf | 3 --- conf/machine/colibri-imx6.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 --- 7 files changed, 21 deletions(-) diff --git a/conf/machine/apalis-imx6.conf b/conf/machine/apalis-imx6.conf index c0f5fa5..08eaa02 100644 --- a/conf/machine/apalis-imx6.conf +++ b/conf/machine/apalis-imx6.conf @@ -17,9 +17,6 @@ KERNEL_IMAGETYPE = "uImage" PREFERRED_VERSION_xserver-xorg_mx6 = "99:1.14%" -# don't pull in systemd 216 backported into meta-angstrom -PREFERRED_VERSION_systemd = "211%" - UBOOT_MACHINE = "apalis_imx6_defconfig" SERIAL_CONSOLE = "115200 ttymxc0" diff --git a/conf/machine/apalis-t30.conf b/conf/machine/apalis-t30.conf index 03d2d04..5149c38 100644 --- a/conf/machine/apalis-t30.conf +++ b/conf/machine/apalis-t30.conf @@ -37,9 +37,6 @@ 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-imx6.conf b/conf/machine/colibri-imx6.conf index b9ea652..2fc6ff3 100644 --- a/conf/machine/colibri-imx6.conf +++ b/conf/machine/colibri-imx6.conf @@ -17,9 +17,6 @@ KERNEL_IMAGETYPE = "uImage" PREFERRED_VERSION_xserver-xorg_mx6 = "99:1.14%" -# don't pull in systemd 216 backported into meta-angstrom -PREFERRED_VERSION_systemd = "211%" - UBOOT_MACHINE = "colibri_imx6_defconfig" SERIAL_CONSOLE = "115200 ttymxc0" diff --git a/conf/machine/colibri-pxa.conf b/conf/machine/colibri-pxa.conf index 6f5195c..8428862 100644 --- a/conf/machine/colibri-pxa.conf +++ b/conf/machine/colibri-pxa.conf @@ -25,9 +25,6 @@ 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 3e866dc..b0b33aa 100644 --- a/conf/machine/colibri-t20.conf +++ b/conf/machine/colibri-t20.conf @@ -35,9 +35,6 @@ 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 4b86235..8d3419f 100644 --- a/conf/machine/colibri-t30.conf +++ b/conf/machine/colibri-t30.conf @@ -37,9 +37,6 @@ 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 820059a..a9818a9 100644 --- a/conf/machine/colibri-vf.conf +++ b/conf/machine/colibri-vf.conf @@ -37,9 +37,6 @@ IMAGE_FSTYPES ?= "tar.bz2 ext3 sdcard" SERIAL_CONSOLES = "115200;ttyLP0 115200;ttyGS0" -# don't pull in systemd 216 backported into meta-angstrom -PREFERRED_VERSION_systemd = "211%" - MACHINE_FEATURES = "screen usbgadget usbhost vfat alsa touchscreen wifi bluetooth 3g" EXTRA_IMAGEDEPENDS += "u-boot" -- cgit v1.2.3