Skip to contentSkip to conversation

kernel upgrade and PRINC fix

PATCH Applied Martin Jansa 2 participants 4 messages Mar 28, 2012

lore
Share & tools
lore

Martin Jansa

author
#0 lore raw

cover kernel upgrade and PRINC fix

The following changes since commit 1a1d50a1bf39136a8c974022d63e0f119f23bbff:

keymaps: edit script to reuse 2.6 kernel keymaps (2012-03-25 23:51:03 +0100)

are available in the git repository at:
git://gitorious.org/shr/meta-handheld jansa/pull

Martin Jansa (2):
linux-3.2: upgrade to 3.2.12
formfactor, keymaps, udev: use better form of PRINC

 recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 recipes-bsp/keymaps/keymaps_1.0.bbappend       |    2 +-
 recipes-core/udev/udev_173.bbappend            |    2 +-
 recipes-kernel/linux/linux_3.2.bb              |    8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)
Signature · 1 line
1.7.8.5
author
#1 lore raw

PATCH 1/2 linux-3.2: upgrade to 3.2.12

Signed-off-by Martin Jansa <[email protected]>
---
 recipes-kernel/linux/linux_3.2.bb |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
recipes-kernel/linux/linux_3.2.bb +4 -4
index 199f36e..5379870 100644
@@ -1,10 +1,10 @@
 require linux.inc
 
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.4"
 COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz)"
 
 SRC_URI += "${KERNELORG_MIRROR}/linux/kernel/v3.x/linux-${PV}.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.9.bz2;apply=yes;name=stablepatch \
+           ${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.12.bz2;apply=yes;name=stablepatch \
            file://defconfig \
            file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 \
            "

@@ -21,5 +21,5 @@ SRC_URI_append_poodle = " \
 
 SRC_URI[kernel.md5sum] = "7ceb61f87c097fc17509844b71268935"
 SRC_URI[kernel.sha256sum] = "c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463"
-SRC_URI[stablepatch.md5sum] = "4610f3e62a5446422d1e81a90ab3cd06"
-SRC_URI[stablepatch.sha256sum] = "7836685dee161a4ffaf887b8e2f8dd3cb7712e690d0942fefb1db09bb6ad3871"
+SRC_URI[stablepatch.md5sum] = "377a6d731cd246aaa0c0f6a432b7aece"
+SRC_URI[stablepatch.sha256sum] = "c6991964901ef7797cca09ff9d1b4ed7abda27e2796ad55cad09a266eaaebb5d"
Signature · 1 line
1.7.8.5
author
#2 lore raw

PATCH 2/2 formfactor, keymaps, udev: use better form of PRINC

* this way we can stack multiple bbappends from different layers without overwritting PRINC value

Signed-off-by Martin Jansa <[email protected]>
---
 recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 recipes-bsp/keymaps/keymaps_1.0.bbappend       |    2 +-
 recipes-core/udev/udev_173.bbappend            |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -1
index 5152da5..e406684 100644
@@ -1,4 +1,4 @@
-PRINC = "1"
+PRINC := "${@int(PRINC) + 1}"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
recipes-bsp/keymaps/keymaps_1.0.bbappend +1 -1
index 039b30c..ca8e236 100644
@@ -1,4 +1,4 @@
-PRINC = "2"
+PRINC := "${@int(PRINC) + 2}"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
recipes-core/udev/udev_173.bbappend +1 -1
index 4770c5b..446ea84 100644
@@ -1,5 +1,5 @@
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC = "1"
+PRINC := "${@int(PRINC) + 1}"
Signature · 1 line
1.7.8.5
Applied
#3 lore raw
In reply to Martin Jansa
Quoted 12 lines · On Wednesday 28 March 2012 13:53:07 Martin Jansa wrote:

The following changes since commit 1a1d50a1bf39136a8c974022d63e0f119f23bbff:

keymaps: edit script to reuse 2.6 kernel keymaps (2012-03-25 23:51:03
+0100)

are available in the git repository at:
git://gitorious.org/shr/meta-handheld jansa/pull

Martin Jansa (2):
linux-3.2: upgrade to 3.2.12
formfactor, keymaps, udev: use better form of PRINC

Quoted 5 lines
 recipes-bsp/formfactor/formfactor_0.0.bbappend |    2 +-
 recipes-bsp/keymaps/keymaps_1.0.bbappend       |    2 +-
 recipes-core/udev/udev_173.bbappend            |    2 +-
 recipes-kernel/linux/linux_3.2.bb              |    8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

Merged to meta-handheld master, thanks.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre