All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andrei Gherzan <andrei@gherzan.ro>
To: yocto@yoctoproject.org
Subject: [meta-raspberrypi][PATCH 1/5] linux-raspberrypi: Refactor kernel recipes
Date: Sun,  8 Feb 2015 13:58:32 +0200	[thread overview]
Message-ID: <1423396716-22626-1-git-send-email-andrei@gherzan.ro> (raw)

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 <andrei@gherzan.ro>
---
 recipes-kernel/linux/linux-raspberrypi.inc        | 2 +-
 recipes-kernel/linux/linux-raspberrypi_3.10.38.bb | 6 ------
 recipes-kernel/linux/linux-raspberrypi_3.10.bb    | 8 ++++++++
 recipes-kernel/linux/linux-raspberrypi_3.12.36.bb | 6 ------
 recipes-kernel/linux/linux-raspberrypi_3.12.bb    | 8 ++++++++
 recipes-kernel/linux/linux-raspberrypi_3.16.5.bb  | 6 ------
 recipes-kernel/linux/linux-raspberrypi_3.16.bb    | 8 ++++++++
 recipes-kernel/linux/linux-raspberrypi_3.18.5.bb  | 5 -----
 recipes-kernel/linux/linux-raspberrypi_3.18.bb    | 8 ++++++++
 recipes-kernel/linux/linux-raspberrypi_3.6.11.bb  | 6 ------
 recipes-kernel/linux/linux-raspberrypi_3.6.bb     | 8 ++++++++
 recipes-kernel/linux/linux-raspberrypi_3.8.13.bb  | 6 ------
 recipes-kernel/linux/linux-raspberrypi_3.8.bb     | 8 ++++++++
 13 files changed, 49 insertions(+), 36 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-raspberrypi_3.10.38.bb
 create mode 100644 recipes-kernel/linux/linux-raspberrypi_3.10.bb
 delete mode 100644 recipes-kernel/linux/linux-raspberrypi_3.12.36.bb
 create mode 100644 recipes-kernel/linux/linux-raspberrypi_3.12.bb
 delete mode 100644 recipes-kernel/linux/linux-raspberrypi_3.16.5.bb
 create mode 100644 recipes-kernel/linux/linux-raspberrypi_3.16.bb
 delete mode 100644 recipes-kernel/linux/linux-raspberrypi_3.18.5.bb
 create mode 100644 recipes-kernel/linux/linux-raspberrypi_3.18.bb
 delete mode 100644 recipes-kernel/linux/linux-raspberrypi_3.6.11.bb
 create mode 100644 recipes-kernel/linux/linux-raspberrypi_3.6.bb
 delete mode 100644 recipes-kernel/linux/linux-raspberrypi_3.8.13.bb
 create mode 100644 recipes-kernel/linux/linux-raspberrypi_3.8.bb

diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc
index ff0c5ce..c00128d 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 = "bcmrpi_defconfig"
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.10.38.bb b/recipes-kernel/linux/linux-raspberrypi_3.10.38.bb
deleted file mode 100644
index a0c5012..0000000
--- a/recipes-kernel/linux/linux-raspberrypi_3.10.38.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-SRCREV = "1b49b450222df26e4abf7abb6d9302f72b2ed386"
-SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.10.y \
-           file://sl030raspberrypii2ckernel.patch \
-          "
-
-require linux-raspberrypi.inc
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.10.bb b/recipes-kernel/linux/linux-raspberrypi_3.10.bb
new file mode 100644
index 0000000..e5d5bf2
--- /dev/null
+++ b/recipes-kernel/linux/linux-raspberrypi_3.10.bb
@@ -0,0 +1,8 @@
+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 \
+          "
+
+require linux-raspberrypi.inc
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.12.36.bb b/recipes-kernel/linux/linux-raspberrypi_3.12.36.bb
deleted file mode 100644
index e9e9ad7..0000000
--- a/recipes-kernel/linux/linux-raspberrypi_3.12.36.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-SRCREV = "90fa5df724d147564149c7b79cb1ffc571a345ec"
-SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.12.y \
-           file://sl030raspberrypii2ckernel.patch \
-          "
-
-require linux-raspberrypi.inc
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.12.bb b/recipes-kernel/linux/linux-raspberrypi_3.12.bb
new file mode 100644
index 0000000..08be83e
--- /dev/null
+++ b/recipes-kernel/linux/linux-raspberrypi_3.12.bb
@@ -0,0 +1,8 @@
+LINUX_VERSION ?= "3.12.26"
+
+SRCREV = "90fa5df724d147564149c7b79cb1ffc571a345ec"
+SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.12.y \
+           file://sl030raspberrypii2ckernel.patch \
+          "
+
+require linux-raspberrypi.inc
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.16.5.bb b/recipes-kernel/linux/linux-raspberrypi_3.16.5.bb
deleted file mode 100644
index 97947c2..0000000
--- a/recipes-kernel/linux/linux-raspberrypi_3.16.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-SRCREV = "377c82aa1d31b37f1096096b0e4c65beb0bc5c49"
-SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.16.y \
-           file://sl030raspberrypii2ckernel.patch \
-          "
-
-require linux-raspberrypi.inc
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.16.bb b/recipes-kernel/linux/linux-raspberrypi_3.16.bb
new file mode 100644
index 0000000..ccc414f
--- /dev/null
+++ b/recipes-kernel/linux/linux-raspberrypi_3.16.bb
@@ -0,0 +1,8 @@
+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 \
+          "
+
+require linux-raspberrypi.inc
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.18.5.bb b/recipes-kernel/linux/linux-raspberrypi_3.18.5.bb
deleted file mode 100644
index 663522e..0000000
--- a/recipes-kernel/linux/linux-raspberrypi_3.18.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-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.18.bb b/recipes-kernel/linux/linux-raspberrypi_3.18.bb
new file mode 100644
index 0000000..921e702
--- /dev/null
+++ b/recipes-kernel/linux/linux-raspberrypi_3.18.bb
@@ -0,0 +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.11.bb
deleted file mode 100644
index a154bcf..0000000
--- a/recipes-kernel/linux/linux-raspberrypi_3.6.11.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-SRCREV = "2a8d45ec0883e3cbdce920855b3461ac77308a5f"
-SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.6.y \
-           file://sl030raspberrypii2ckernel.patch \
-          "
-
-require linux-raspberrypi.inc
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.6.bb b/recipes-kernel/linux/linux-raspberrypi_3.6.bb
new file mode 100644
index 0000000..fc9ac89
--- /dev/null
+++ b/recipes-kernel/linux/linux-raspberrypi_3.6.bb
@@ -0,0 +1,8 @@
+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 \
+          "
+
+require linux-raspberrypi.inc
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.8.13.bb b/recipes-kernel/linux/linux-raspberrypi_3.8.13.bb
deleted file mode 100644
index dc8cf0a..0000000
--- a/recipes-kernel/linux/linux-raspberrypi_3.8.13.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-SRCREV = "d996a1b91b2bf3dc06f4f4f822a56f4496457aa1"
-SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.8.y \
-           file://sl030raspberrypii2ckernel.patch \
-          "
-
-require linux-raspberrypi.inc
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.8.bb b/recipes-kernel/linux/linux-raspberrypi_3.8.bb
new file mode 100644
index 0000000..ae0dc99
--- /dev/null
+++ b/recipes-kernel/linux/linux-raspberrypi_3.8.bb
@@ -0,0 +1,8 @@
+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 \
+          "
+
+require linux-raspberrypi.inc
-- 
2.1.0



             reply	other threads:[~2015-02-08 11:58 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-08 11:58 Andrei Gherzan [this message]
2015-02-08 11:58 ` [meta-raspberrypi][PATCH 2/5] omxplayer: Bump SRCREV Andrei Gherzan
2015-02-08 11:58 ` [meta-raspberrypi][PATCH 3/5] rpi-gpio: Update to v0.5.9 Andrei Gherzan
2015-02-08 11:58 ` [meta-raspberrypi][PATCH 4/5] bcm2835: Update to v1.38 Andrei Gherzan
2015-02-08 11:58 ` [meta-raspberrypi][PATCH 5/5] userland: Bump SRCREV Andrei Gherzan
2015-02-09 21:58 ` [meta-raspberrypi][PATCH 1/5] linux-raspberrypi: Refactor kernel recipes Petter Mabäcker
2015-02-09 22:06 ` Petter Mabäcker
2015-02-09 23:47   ` Andrei Gherzan
  -- strict thread matches above, loose matches on Subject: below --
2015-02-06 16:11 Andrei Gherzan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1423396716-22626-1-git-send-email-andrei@gherzan.ro \
    --to=andrei@gherzan.ro \
    --cc=yocto@yoctoproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.