From ba383ecd350eb301fe9f6a2435be8f414617f10a Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Tue, 10 Feb 2015 00:52:17 +0100 Subject: [PATCH] linux-raspberrypi: Refactor kernel recipes We use this to simplify the update process. Updating a kernel version will not require renaming the recipe but only tweaking LINUX_VERSION. Update kernel version: - bump SRCREV - bump LINUX_VERSION if needed [Support #26] Change-Id: I7565ddd1f03cc34c34aa5da92664a0057b415c9a Signed-off-by: Andrei Gherzan --- recipes-kernel/linux/linux-raspberrypi.inc | 2 +- ...{linux-raspberrypi_3.10.38.bb => linux-raspberrypi_3.10.bb} | 2 ++ ...{linux-raspberrypi_3.12.36.bb => linux-raspberrypi_3.12.bb} | 2 ++ .../{linux-raspberrypi_3.16.5.bb => linux-raspberrypi_3.16.bb} | 2 ++ .../{linux-raspberrypi_3.18.5.bb => linux-raspberrypi_3.18.bb} | 3 +++ .../{linux-raspberrypi_3.6.11.bb => linux-raspberrypi_3.6.bb} | 2 ++ .../{linux-raspberrypi_3.8.13.bb => linux-raspberrypi_3.8.bb} | 2 ++ 7 files changed, 14 insertions(+), 1 deletion(-) rename recipes-kernel/linux/{linux-raspberrypi_3.10.38.bb => linux-raspberrypi_3.10.bb} (89%) rename recipes-kernel/linux/{linux-raspberrypi_3.12.36.bb => linux-raspberrypi_3.12.bb} (89%) rename recipes-kernel/linux/{linux-raspberrypi_3.16.5.bb => linux-raspberrypi_3.16.bb} (89%) rename recipes-kernel/linux/{linux-raspberrypi_3.18.5.bb => linux-raspberrypi_3.18.bb} (89%) rename recipes-kernel/linux/{linux-raspberrypi_3.6.11.bb => linux-raspberrypi_3.6.bb} (89%) rename recipes-kernel/linux/{linux-raspberrypi_3.8.13.bb => linux-raspberrypi_3.8.bb} (89%) diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc index fde68dd..84d4f9e 100644 --- a/recipes-kernel/linux/linux-raspberrypi.inc +++ b/recipes-kernel/linux/linux-raspberrypi.inc @@ -11,7 +11,7 @@ SRC_URI += " \ COMPATIBLE_MACHINE = "raspberrypi" -PV_append = "+git${SRCREV}" +PV = "${LINUX_VERSION}+git${SRCREV}" # NOTE: For now we pull in the default config from the RPi kernel GIT tree. KERNEL_DEFCONFIG_raspberrypi ?= "bcmrpi_defconfig" diff --git a/recipes-kernel/linux/linux-raspberrypi_3.10.38.bb b/recipes-kernel/linux/linux-raspberrypi_3.10.bb similarity index 89% rename from recipes-kernel/linux/linux-raspberrypi_3.10.38.bb rename to recipes-kernel/linux/linux-raspberrypi_3.10.bb index a0c5012..e5d5bf2 100644 --- a/recipes-kernel/linux/linux-raspberrypi_3.10.38.bb +++ b/recipes-kernel/linux/linux-raspberrypi_3.10.bb @@ -1,3 +1,5 @@ +LINUX_VERSION ?= "3.10.38" + SRCREV = "1b49b450222df26e4abf7abb6d9302f72b2ed386" SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.10.y \ file://sl030raspberrypii2ckernel.patch \ diff --git a/recipes-kernel/linux/linux-raspberrypi_3.12.36.bb b/recipes-kernel/linux/linux-raspberrypi_3.12.bb similarity index 89% rename from recipes-kernel/linux/linux-raspberrypi_3.12.36.bb rename to recipes-kernel/linux/linux-raspberrypi_3.12.bb index e9e9ad7..2952778 100644 --- a/recipes-kernel/linux/linux-raspberrypi_3.12.36.bb +++ b/recipes-kernel/linux/linux-raspberrypi_3.12.bb @@ -1,3 +1,5 @@ +LINUX_VERSION ?= "3.12.36" + SRCREV = "90fa5df724d147564149c7b79cb1ffc571a345ec" SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.12.y \ file://sl030raspberrypii2ckernel.patch \ diff --git a/recipes-kernel/linux/linux-raspberrypi_3.16.5.bb b/recipes-kernel/linux/linux-raspberrypi_3.16.bb similarity index 89% rename from recipes-kernel/linux/linux-raspberrypi_3.16.5.bb rename to recipes-kernel/linux/linux-raspberrypi_3.16.bb index 97947c2..ccc414f 100644 --- a/recipes-kernel/linux/linux-raspberrypi_3.16.5.bb +++ b/recipes-kernel/linux/linux-raspberrypi_3.16.bb @@ -1,3 +1,5 @@ +LINUX_VERSION ?= "3.16.5" + SRCREV = "377c82aa1d31b37f1096096b0e4c65beb0bc5c49" SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.16.y \ file://sl030raspberrypii2ckernel.patch \ diff --git a/recipes-kernel/linux/linux-raspberrypi_3.18.5.bb b/recipes-kernel/linux/linux-raspberrypi_3.18.bb similarity index 89% rename from recipes-kernel/linux/linux-raspberrypi_3.18.5.bb rename to recipes-kernel/linux/linux-raspberrypi_3.18.bb index 663522e..921e702 100644 --- a/recipes-kernel/linux/linux-raspberrypi_3.18.5.bb +++ b/recipes-kernel/linux/linux-raspberrypi_3.18.bb @@ -1,5 +1,8 @@ +LINUX_VERSION ?= "3.18.5" + SRCREV = "a6cf3c99bc89e2c010c2f78fbf9e3ed478ccfd46" SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.18.y \ file://sl030raspberrypii2ckernel.patch \ " + require linux-raspberrypi.inc diff --git a/recipes-kernel/linux/linux-raspberrypi_3.6.11.bb b/recipes-kernel/linux/linux-raspberrypi_3.6.bb similarity index 89% rename from recipes-kernel/linux/linux-raspberrypi_3.6.11.bb rename to recipes-kernel/linux/linux-raspberrypi_3.6.bb index a154bcf..fc9ac89 100644 --- a/recipes-kernel/linux/linux-raspberrypi_3.6.11.bb +++ b/recipes-kernel/linux/linux-raspberrypi_3.6.bb @@ -1,3 +1,5 @@ +LINUX_VERSION ?= "3.6.11" + SRCREV = "2a8d45ec0883e3cbdce920855b3461ac77308a5f" SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.6.y \ file://sl030raspberrypii2ckernel.patch \ diff --git a/recipes-kernel/linux/linux-raspberrypi_3.8.13.bb b/recipes-kernel/linux/linux-raspberrypi_3.8.bb similarity index 89% rename from recipes-kernel/linux/linux-raspberrypi_3.8.13.bb rename to recipes-kernel/linux/linux-raspberrypi_3.8.bb index dc8cf0a..ae0dc99 100644 --- a/recipes-kernel/linux/linux-raspberrypi_3.8.13.bb +++ b/recipes-kernel/linux/linux-raspberrypi_3.8.bb @@ -1,3 +1,5 @@ +LINUX_VERSION ?= "3.8.13" + SRCREV = "d996a1b91b2bf3dc06f4f4f822a56f4496457aa1" SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.8.y \ file://sl030raspberrypii2ckernel.patch \