From 7544bfb6ec7efd283e7e7ff712e91452fdffb534 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Wed, 2 Apr 2014 09:07:00 -0400
Subject: kernel: update fragments to oe-core 1.6

Now that the 3.14 kernel has been introduced and 3.8 dropped from oe-core,
we need to adjust our configuration fragments accordingly.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 recipes-kernel/linux/linux-yocto_3.14.bbappend | 19 +++++++++++++++++++
 recipes-kernel/linux/linux-yocto_3.8.bbappend  | 19 -------------------
 2 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100644 recipes-kernel/linux/linux-yocto_3.14.bbappend
 delete mode 100644 recipes-kernel/linux/linux-yocto_3.8.bbappend

(limited to 'recipes-kernel')

diff --git a/recipes-kernel/linux/linux-yocto_3.14.bbappend b/recipes-kernel/linux/linux-yocto_3.14.bbappend
new file mode 100644
index 00000000..c029c05e
--- /dev/null
+++ b/recipes-kernel/linux/linux-yocto_3.14.bbappend
@@ -0,0 +1,19 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://xt-checksum.scc \
+            file://ebtables.scc \
+	    file://vswitch.scc \
+	    file://lxc.scc \
+	    "
+module_autoload_openvswitch = "openvswitch"
+KERNEL_FEATURES_append = " features/kvm/qemu-kvm-enable.scc"
+
+module_autoload_kvm = "kvm"
+module_autoload_kvm-amd = "kvm-amd"
+module_autoload_kvm-intel = "kvm-intel"
+
+# aufs kernel support required for xen-image-minimal
+KERNEL_FEATURES_append += "${@base_contains('DISTRO_FEATURES', 'aufs', ' features/aufs/aufs-enable.scc', '', d)}"
+
+# xen kernel support
+SRC_URI += "${@base_contains('DISTRO_FEATURES', 'xen', ' file://xen.scc', '', d)}"
diff --git a/recipes-kernel/linux/linux-yocto_3.8.bbappend b/recipes-kernel/linux/linux-yocto_3.8.bbappend
deleted file mode 100644
index c029c05e..00000000
--- a/recipes-kernel/linux/linux-yocto_3.8.bbappend
+++ /dev/null
@@ -1,19 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://xt-checksum.scc \
-            file://ebtables.scc \
-	    file://vswitch.scc \
-	    file://lxc.scc \
-	    "
-module_autoload_openvswitch = "openvswitch"
-KERNEL_FEATURES_append = " features/kvm/qemu-kvm-enable.scc"
-
-module_autoload_kvm = "kvm"
-module_autoload_kvm-amd = "kvm-amd"
-module_autoload_kvm-intel = "kvm-intel"
-
-# aufs kernel support required for xen-image-minimal
-KERNEL_FEATURES_append += "${@base_contains('DISTRO_FEATURES', 'aufs', ' features/aufs/aufs-enable.scc', '', d)}"
-
-# xen kernel support
-SRC_URI += "${@base_contains('DISTRO_FEATURES', 'xen', ' file://xen.scc', '', d)}"
-- 
cgit v1.2.3-54-g00ecf