Minor fixes

PATCH Applied Joshua Lock 3 participants 7 messages Jan 4, 2012

lore

Share & tools

lore

Joshua Lock

author

2012-01-04 01:38 UTC #0 lore raw

cover Minor fixes

A couple of small patches created in the course of putting together a point release for Yocto 1.1.

Cheers,
Joshua

The following changes since commit de679a3036ebef1c7d7b8ee23f05590c95e498d9:

pseudo: ensure libs are included in package (2012-01-03 12:10:59 +0000)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib josh/stuff
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=josh/stuff

Joshua Lock (2):
linux-tools: add binutils to perf DEPENDS
cogl: ensure we can build on armv4

 .../clutter/cogl/build_for_armv4t.patch            |   23 ++++++++++++++++++++
 meta/recipes-graphics/clutter/cogl_1.8.2.bb        |    5 +++-
 meta/recipes-graphics/clutter/cogl_git.bb          |    5 ++-
 meta/recipes-kernel/linux/linux-tools.inc          |    2 +-
 4 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch

Signature · 1 line

1.7.7.5

Joshua Lock

author

2012-01-04 01:38 UTC #1 lore raw

PATCH 1/2 linux-tools: add binutils to perf DEPENDS

We have witnessed non-deterministic failures of perf for some platforms whilst looking for bfd.h, a header provided by binutils.

Signed-off-by Joshua Lock <[email protected]>

---
 meta/recipes-kernel/linux/linux-tools.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meta/recipes-kernel/linux/linux-tools.inc +1 -1

index 950f197..aa45dba 100644
@@ -22,7 +22,7 @@ addtask install_perf after do_install before do_package
 do_compile_perf[umask] = 022
 do_install_perf[umask] = 022
 
-PERFDEPENDS = "virtual/${MLPREFIX}libc:do_populate_sysroot ${MLPREFIX}elfutils:do_populate_sysroot"
+PERFDEPENDS = "virtual/${MLPREFIX}libc:do_populate_sysroot ${MLPREFIX}elfutils:do_populate_sysroot ${MLPREFIX}binutils:do_populate_sysroot"
 PERFDEPENDS_libc-uclibc = ""
 PERFRDEPENDS = "python perl elfutils"
 PERFRDEPENDS_libc-uclibc = ""

Signature · 1 line

1.7.7.5

Joshua Lock

author

2012-01-04 01:38 UTC #5 lore raw

PATCH 2/2 cogl: ensure we can build on armv4

In reply to Joshua Lock

Without this patch cogl will not build for armv4 as it uses an unsupported instruction. This changeset adds a patch from Wolfgang Denk to add an extra guard around armv5 or above code.

Signed-off-by Joshua Lock <[email protected]>

---
 .../clutter/cogl/build_for_armv4t.patch            |   23 ++++++++++++++++++++
 meta/recipes-graphics/clutter/cogl_1.8.2.bb        |    5 +++-
 meta/recipes-graphics/clutter/cogl_git.bb          |    5 ++-
 3 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch

meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch new file +23 -0

