Skip to contentSkip to conversation

linux-raspberrypi: Move patch in inc file

PATCH In review Andrei Gherzan 3 participants 9 messages Nov 13, 2013 Broadcom BCM2711/BCM2835 Arm architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/6 linux-raspberrypi: Move patch in inc file

In order to avoid duplicated code, move sl030raspberrypii2ckernel.patch in linux-raspberrypi.inc.

Change-Id I8c3e7a70224672a8def6518baecd4ef86bbb15c4
---
 recipes-kernel/linux/linux-raspberrypi.inc       | 2 ++
 recipes-kernel/linux/linux-raspberrypi_3.11.0.bb | 4 +---
 recipes-kernel/linux/linux-raspberrypi_3.2.27.bb | 4 +---
 recipes-kernel/linux/linux-raspberrypi_3.6.11.bb | 4 +---
 recipes-kernel/linux/linux-raspberrypi_3.8.13.bb | 4 +---
 5 files changed, 6 insertions(+), 12 deletions(-)
recipes-kernel/linux/linux-raspberrypi.inc +2 -0
index e756b57..3397bcb 100644
@@ -11,6 +11,8 @@ PV_append = "+git${SRCREV}"
 
 S = "${WORKDIR}/git"
 
+SRC_URI += "file://sl030raspberrypii2ckernel.patch"
+
 # NOTE: For now we pull in the default config from the RPi kernel GIT tree.
 KERNEL_DEFCONFIG = "bcmrpi_defconfig"
 
recipes-kernel/linux/linux-raspberrypi_3.11.0.bb +1 -3
index 1ae39b2..b197289 100644
@@ -1,6 +1,4 @@
 SRCREV = "d7474694bdc9836af17f4b4d839509f9aad7ffa7"
-SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.11.y \
-           file://sl030raspberrypii2ckernel.patch \
-          "
+SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.11.y"
 
 require linux-raspberrypi.inc
recipes-kernel/linux/linux-raspberrypi_3.2.27.bb +1 -3
index cc4ee38..7c593a8 100644
@@ -1,6 +1,4 @@
 SRCREV = "ada8b4415ff44d535d63e4291a0eca733bc2ad0f"
-SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.2.27 \
-           file://sl030raspberrypii2ckernel.patch \
-          "
+SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.2.27"
 
 require linux-raspberrypi.inc
recipes-kernel/linux/linux-raspberrypi_3.6.11.bb +1 -3
index 5314f5d..5f173f9 100644
@@ -1,6 +1,4 @@
 SRCREV = "cbd6672e7e1b2dc5026f5dc7929a13a9a68f2a62"
-SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.6.y \
-           file://sl030raspberrypii2ckernel.patch \
-          "
+SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.6.y"
 
 require linux-raspberrypi.inc
recipes-kernel/linux/linux-raspberrypi_3.8.13.bb +1 -3
index dc8cf0a..613c172 100644
@@ -1,6 +1,4 @@
 SRCREV = "d996a1b91b2bf3dc06f4f4f822a56f4496457aa1"
-SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.8.y \
-           file://sl030raspberrypii2ckernel.patch \
-          "
+SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.8.y"
 
 require linux-raspberrypi.inc
Signature · 1 line
1.8.1.4
#1 lore raw

PATCH 2/6 linux-raspberrypi: Update available versions to HEAD

Update 3.11.0 to 3.11.7 HEAD.
Update 3.6.11 to HEAD.

Change-Id Iacd8f78b418b0bd6d8513b97ce57ce0108057850
---
 recipes-kernel/linux/linux-raspberrypi_3.11.0.bb | 4 ----
 recipes-kernel/linux/linux-raspberrypi_3.11.7.bb | 4 ++++
 recipes-kernel/linux/linux-raspberrypi_3.6.11.bb | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-raspberrypi_3.11.0.bb
 create mode 100644 recipes-kernel/linux/linux-raspberrypi_3.11.7.bb
recipes-kernel/linux/linux-raspberrypi_3.11.0.bb deleted +0 -4
deleted file mode 100644
index b197289..0000000
@@ -1,4 +0,0 @@
-SRCREV = "d7474694bdc9836af17f4b4d839509f9aad7ffa7"
-SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.11.y"
-
-require linux-raspberrypi.inc
recipes-kernel/linux/linux-raspberrypi_3.11.7.bb new file +4 -0
new file mode 100644
index 0000000..aa32829
@@ -0,0 +1,4 @@
+SRCREV = "b975d0aab6816dd1dc4ff938a0c95bc551831163"
+SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.11.y"
+
+require linux-raspberrypi.inc
recipes-kernel/linux/linux-raspberrypi_3.6.11.bb +1 -1
index 5f173f9..b73ee03 100644
@@ -1,4 +1,4 @@
-SRCREV = "cbd6672e7e1b2dc5026f5dc7929a13a9a68f2a62"
+SRCREV = "10bc58289a7ebf6b1ab724636e0a16116278e339"
 SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.6.y"
 
 require linux-raspberrypi.inc
Signature · 1 line
1.8.1.4
#2 lore raw

PATCH 3/6 linux-raspberrypi: Add version 3.10.18 and 3.12

In reply to Andrei Gherzan
Change-Id Idd59fed4f2ab975c50b3727e436b4a0caeb0ab16
---
 recipes-kernel/linux/linux-raspberrypi_3.10.18.bb | 4 ++++
 recipes-kernel/linux/linux-raspberrypi_3.12.bb    | 4 ++++
 2 files changed, 8 insertions(+)
 create mode 100644 recipes-kernel/linux/linux-raspberrypi_3.10.18.bb
 create mode 100644 recipes-kernel/linux/linux-raspberrypi_3.12.bb
recipes-kernel/linux/linux-raspberrypi_3.10.18.bb new file +4 -0
new file mode 100644
index 0000000..399a978
@@ -0,0 +1,4 @@
+SRCREV = "ae937f99fee8a37f2ddd7270f6bcc0e497e8c903"
+SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.10.y"
+
+require linux-raspberrypi.inc
recipes-kernel/linux/linux-raspberrypi_3.12.bb new file +4 -0
new file mode 100644
index 0000000..25877fe
@@ -0,0 +1,4 @@
+SRCREV = "839f349b6ed2a63a2bff0b5f0d718a7b07ca2316"
+SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.12.y"
+
+require linux-raspberrypi.inc
Signature · 1 line
1.8.1.4
#3 lore raw

Re: [meta-raspberrypi][PATCH 3/6] linux-raspberrypi: Add version 3.10.18 and 3.12

Am 13.11.2013 16:47, schrieb Andrei Gherzan:

Quoted 8 lines
Change-Id Idd59fed4f2ab975c50b3727e436b4a0caeb0ab16
---
  recipes-kernel/linux/linux-raspberrypi_3.10.18.bb | 4 ++++
  recipes-kernel/linux/linux-raspberrypi_3.12.bb    | 4 ++++
  2 files changed, 8 insertions(+)

create mode 100644 recipes-kernel/linux/linux-raspberrypi_3.10.18.bb create mode 100644 recipes-kernel/linux/linux-raspberrypi_3.12.bb

                                                           ^^^^^^^^^^^^^

Make this 3.12.0 or whatever it is?

Quoted 22 lines
recipes-kernel/linux/linux-raspberrypi_3.10.18.bb new file +4 -0
new file mode 100644
index 0000000..399a978
@@ -0,0 +1,4 @@
+SRCREV = "ae937f99fee8a37f2ddd7270f6bcc0e497e8c903"
+SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.10.y"
+
+require linux-raspberrypi.inc
recipes-kernel/linux/linux-raspberrypi_3.12.bb new file +4 -0
new file mode 100644
index 0000000..25877fe
@@ -0,0 +1,4 @@
+SRCREV = "839f349b6ed2a63a2bff0b5f0d718a7b07ca2316"
+SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.12.y"
+
+require linux-raspberrypi.inc
#4 lore raw

PATCH 4/6 rpi-default-providers: Use 3.10.X as default kernel

In reply to Andrei Gherzan

This is the default/base branch on official github repository:
https://github.com/raspberrypi/linux/branches

Change-Id I99702ae7548b49a5b4b575b3f02f5a3a48ad347f
---
 conf/machine/include/rpi-default-providers.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
conf/machine/include/rpi-default-providers.inc +1 -1
index 1a647c9..ffdb4f9 100644
@@ -2,7 +2,7 @@
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-raspberrypi"
 # The default kernel version is the same as used by Raspbian
-PREFERRED_VERSION_linux-raspberrypi ?= "3.6.%"
+PREFERRED_VERSION_linux-raspberrypi ?= "3.10.%"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 PREFERRED_PROVIDER_virtual/egl ?= "userland"
Signature · 1 line
1.8.1.4
#5 lore raw

PATCH 5/6 firmware.inc: Update to HEAD on 2013-11-13

