[PATCH v2 5/6] Fix sysprof for powerpc64

[PATCH v2 5/6] Fix sysprof for powerpc64

[Matthew McClintock]

__ppc64__ is not defined on powerpc64, rather __powerpc64__ is, this
uses a patch that is already upstream to fix builds for powerpc64

Signed-off-by: Matthew McClintock <msm@freescale.com>
---
 ...PowerPC-checks-for-__NR_perf_counter_open.patch |   35 ++++++++++++++++++++
 meta/recipes-kernel/sysprof/sysprof_git.bb         |    1 +
 2 files changed, 36 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-kernel/sysprof/files/0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch

diff --git a/meta/recipes-kernel/sysprof/files/0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch b/meta/recipes-kernel/sysprof/files/0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch
new file mode 100644
index 0000000..041054e
--- /dev/null
+++ b/meta/recipes-kernel/sysprof/files/0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch
@@ -0,0 +1,35 @@
+Upstream-Status: Backport
+
+From 4708a509aa9d65ae93e9824e42ddbc6e8d42d90c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel@daenzer.net>
+Date: Sat, 27 Aug 2011 20:04:44 +0200
+Subject: [PATCH] Fix PowerPC checks for __NR_perf_counter_open.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+__ppc__ isn't defined here on Debian powerpc. Grepping through the headers
+installed in /usr/include, there are a few references to __ppc__ and
+__ppc64__, but I suspect they're for other OSs.
+
+Signed-off-by: Michel Dänzer <michel@daenzer.net>
+---
+ collector.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/collector.c b/collector.c
+index b28964f..fe16967 100644
+--- a/collector.c
++++ b/collector.c
+@@ -175,7 +175,7 @@ sysprof_perf_counter_open (struct perf_counter_attr *attr,
+ #define __NR_perf_counter_open 337
+ #elif defined(__hppa__)
+ #define __NR_perf_counter_open 318
+-#elif defined(__ppc__) || defined(__ppc64__)
++#elif defined(__powerpc__) || defined(__powerpc64__)
+ #define __NR_perf_counter_open 319
+ #elif defined(__s390__)
+ #define __NR_perf_counter_open 331
+-- 
+1.7.6.1
+
diff --git a/meta/recipes-kernel/sysprof/sysprof_git.bb b/meta/recipes-kernel/sysprof/sysprof_git.bb
index 10bde04..c553263 100644
--- a/meta/recipes-kernel/sysprof/sysprof_git.bb
+++ b/meta/recipes-kernel/sysprof/sysprof_git.bb
@@ -10,6 +10,7 @@ PV = "1.1.8+git${SRCPV}"
 
 SRC_URI = "git://git.gnome.org/sysprof;protocol=git \
            file://define-NT_GNU_BUILD_ID.patch \
+	   file://0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch \
           "
 
 SRC_URI_append_arm  = " file://rmb-arm.patch"
-- 
1.7.6.1

Re: [PATCH v2 5/6] Fix sysprof for powerpc64

[Khem Raj]

On Wed, Oct 5, 2011 at 12:02 PM, Matthew McClintock <msm@freescale.com> wrote:
> __ppc64__ is not defined on powerpc64, rather __powerpc64__ is, this
> uses a patch that is already upstream to fix builds for powerpc64
>
> Signed-off-by: Matthew McClintock <msm@freescale.com>
> ---
>  ...PowerPC-checks-for-__NR_perf_counter_open.patch |   35 ++++++++++++++++++++
>  meta/recipes-kernel/sysprof/sysprof_git.bb         |    1 +
>  2 files changed, 36 insertions(+), 0 deletions(-)
>  create mode 100644 meta/recipes-kernel/sysprof/files/0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch
>
> diff --git a/meta/recipes-kernel/sysprof/files/0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch b/meta/recipes-kernel/sysprof/files/0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch
> new file mode 100644
> index 0000000..041054e
> --- /dev/null
> +++ b/meta/recipes-kernel/sysprof/files/0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch
> @@ -0,0 +1,35 @@
> +Upstream-Status: Backport
> +
> +From 4708a509aa9d65ae93e9824e42ddbc6e8d42d90c Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel@daenzer.net>
> +Date: Sat, 27 Aug 2011 20:04:44 +0200
> +Subject: [PATCH] Fix PowerPC checks for __NR_perf_counter_open.
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +__ppc__ isn't defined here on Debian powerpc. Grepping through the headers
> +installed in /usr/include, there are a few references to __ppc__ and
> +__ppc64__, but I suspect they're for other OSs.
> +

is sysprof linux specific? if not then this change will mean that it wont work
on other OSes which dont define __powerpc64__ e.g. darwin. Better solution is to
check for both __ppc64__ and __powerpc64__

but thats something for sysprof upstream to consider. For OE this
patch is sufficient

> +Signed-off-by: Michel Dänzer <michel@daenzer.net>
> +---
> + collector.c |    2 +-
> + 1 files changed, 1 insertions(+), 1 deletions(-)
> +
> +diff --git a/collector.c b/collector.c
> +index b28964f..fe16967 100644
> +--- a/collector.c
> ++++ b/collector.c
> +@@ -175,7 +175,7 @@ sysprof_perf_counter_open (struct perf_counter_attr *attr,
> + #define __NR_perf_counter_open 337
> + #elif defined(__hppa__)
> + #define __NR_perf_counter_open 318
> +-#elif defined(__ppc__) || defined(__ppc64__)
> ++#elif defined(__powerpc__) || defined(__powerpc64__)
> + #define __NR_perf_counter_open 319
> + #elif defined(__s390__)
> + #define __NR_perf_counter_open 331
> +--
> +1.7.6.1
> +
> diff --git a/meta/recipes-kernel/sysprof/sysprof_git.bb b/meta/recipes-kernel/sysprof/sysprof_git.bb
> index 10bde04..c553263 100644
> --- a/meta/recipes-kernel/sysprof/sysprof_git.bb
> +++ b/meta/recipes-kernel/sysprof/sysprof_git.bb
> @@ -10,6 +10,7 @@ PV = "1.1.8+git${SRCPV}"
>
>  SRC_URI = "git://git.gnome.org/sysprof;protocol=git \
>            file://define-NT_GNU_BUILD_ID.patch \
> +          file://0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch \
>           "
>
>  SRC_URI_append_arm  = " file://rmb-arm.patch"
> --
> 1.7.6.1
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Re: [PATCH v2 5/6] Fix sysprof for powerpc64

[McClintock Matthew-B29882]

On Wed, Oct 5, 2011 at 2:12 PM, Khem Raj <raj.khem@gmail.com> wrote:
> is sysprof linux specific? if not then this change will mean that it wont work
> on other OSes which dont define __powerpc64__ e.g. darwin. Better solution is to
> check for both __ppc64__ and __powerpc64__
>
> but thats something for sysprof upstream to consider. For OE this
> patch is sufficient

They will address this issue if they hit it, as this patch is in
upstream already...

-Matthew

[PATCH v2 1/6] Fix mdadm for powerpc64

[Matthew McClintock]

This takes an upstream fix for compiling on powerpc64

Signed-off-by: Matthew McClintock <msm@freescale.com>
---
 meta/recipes-extended/mdadm/mdadm_3.2.2.bb |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/mdadm/mdadm_3.2.2.bb b/meta/recipes-extended/mdadm/mdadm_3.2.2.bb
index 5d29ae7..492cc8e 100644
--- a/meta/recipes-extended/mdadm/mdadm_3.2.2.bb
+++ b/meta/recipes-extended/mdadm/mdadm_3.2.2.bb
@@ -8,9 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
                     file://mdmon.c;beginline=4;endline=18;md5=af7d8444d9c4d3e5c7caac0d9d34039d \
                     file://mdadm.h;beglinlne=4;endline=22;md5=462bc9936ac0d3da110191a3f9994161"
 
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2"
+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2 \
+	    file://0001-mdadm-fix-build-failures-ppc64.patch \
+	  "
 
 SRC_URI[md5sum] = "12ee2fbf3beddb60601fb7a4c4905651"
 SRC_URI[sha256sum] = "0d1a04e688b082bc88846e3f524abd50bc782b6ffc06123140f7d358c8f9b906"
-- 
1.7.6.1

[PATCH v2 5/6] Fix sysprof for powerpc64

[Matthew McClintock]

__ppc64__ is not defined on powerpc64, rather __powerpc64__ is, this
uses a patch that is already upstream to fix builds for powerpc64

Signed-off-by: Matthew McClintock <msm@freescale.com>
---
 ...PowerPC-checks-for-__NR_perf_counter_open.patch |   35 ++++++++++++++++++++
 meta/recipes-kernel/sysprof/sysprof_git.bb         |    1 +
 2 files changed, 36 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-kernel/sysprof/files/0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch

diff --git a/meta/recipes-kernel/sysprof/files/0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch b/meta/recipes-kernel/sysprof/files/0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch
new file mode 100644
index 0000000..041054e
--- /dev/null
+++ b/meta/recipes-kernel/sysprof/files/0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch
@@ -0,0 +1,35 @@
+Upstream-Status: Backport
+
+From 4708a509aa9d65ae93e9824e42ddbc6e8d42d90c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel@daenzer.net>
+Date: Sat, 27 Aug 2011 20:04:44 +0200
+Subject: [PATCH] Fix PowerPC checks for __NR_perf_counter_open.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+__ppc__ isn't defined here on Debian powerpc. Grepping through the headers
+installed in /usr/include, there are a few references to __ppc__ and
+__ppc64__, but I suspect they're for other OSs.
+
+Signed-off-by: Michel Dänzer <michel@daenzer.net>
+---
+ collector.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/collector.c b/collector.c
+index b28964f..fe16967 100644
+--- a/collector.c
++++ b/collector.c
+@@ -175,7 +175,7 @@ sysprof_perf_counter_open (struct perf_counter_attr *attr,
+ #define __NR_perf_counter_open 337
+ #elif defined(__hppa__)
+ #define __NR_perf_counter_open 318
+-#elif defined(__ppc__) || defined(__ppc64__)
++#elif defined(__powerpc__) || defined(__powerpc64__)
+ #define __NR_perf_counter_open 319
+ #elif defined(__s390__)
+ #define __NR_perf_counter_open 331
+-- 
+1.7.6.1
+
diff --git a/meta/recipes-kernel/sysprof/sysprof_git.bb b/meta/recipes-kernel/sysprof/sysprof_git.bb
index 10bde04..c553263 100644
--- a/meta/recipes-kernel/sysprof/sysprof_git.bb
+++ b/meta/recipes-kernel/sysprof/sysprof_git.bb
@@ -10,6 +10,7 @@ PV = "1.1.8+git${SRCPV}"
 
 SRC_URI = "git://git.gnome.org/sysprof;protocol=git \
            file://define-NT_GNU_BUILD_ID.patch \
+	   file://0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch \
           "
 
 SRC_URI_append_arm  = " file://rmb-arm.patch"
-- 
1.7.6.1

Re: [PATCH v2 1/6] Fix mdadm for powerpc64

[Khem Raj]

On 10/5/2011 2:26 PM, Matthew McClintock wrote:
> This takes an upstream fix for compiling on powerpc64

where is the patch ? Did you forget git add
>
> Signed-off-by: Matthew McClintock<msm@freescale.com>
> ---
>   meta/recipes-extended/mdadm/mdadm_3.2.2.bb |    6 ++++--
>   1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-extended/mdadm/mdadm_3.2.2.bb b/meta/recipes-extended/mdadm/mdadm_3.2.2.bb
> index 5d29ae7..492cc8e 100644
> --- a/meta/recipes-extended/mdadm/mdadm_3.2.2.bb
> +++ b/meta/recipes-extended/mdadm/mdadm_3.2.2.bb
> @@ -8,9 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
>                       file://mdmon.c;beginline=4;endline=18;md5=af7d8444d9c4d3e5c7caac0d9d34039d \
>                       file://mdadm.h;beglinlne=4;endline=22;md5=462bc9936ac0d3da110191a3f9994161"
>
> -PR = "r0"
> +PR = "r1"
>
> -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2"
> +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2 \
> +	    file://0001-mdadm-fix-build-failures-ppc64.patch \
> +	  "
>
>   SRC_URI[md5sum] = "12ee2fbf3beddb60601fb7a4c4905651"
>   SRC_URI[sha256sum] = "0d1a04e688b082bc88846e3f524abd50bc782b6ffc06123140f7d358c8f9b906"

Re: [PATCH v2 1/6] Fix mdadm for powerpc64

[McClintock Matthew-B29882]

On Wed, Oct 5, 2011 at 5:05 PM, Khem Raj <raj.khem@gmail.com> wrote:
> On 10/5/2011 2:26 PM, Matthew McClintock wrote:
>>
>> This takes an upstream fix for compiling on powerpc64
>
> where is the patch ? Did you forget git add

Ugh yes, resent.

-M

Re: [PATCH v2 5/6] Fix sysprof for powerpc64

[Richard Purdie]

On Wed, 2011-10-05 at 16:26 -0500, Matthew McClintock wrote:
> __ppc64__ is not defined on powerpc64, rather __powerpc64__ is, this
> uses a patch that is already upstream to fix builds for powerpc64
> 
> Signed-off-by: Matthew McClintock <msm@freescale.com>
> ---
>  ...PowerPC-checks-for-__NR_perf_counter_open.patch |   35 ++++++++++++++++++++
>  meta/recipes-kernel/sysprof/sysprof_git.bb         |    1 +
>  2 files changed, 36 insertions(+), 0 deletions(-)
>  create mode 100644 meta/recipes-kernel/sysprof/files/0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch

Merged to master, thanks.

Richard

Re: [PATCH v2 5/6] Fix sysprof for powerpc64

[Richard Purdie]

On Wed, 2011-10-05 at 16:26 -0500, Matthew McClintock wrote:
> __ppc64__ is not defined on powerpc64, rather __powerpc64__ is, this
> uses a patch that is already upstream to fix builds for powerpc64
> 
> Signed-off-by: Matthew McClintock <msm@freescale.com>
> ---
>  ...PowerPC-checks-for-__NR_perf_counter_open.patch |   35 ++++++++++++++++++++
>  meta/recipes-kernel/sysprof/sysprof_git.bb         |    1 +
>  2 files changed, 36 insertions(+), 0 deletions(-)
>  create mode 100644 meta/recipes-kernel/sysprof/files/0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch

Merged to master, thanks.

Richard