new file mode 100644
index 0000000..3635085
@@ -0,0 +1,23 @@
+GCC will define __ARM_ARCH_4T__ when building with "-march=armv4t" so we can
+check this to turn off the use of 'clz' instructions, which otherwise would
+cause compile errors like "selected processor does not support ARM mode 
+`clz r3,r0'". 
+
+Upstream-Status: Submitted
+
+Signed-off-by: Wolfgang Denk <[email protected]>
+Signed-off-by: Joshua Lock <[email protected]>
+
+Index: cogl-1.8.2/cogl/cogl-fixed.c
+===================================================================
+--- cogl-1.8.2.orig/cogl/cogl-fixed.c
++++ cogl-1.8.2/cogl/cogl-fixed.c
+@@ -626,7 +626,7 @@ cogl_fixed_sqrt (CoglFixed x)
+ 	/*
+ 	 * Find the highest bit set
+ 	 */
+-#if defined (__arm__)
++#if defined (__arm__) && !defined(__ARM_ARCH_4T__)
+ 	/* This actually requires at least arm v5, but gcc does not seem
+ 	 * to set the architecture defines correctly, and it is I think
+ 	 * very unlikely that anyone will want to use clutter on anything

meta/recipes-graphics/clutter/cogl_1.8.2.bb +4 -1

index d99c443..25875f3 100644
@@ -1,9 +1,12 @@
 require cogl.inc
 
+PR = "r1"
+
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
 SRC_URI = "http://source.clutter-project.org/sources/cogl/1.8/${BPN}-${PV}.tar.bz2 \
-	   file://macro-versions.patch"
+	   file://macro-versions.patch \
+	   file://build_for_armv4t.patch"
 
 SRC_URI[md5sum] = "3145cbf7ff162c33065ea4421c047e2f"
 SRC_URI[sha256sum] = "8b647b51a4fa93034fcd74ffe86b3d4c919b0e54789108f6d065414e6162ab73"

meta/recipes-graphics/clutter/cogl_git.bb +3 -2

index 7a10dd8..689b965 100644
@@ -5,11 +5,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 # the 1.8.2 tag
 SRCREV = "e398e374e2ff0e88bc1d63577a192f8ca04a1cb5"
 PV = "1.8.2+git${SRCPV}"
-PR = "r0"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
-SRC_URI = "git://git.gnome.org/cogl;protocol=git;branch=master"
+SRC_URI = "git://git.gnome.org/cogl;protocol=git;branch=master \
+	   file://build_for_armv4t.patch"
 S = "${WORKDIR}/git"
 
 AUTOTOOLS_AUXDIR = "${S}/build"

Signature · 1 line

1.7.7.5

Richard Purdie

Applied

2012-01-04 11:33 UTC #6 lore raw

In reply to Joshua Lock

Quoted 10 lines · Joshua Lock

A couple of small patches created in the course of putting together a point release for Yocto 1.1.
Cheers,
Joshua
The following changes since commit de679a3036ebef1c7d7b8ee23f05590c95e498d9:
pseudo: ensure libs are included in package (2012-01-03 12:10:59 +0000)

Quoted 7 lines

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib josh/stuff
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=josh/stuff
Joshua Lock (2):
linux-tools: add binutils to perf DEPENDS
cogl: ensure we can build on armv4

Merged to master, thanks.

Richard

McClintock Matthew-B29882

2012-01-04 16:40 UTC #2 lore raw

Re: [PATCH 1/2] linux-tools: add binutils to perf DEPENDS

In reply to Joshua Lock

Quoted 16 lines · Joshua Lock

We have witnessed non-deterministic failures of perf for some platforms whilst looking for bfd.h, a header provided by binutils.
Signed-off-by Joshua Lock <[email protected]>
---
meta/recipes-kernel/linux/linux-tools.inc | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-kernel/linux/linux-tools.inc +0 -0
index 950f197..aa45dba 100644
@@ -22,7 +22,7 @@ addtask install_perf after do_install before do_package
do_compile_perf[umask] = 022
do_install_perf[umask] = 022

meta/recipes-kernel/linux/linux-tools.inc addtask install_perf after do_install before do_package · line 25

Quoted 2 lines

meta/recipes-kernel/linux/linux-tools.inc +1 -1

-PERFDEPENDS = "virtual/${MLPREFIX}libc:do_populate_sysroot ${MLPREFIX}elfutils:do_populate_sysroot"
+PERFDEPENDS = "virtual/${MLPREFIX}libc:do_populate_sysroot ${MLPREFIX}elfutils:do_populate_sysroot ${MLPREFIX}binutils:do_populate_sysroot"

Does this build the rpm for binutils too? I've seen the following error recently when creating the rfs:

| error: Failed dependencies:
| 	binutils >= 2.21.1a is needed by perf-3.0.6-r2.p3060qds
| 	libbfd-2.21.1.so is needed by perf-3.0.6-r2.p3060qds

-M

Richard Purdie

2012-01-04 17:29 UTC #3 lore raw

Re: [PATCH 1/2] linux-tools: add binutils to perf DEPENDS

Quoted 23 lines · On Wed, 2012-01-04 at 16:32 +0000, McClintock Matthew-B29882 wrote:

Quoted 13 lines · Joshua Lock
We have witnessed non-deterministic failures of perf for some platforms whilst looking for bfd.h, a header provided by binutils.
Signed-off-by Joshua Lock <[email protected]>
---
 meta/recipes-kernel/linux/linux-tools.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-kernel/linux/linux-tools.inc +0 -0
index 950f197..aa45dba 100644
meta/recipes-kernel/linux/linux-tools.inc addtask install_perf after do_install before do_package · line 25
Quoted 5 lines
meta/recipes-kernel/linux/linux-tools.inc +1 -1
@@ -22,7 +22,7 @@ addtask install_perf after do_install before do_package
 do_compile_perf[umask] = 022
 do_install_perf[umask] = 022
 
-PERFDEPENDS = "virtual/${MLPREFIX}libc:do_populate_sysroot ${MLPREFIX}elfutils:do_populate_sysroot"
+PERFDEPENDS = "virtual/${MLPREFIX}libc:do_populate_sysroot ${MLPREFIX}elfutils:do_populate_sysroot ${MLPREFIX}binutils:do_populate_sysroot"
Does this build the rpm for binutils too? I've seen the following error recently when creating the rfs:

Quoted 3 lines

| error: Failed dependencies:
| 	binutils >= 2.21.1a is needed by perf-3.0.6-r2.p3060qds
| 	libbfd-2.21.1.so is needed by perf-3.0.6-r2.p3060qds

I suspect the patch is not enough to fix this...

Cheers,

Richard

McClintock Matthew-B29882

2012-01-04 18:09 UTC #4 lore raw

Re: [PATCH 1/2] linux-tools: add binutils to perf DEPENDS

Quoted 24 lines · Richard Purdie

Quoted 23 lines · On Wed, 2012-01-04 at 16:32 +0000, McClintock Matthew-B29882 wrote:
Quoted 16 lines · Joshua Lock
We have witnessed non-deterministic failures of perf for some platforms whilst looking for bfd.h, a header provided by binutils.
Signed-off-by Joshua Lock <[email protected]>
---
meta/recipes-kernel/linux/linux-tools.inc | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-kernel/linux/linux-tools.inc +0 -0
index 950f197..aa45dba 100644
@@ -22,7 +22,7 @@ addtask install_perf after do_install before do_package
do_compile_perf[umask] = 022
do_install_perf[umask] = 022
meta/recipes-kernel/linux/linux-tools.inc addtask install_perf after do_install before do_package · line 25
Quoted 2 lines
meta/recipes-kernel/linux/linux-tools.inc +1 -1
-PERFDEPENDS = "virtual/${MLPREFIX}libc:do_populate_sysroot ${MLPREFIX}elfutils:do_populate_sysroot"
+PERFDEPENDS = "virtual/${MLPREFIX}libc:do_populate_sysroot ${MLPREFIX}elfutils:do_populate_sysroot ${MLPREFIX}binutils:do_populate_sysroot"
Does this build the rpm for binutils too? I've seen the following error recently when creating the rfs:

Quoted 5 lines

Quoted 3 lines

| error: Failed dependencies:
|     binutils >= 2.21.1a is needed by perf-3.0.6-r2.p3060qds
|     libbfd-2.21.1.so is needed by perf-3.0.6-r2.p3060qds

I suspect the patch is not enough to fix this...

The error went away after adding this, but I'm not 100% the rpm's where not available the next time regardless of this patch.

-M