In reply to Andrei Gherzan
Change-Id I00ace3f8575015612ae09dfb99e2a33d87ddc4cb
---
 recipes-bcm/common/firmware.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
recipes-bcm/common/firmware.inc +2 -2
index 5bad182..c780e63 100644
@@ -1,6 +1,6 @@
 # 19/08/2013 firmware; this can be overridden from distro config
-RPIFW_SRCREV ?= "5b37b2a7f357236210eef1a438becaa2a57148f2"
-RPIFW_DATE ?= "20130819"
+RPIFW_SRCREV ?= "3e92add424c3c2617d5df65caa307c808017a9ea"
+RPIFW_DATE ?= "20131113"
 RPIFW_SRC_URI ?= "git://github.com/raspberrypi/firmware.git;protocol=git;branch=master"
 RPIFW_S ?= "${WORKDIR}/git"
 
Signature · 1 line
1.8.1.4
#6 lore raw

PATCH 6/6 userland: Update to HEAD on 2013-11-13

In reply to Andrei Gherzan
Change-Id Ic618f8bc5365b9f787a230a2a3e0ccb92c17738a
---
 recipes-graphics/userland/userland_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
recipes-graphics/userland/userland_git.bb +2 -2
index c7ea522..18c74fa 100644
@@ -5,13 +5,13 @@ vcos, openmaxil, vchiq_arm, bcm_host, WFC, OpenVG."
 LICENSE = "Broadcom"
 LIC_FILES_CHKSUM = "file://LICENCE;md5=957f6640d5e2d2acfce73a36a56cb32f"
 
-PR = "r2"
+PR = "r3"
 
 PROVIDES = "virtual/libgles2 \
             virtual/egl"
 COMPATIBLE_MACHINE = "raspberrypi"
 
-SRCREV = "23baee63495aa685e7693467b7a5469ff5ca4481"
+SRCREV = "628498eb6cf501554c98a5e6c7ea3855574fa43e"
 SRC_URI = "git://github.com/raspberrypi/userland.git;protocol=git;branch=master \
           "
 S = "${WORKDIR}/git"
Signature · 1 line
1.8.1.4
#7 lore raw
In reply to Andrei Gherzan

Am 13.11.2013 16:47, schrieb Andrei Gherzan:

Quoted 2 lines

In order to avoid duplicated code, move sl030raspberrypii2ckernel.patch in linux-raspberrypi.inc.

I'm not convinced this is a good idea. Maybe it's the case for this patch, but most patches probably don't apply for all kernel versions the same. Hopefully this patch goes upstream at some point (what's the status of that anyway), and then it's not needed any more.

Philipp

Quoted 73 lines
Change-Id I8c3e7a70224672a8def6518baecd4ef86bbb15c4
---
  recipes-kernel/linux/linux-raspberrypi.inc       | 2 ++
  recipes-kernel/linux/linux-raspberrypi_3.11.0.bb | 4 +---
  recipes-kernel/linux/linux-raspberrypi_3.2.27.bb | 4 +---
  recipes-kernel/linux/linux-raspberrypi_3.6.11.bb | 4 +---
  recipes-kernel/linux/linux-raspberrypi_3.8.13.bb | 4 +---
  5 files changed, 6 insertions(+), 12 deletions(-)
recipes-kernel/linux/linux-raspberrypi.inc +2 -0
index e756b57..3397bcb 100644
@@ -11,6 +11,8 @@ PV_append = "+git${SRCREV}"
 
  S = "${WORKDIR}/git"
 
+SRC_URI += "file://sl030raspberrypii2ckernel.patch"
+
  # NOTE: For now we pull in the default config from the RPi kernel GIT tree.
  KERNEL_DEFCONFIG = "bcmrpi_defconfig"
 
recipes-kernel/linux/linux-raspberrypi_3.11.0.bb +1 -3
index 1ae39b2..b197289 100644
@@ -1,6 +1,4 @@
  SRCREV = "d7474694bdc9836af17f4b4d839509f9aad7ffa7"
-SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.11.y \
-           file://sl030raspberrypii2ckernel.patch \
-          "
+SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.11.y"
 
  require linux-raspberrypi.inc
recipes-kernel/linux/linux-raspberrypi_3.2.27.bb +1 -3
index cc4ee38..7c593a8 100644
@@ -1,6 +1,4 @@
  SRCREV = "ada8b4415ff44d535d63e4291a0eca733bc2ad0f"
-SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.2.27 \
-           file://sl030raspberrypii2ckernel.patch \
-          "
+SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.2.27"
 
  require linux-raspberrypi.inc
