[STABLE][PATCH] omap3sgx-modules: sync with .dev * update to build against newer kernels * switch to MACHINE_KERNEL_PR

[STABLE][PATCH] omap3sgx-modules: sync with .dev * update to build against newer kernels * switch to MACHINE_KERNEL_PR

[Koen Kooi]

From: Koen Kooi <koen@openembedded.org>

Signed-off-by: Koen Kooi <koen@openembedded.org>
---
 .../omap3-sgx-modules_1.3.13.1397.bb               |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/recipes/powervr-drivers/omap3-sgx-modules_1.3.13.1397.bb b/recipes/powervr-drivers/omap3-sgx-modules_1.3.13.1397.bb
index 985a0c0..3f9a3cd 100644
--- a/recipes/powervr-drivers/omap3-sgx-modules_1.3.13.1397.bb
+++ b/recipes/powervr-drivers/omap3-sgx-modules_1.3.13.1397.bb
@@ -1,8 +1,6 @@
 DESCRIPTION = "Kernel drivers for the PowerVR SGX chipset found in the omap3 SoCs"
 LICENSE = "GPLv2"
 
-PR = "r6"
-
 inherit module
 
 SRC_URI = "http://dominion.thruhere.net/koen/OE/omap3-sgx-modules-${PV}.tar.bz2 \
@@ -16,7 +14,10 @@ PVRBUILD = "release"
 MAKE_TARGETS = " BUILD=${PVRBUILD}"
 
 do_compile_prepend() {
-	find ${S} -name "*.*o" | xargs rm
+	find ${S} -name "*.*o" | xargs rm || true
+	if [ $(echo ${KERNEL_VERSION} | cut -c5,6) -gt 28 ] ; then
+		sed -i -e 's:omap_dispc_unregister_isr(OMAPLFBVSyncISR):omap_dispc_unregister_isr(OMAPLFBVSyncISR, psSwapChain, DISPC_IRQ_VSYNC):g' services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c
+	fi
 }
 
 do_install() {
-- 
1.6.1

Re: [STABLE][PATCH] omap3sgx-modules: sync with .dev * update to build against newer kernels * switch to MACHINE_KERNEL_PR

[Philip Balister]

[-- Attachment #1: Type: text/plain, Size: 1403 bytes --]

Acked-by: Philip Balister <philip@balister.org>

Needed for linux-omap sync patch to build :)

Koen Kooi wrote:
> From: Koen Kooi <koen@openembedded.org>
> 
> Signed-off-by: Koen Kooi <koen@openembedded.org>
> ---
>  .../omap3-sgx-modules_1.3.13.1397.bb               |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/recipes/powervr-drivers/omap3-sgx-modules_1.3.13.1397.bb b/recipes/powervr-drivers/omap3-sgx-modules_1.3.13.1397.bb
> index 985a0c0..3f9a3cd 100644
> --- a/recipes/powervr-drivers/omap3-sgx-modules_1.3.13.1397.bb
> +++ b/recipes/powervr-drivers/omap3-sgx-modules_1.3.13.1397.bb
> @@ -1,8 +1,6 @@
>  DESCRIPTION = "Kernel drivers for the PowerVR SGX chipset found in the omap3 SoCs"
>  LICENSE = "GPLv2"
>  
> -PR = "r6"
> -
>  inherit module
>  
>  SRC_URI = "http://dominion.thruhere.net/koen/OE/omap3-sgx-modules-${PV}.tar.bz2 \
> @@ -16,7 +14,10 @@ PVRBUILD = "release"
>  MAKE_TARGETS = " BUILD=${PVRBUILD}"
>  
>  do_compile_prepend() {
> -	find ${S} -name "*.*o" | xargs rm
> +	find ${S} -name "*.*o" | xargs rm || true
> +	if [ $(echo ${KERNEL_VERSION} | cut -c5,6) -gt 28 ] ; then
> +		sed -i -e 's:omap_dispc_unregister_isr(OMAPLFBVSyncISR):omap_dispc_unregister_isr(OMAPLFBVSyncISR, psSwapChain, DISPC_IRQ_VSYNC):g' services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c
> +	fi
>  }
>  
>  do_install() {

[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/x-pkcs7-signature, Size: 3303 bytes --]

Re: [STABLE][PATCH] omap3sgx-modules: sync with .dev * update to build against newer kernels * switch to MACHINE_KERNEL_PR

[Rolf Leggewie]

Koen Kooi wrote:
> -PR = "r6"

forgive my ignorance, but won't that make the PR go backwards?

Re: [STABLE][PATCH] omap3sgx-modules: sync with .dev * update to build against newer kernels * switch to MACHINE_KERNEL_PR

[Koen Kooi]

On 29-05-09 17:54, Rolf Leggewie wrote:
> Koen Kooi wrote:
>> -PR = "r6"
>
> forgive my ignorance, but won't that make the PR go backwards?

No, since module*.bbclass is using MACHINE_KERNEL_PR to keep the modules 
in sync with the kernel. So if you bump PR for the kernel, the modules 
will get rebuilt *and* have an increased PR so the package manager will 
pick it up as upgrade as well.

regards,

Koen