From 8840d1a82a7e95d5bec3c590fa2dfbd7ae907685 Mon Sep 17 00:00:00 2001
From: Nicolas Aguirre <aguirre.nicolas@gmail.com>
Date: Thu, 12 Sep 2013 08:20:59 +0200
Subject: [PATCH] Change linux to use 3.4 branch

---
 recipes-graphics/tslib/tslib_1.1.bbappend     |  6 +++++
 .../linux/{linux_3.0.bb => linux_3.4.bb}      | 23 +++++--------------
 2 files changed, 12 insertions(+), 17 deletions(-)
 create mode 100644 recipes-graphics/tslib/tslib_1.1.bbappend
 rename recipes-kernel/linux/{linux_3.0.bb => linux_3.4.bb} (59%)

diff --git a/recipes-graphics/tslib/tslib_1.1.bbappend b/recipes-graphics/tslib/tslib_1.1.bbappend
new file mode 100644
index 0000000..a5b299d
--- /dev/null
+++ b/recipes-graphics/tslib/tslib_1.1.bbappend
@@ -0,0 +1,6 @@
+FILESEXTRAPATHS := "${THISDIR}/${PN}"
+
+PRINC := "${@int(PRINC) + 1}"
+
+SRC_URI += "file://tslib.patch"
+
diff --git a/recipes-kernel/linux/linux_3.0.bb b/recipes-kernel/linux/linux_3.4.bb
similarity index 59%
rename from recipes-kernel/linux/linux_3.0.bb
rename to recipes-kernel/linux/linux_3.4.bb
index 6f278ef..03ac3a9 100644
--- a/recipes-kernel/linux/linux_3.0.bb
+++ b/recipes-kernel/linux/linux_3.4.bb
@@ -10,18 +10,13 @@ PR = "9"
 
 PV = "3.0.76"
 # Last tested version by myself"
-SRCREV_pn-${PN} = "274a66a7bfcbaabb88d63e4eba161965383cc416"
+SRCREV_pn-${PN} = "1e8c5d75335e679f11f9b291be1f3b056f367db9"
 
 MACHINE_KERNEL_PR_append = "a"
 
-SRC_URI += "git://github.com/linux-sunxi/linux-sunxi.git;branch=sunxi-3.0;protocol=git \
-        file://0001-aufs3-kbuild.patch \
-        file://0002-aufs3-base.patch \
-        file://0003-aufs3-proc_map.patch \
-        file://0004-aufs3-standalone.patch \
-        file://fs \
-        file://aufs_type.h \
+SRC_URI += "git://github.com/linux-sunxi/linux-sunxi.git;branch=sunxi-3.4;protocol=git \
         file://defconfig \
+	file://screen.conf \	 
 	file://spdif.conf \
 	file://sata.conf \
 	file://wifi.conf \
@@ -29,24 +24,18 @@ SRC_URI += "git://github.com/linux-sunxi/linux-sunxi.git;branch=sunxi-3.0;protoc
 
 S = "${WORKDIR}/git"
 
-#add AUFS stuff
-do_copy_aufs () {
-  cp ${WORKDIR}/aufs_type.h ${S}/include/linux
-  cp -a ${WORKDIR}/fs ${S}/
-  rm -rf ${S}/modules/wifi
-}
-
 do_package_prepend() {
 
 }
 
 do_install_append () {
   install -d ${D}${sysconfdir}/modules-load.d
+  install -m 0755 ${WORKDIR}/spdif.conf ${D}${sysconfdir}/modules-load.d/screen.conf
   install -m 0755 ${WORKDIR}/spdif.conf ${D}${sysconfdir}/modules-load.d/spdif.conf
   install -m 0755 ${WORKDIR}/sata.conf ${D}${sysconfdir}/modules-load.d/sata.conf
   install -m 0755 ${WORKDIR}/wifi.conf ${D}${sysconfdir}/modules-load.d/wifi.conf
 }
 
-addtask copy_aufs after do_unpack before do_patch
+#addtask copy_aufs after do_unpack before do_patch
 
-INSANE_SKIP_kernel-dev = "debug-files debug-deps"
+INSANE_SKIP_kernel-dev = "debug-files debug-deps arch"