recipes-kernel/linux/linux-raspberrypi_3.6.11.bb +1 -3
index 5314f5d..5f173f9 100644
@@ -1,6 +1,4 @@
  SRCREV = "cbd6672e7e1b2dc5026f5dc7929a13a9a68f2a62"
-SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.6.y \
-           file://sl030raspberrypii2ckernel.patch \
-          "
+SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.6.y"
 
  require linux-raspberrypi.inc
recipes-kernel/linux/linux-raspberrypi_3.8.13.bb +1 -3
index dc8cf0a..613c172 100644
@@ -1,6 +1,4 @@
  SRCREV = "d996a1b91b2bf3dc06f4f4f822a56f4496457aa1"
-SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.8.y \
-           file://sl030raspberrypii2ckernel.patch \
-          "
+SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.8.y"
 
  require linux-raspberrypi.inc
#8 lore raw
Quoted 6 lines · Philipp Wagner

Am 13.11.2013 16:47, schrieb Andrei Gherzan:

Quoted 2 lines

In order to avoid duplicated code, move sl030raspberrypii2ckernel.patch in linux-raspberrypi.inc.

I'm not convinced this is a good idea. Maybe it's the case for this patch, but most patches probably don't apply for all kernel versions the same. Hopefully this patch goes upstream at some point (what's the status of that anyway), and then it's not needed any more.

I agree - putting patches in .inc is probably going to just cause problems later on.

Quoted 77 lines
Quoted 66 lines
Change-Id I8c3e7a70224672a8def6518baecd4ef86bbb15c4
---
  recipes-kernel/linux/linux-raspberrypi.inc       | 2 ++
  recipes-kernel/linux/linux-raspberrypi_3.11.0.bb | 4 +---
  recipes-kernel/linux/linux-raspberrypi_3.2.27.bb | 4 +---
  recipes-kernel/linux/linux-raspberrypi_3.6.11.bb | 4 +---
  recipes-kernel/linux/linux-raspberrypi_3.8.13.bb | 4 +---
  5 files changed, 6 insertions(+), 12 deletions(-)
recipes-kernel/linux/linux-raspberrypi.inc +2 -0
index e756b57..3397bcb 100644
@@ -11,6 +11,8 @@ PV_append = "+git${SRCREV}"
 
  S = "${WORKDIR}/git"
 
+SRC_URI += "file://sl030raspberrypii2ckernel.patch"
+
  # NOTE: For now we pull in the default config from the RPi kernel GIT tree.
  KERNEL_DEFCONFIG = "bcmrpi_defconfig"
 
recipes-kernel/linux/linux-raspberrypi_3.11.0.bb +1 -3
index 1ae39b2..b197289 100644
@@ -1,6 +1,4 @@
  SRCREV = "d7474694bdc9836af17f4b4d839509f9aad7ffa7"
-SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.11.y \
-           file://sl030raspberrypii2ckernel.patch \
-          "
+SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.11.y"
 
  require linux-raspberrypi.inc
recipes-kernel/linux/linux-raspberrypi_3.2.27.bb +1 -3
index cc4ee38..7c593a8 100644
@@ -1,6 +1,4 @@
  SRCREV = "ada8b4415ff44d535d63e4291a0eca733bc2ad0f"
-SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.2.27 \
-           file://sl030raspberrypii2ckernel.patch \
-          "
+SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.2.27"
 
  require linux-raspberrypi.inc
recipes-kernel/linux/linux-raspberrypi_3.6.11.bb +1 -3
index 5314f5d..5f173f9 100644
@@ -1,6 +1,4 @@
  SRCREV = "cbd6672e7e1b2dc5026f5dc7929a13a9a68f2a62"
-SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.6.y \
-           file://sl030raspberrypii2ckernel.patch \
-          "
+SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.6.y"
 
  require linux-raspberrypi.inc
recipes-kernel/linux/linux-raspberrypi_3.8.13.bb +0 -0
index dc8cf0a..613c172 100644

recipes-kernel/linux/linux-raspberrypi_3.8.13.bb line 4

Quoted 7 lines
recipes-kernel/linux/linux-raspberrypi_3.8.13.bb +1 -3
@@ -1,6 +1,4 @@
  SRCREV = "d996a1b91b2bf3dc06f4f4f822a56f4496457aa1"
-SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.8.y \
-           file://sl030raspberrypii2ckernel.patch \
-          "
+SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.8.y"
 
  require linux-raspberrypi.inc

_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto

Signature · 4 lines
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------