[yocto] [meta-raspberrypi][PATCH 1/4] Refactor kernel recipes to reduce code duplication

[lists at philipp-wagner.com]

From: Philipp Wagner <mail at philipp-wagner.com>

Signed-off-by: Philipp Wagner <mail at philipp-wagner.com>
---
 recipes-kernel/linux/linux-raspberrypi.inc       | 34 ++++++++++++++++++++++++
 recipes-kernel/linux/linux-raspberrypi_3.2.27.bb | 33 ++---------------------
 recipes-kernel/linux/linux-raspberrypi_3.6.11.bb | 33 ++---------------------
 3 files changed, 38 insertions(+), 62 deletions(-)
 create mode 100644 recipes-kernel/linux/linux-raspberrypi.inc

diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc
new file mode 100644
index 0000000..e756b57
--- /dev/null
+++ b/recipes-kernel/linux/linux-raspberrypi.inc
@@ -0,0 +1,34 @@
+require linux.inc
+
+DESCRIPTION = "Linux Kernel for Raspberry Pi"
+SECTION = "kernel"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+
+COMPATIBLE_MACHINE = "raspberrypi"
+
+PV_append = "+git${SRCREV}"
+
+S = "${WORKDIR}/git"
+
+# NOTE: For now we pull in the default config from the RPi kernel GIT tree.
+KERNEL_DEFCONFIG = "bcmrpi_defconfig"
+
+# CMDLINE for raspberrypi
+CMDLINE_raspberrypi = "dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
+
+UDEV_GE_141 ?= "1"
+
+do_configure_prepend() {
+    install -m 0644 ${S}/arch/${ARCH}/configs/${KERNEL_DEFCONFIG} ${WORKDIR}/defconfig || die "No default configuration for ${MACHINE} / ${KERNEL_DEFCONFIG} available."
+}
+
+do_install_prepend() {
+    install -d ${D}/lib/firmware
+}
+
+do_deploy_append() {
+    # Deploy cmdline.txt
+    install -d ${DEPLOYDIR}/bcm2835-bootfiles
+    echo "${CMDLINE}" > ${DEPLOYDIR}/bcm2835-bootfiles/cmdline.txt
+}
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.2.27.bb b/recipes-kernel/linux/linux-raspberrypi_3.2.27.bb
index 263e0ce..cc4ee38 100644
--- a/recipes-kernel/linux/linux-raspberrypi_3.2.27.bb
+++ b/recipes-kernel/linux/linux-raspberrypi_3.2.27.bb
@@ -1,35 +1,6 @@
-require linux.inc
-
-DESCRIPTION = "Linux kernel for the RaspberryPi board"
-COMPATIBLE_MACHINE = "raspberrypi"
-
-PR = "r7"
-PV_append = "+git${SRCREV}"
-
 SRCREV = "ada8b4415ff44d535d63e4291a0eca733bc2ad0f"
 SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.2.27 \
-	   file://sl030raspberrypii2ckernel.patch \
+           file://sl030raspberrypii2ckernel.patch \
           "
-S = "${WORKDIR}/git"
-
-# NOTE: For now we pull in the default config from the RPi kernel GIT tree.
-KERNEL_DEFCONFIG = "bcmrpi_defconfig"
-
-# CMDLINE for raspberrypi
-CMDLINE_raspberrypi = "dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
-
-UDEV_GE_141 ?= "1"
-
-do_configure_prepend() {
-	install -m 0644 ${S}/arch/${ARCH}/configs/${KERNEL_DEFCONFIG} ${WORKDIR}/defconfig || die "No default configuration for ${MACHINE} / ${KERNEL_DEFCONFIG} available."
-}
-
-do_install_prepend() {
-	install -d ${D}/lib/firmware
-}
 
-do_deploy_append() {
-	# Deploy cmdline.txt
-	install -d ${DEPLOYDIR}/bcm2835-bootfiles
-	echo "${CMDLINE}" > ${DEPLOYDIR}/bcm2835-bootfiles/cmdline.txt
-}
+require linux-raspberrypi.inc
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.6.11.bb b/recipes-kernel/linux/linux-raspberrypi_3.6.11.bb
index 48c99fd..5314f5d 100644
--- a/recipes-kernel/linux/linux-raspberrypi_3.6.11.bb
+++ b/recipes-kernel/linux/linux-raspberrypi_3.6.11.bb
@@ -1,35 +1,6 @@
-require linux.inc
-
-DESCRIPTION = "Linux kernel for the RaspberryPi board"
-COMPATIBLE_MACHINE = "raspberrypi"
-
-PR = "r7"
-PV_append = "+git${SRCREV}"
-
-SRCREV = "63b69a8806ce1890711ff55280c90673ea415933"
+SRCREV = "cbd6672e7e1b2dc5026f5dc7929a13a9a68f2a62"
 SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.6.y \
            file://sl030raspberrypii2ckernel.patch \
           "
-S = "${WORKDIR}/git"
-
-# NOTE: For now we pull in the default config from the RPi kernel GIT tree.
-KERNEL_DEFCONFIG = "bcmrpi_defconfig"
-
-# CMDLINE for raspberrypi
-CMDLINE_raspberrypi = "dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
-
-UDEV_GE_141 ?= "1"
-
-do_configure_prepend() {
-	install -m 0644 ${S}/arch/${ARCH}/configs/${KERNEL_DEFCONFIG} ${WORKDIR}/defconfig || die "No default configuration for ${MACHINE} / ${KERNEL_DEFCONFIG} available."
-}
-
-do_install_prepend() {
-	install -d ${D}/lib/firmware
-}
 
-do_deploy_append() {
-	# Deploy cmdline.txt
-	install -d ${DEPLOYDIR}/bcm2835-bootfiles
-	echo "${CMDLINE}" > ${DEPLOYDIR}/bcm2835-bootfiles/cmdline.txt
-}
+require linux-raspberrypi.inc
-- 
1.8.1.4