* [PATCH 1/3] libx11-1.4.4: Add patch makekeys_crosscompile.patch
2012-03-03 10:59 [PATCH 0/3] Xiaofeng Yan
@ 2012-03-03 10:59 ` Xiaofeng Yan
2012-03-03 10:59 ` [PATCH 2/3] libx11-1.4.4: Add patch "makekeys_crosscompile.patch" Xiaofeng Yan
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Xiaofeng Yan @ 2012-03-03 10:59 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
LSB 4.1 complain a host contamination error from libx11 because of absent
patch "makekeys_crosscompile.patch" from libx11-trim-1.4.4.
The error from LSB Test Suite is as follow:
VSW5TESTSUITE PURPOSE 7
Assertion XStringToKeysym-7.(A)
When the string argument is the name of a KeySym in the
table with the prefix XK_ removed, then a call to
XStringToKeysym returns that KeySym.
METH: For each KeySym name in table with code G:
METH: Call XStringToKeysym to obtain the KeySym defined for that string.
METH: Verify that XStringToKeysym did not return NoSymbol.
METH: Verify that the returned string is correct.
CHECK: XStringToKeysym-7 1, line 130
CHECK: XStringToKeysym-7 2, line 140
CHECK: XStringToKeysym-7 3, line 150
CHECK: XStringToKeysym-7 4, line 160
CHECK: XStringToKeysym-7 5, line 170
CHECK: XStringToKeysym-7 6, line 180
CHECK: XStringToKeysym-7 7, line 190
CHECK: XStringToKeysym-7 8, line 200
CHECK: XStringToKeysym-7 9, line 210
CHECK: XStringToKeysym-7 10, line 220
CHECK: XStringToKeysym-7 11, line 230
CHECK: XStringToKeysym-7 12, line 240
CHECK: XStringToKeysym-7 13, line 250
CHECK: XStringToKeysym-7 14, line 260
CHECK: XStringToKeysym-7 15, line 270
CHECK: XStringToKeysym-7 16, line 280
CHECK: XStringToKeysym-7 17, line 290
CHECK: XStringToKeysym-7 18, line 300
CHECK: XStringToKeysym-7 19, line 310
CHECK: XStringToKeysym-7 20, line 320
[YOCTO #1970]
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
.../libx11-1.4.4/makekeys_crosscompile.patch | 76 ++++++++++++++++++++
1 files changed, 76 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch b/meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch
new file mode 100644
index 0000000..daf3696
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch
@@ -0,0 +1,76 @@
+Because the size of "unsigned long" is different between 32-bit
+and 64-bit, judge whether target is 32-bit or 64-bit and tell
+"makekey".
+
+The error information from LSB Test suite is as follow:
+VSW5TESTSUITE PURPOSE 7
+Assertion XStringToKeysym-7.(A)
+When the string argument is the name of a KeySym in the
+table with the prefix XK_ removed, then a call to
+XStringToKeysym returns that KeySym.
+METH: For each KeySym name in table with code G:
+METH: Call XStringToKeysym to obtain the KeySym defined for that string.
+METH: Verify that XStringToKeysym did not return NoSymbol.
+METH: Verify that the returned string is correct.
+CHECK: XStringToKeysym-7 1, line 130
+CHECK: XStringToKeysym-7 2, line 140
+CHECK: XStringToKeysym-7 3, line 150
+CHECK: XStringToKeysym-7 4, line 160
+CHECK: XStringToKeysym-7 5, line 170
+CHECK: XStringToKeysym-7 6, line 180
+CHECK: XStringToKeysym-7 7, line 190
+CHECK: XStringToKeysym-7 8, line 200
+CHECK: XStringToKeysym-7 9, line 210
+CHECK: XStringToKeysym-7 10, line 220
+CHECK: XStringToKeysym-7 11, line 230
+CHECK: XStringToKeysym-7 12, line 240
+CHECK: XStringToKeysym-7 13, line 250
+CHECK: XStringToKeysym-7 14, line 260
+CHECK: XStringToKeysym-7 15, line 270
+CHECK: XStringToKeysym-7 16, line 280
+CHECK: XStringToKeysym-7 17, line 290
+CHECK: XStringToKeysym-7 18, line 300
+CHECK: XStringToKeysym-7 19, line 310
+CHECK: XStringToKeysym-7 20, line 320
+
+Upstream-Status: Pending
+
+Signed-off-by: dbuitenh@windriver.com
+
+--- libX11-1.3.4.orig/src/util/makekeys.c 2010-01-15 09:11:36.000000000 +0800
++++ libX11-1.3.4/src/util/makekeys.c 2011-05-24 19:04:25.454774908 +0800
+@@ -33,6 +33,7 @@
+ #include <X11/keysymdef.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdint.h>
+
+ typedef unsigned long Signature;
+
+@@ -124,7 +125,12 @@
+ name = info[i].name;
+ sig = 0;
+ while ((c = *name++))
+- sig = (sig << 1) + c;
++#ifdef USE32
++ sig = (uint32_t)(sig << 1) + c;
++#else
++ sig = (uint64_t)(sig << 1) + c;
++#endif
++
+ first = j = sig % z;
+ for (k = 0; tab[j]; k++) {
+ j += first + 1;
+@@ -163,7 +169,11 @@
+ name = info[i].name;
+ sig = 0;
+ while ((c = *name++))
+- sig = (sig << 1) + c;
++#ifdef USE32
++ sig = (uint32_t)(sig << 1) + c;
++#else
++ sig = (uint64_t)(sig << 1) + c;
++#endif
+ first = j = sig % z;
+ while (offsets[j]) {
+ j += first + 1;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/3] libx11-trim: Add error information from LSB Test Suite to makekeys_crosscompile.patch
2012-03-03 10:59 [PATCH 0/3] Xiaofeng Yan
2012-03-03 10:59 ` [PATCH 1/3] libx11-1.4.4: Add patch makekeys_crosscompile.patch Xiaofeng Yan
2012-03-03 10:59 ` [PATCH 2/3] libx11-1.4.4: Add patch "makekeys_crosscompile.patch" Xiaofeng Yan
@ 2012-03-03 10:59 ` Xiaofeng Yan
2012-03-04 12:24 ` [PATCH 0/3] Richard Purdie
3 siblings, 0 replies; 6+ messages in thread
From: Xiaofeng Yan @ 2012-03-03 10:59 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Append error information from LSB Test Suite to this patch for an illustrative purpose \
why this patches should be needed.
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
.../libx11-trim-1.4.4/makekeys_crosscompile.patch | 33 +++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/makekeys_crosscompile.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/makekeys_crosscompile.patch
index e5eacf0..daf3696 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/makekeys_crosscompile.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/makekeys_crosscompile.patch
@@ -1,6 +1,37 @@
Because the size of "unsigned long" is different between 32-bit
and 64-bit, judge whether target is 32-bit or 64-bit and tell
-"makekey".
+"makekey".
+
+The error information from LSB Test suite is as follow:
+VSW5TESTSUITE PURPOSE 7
+Assertion XStringToKeysym-7.(A)
+When the string argument is the name of a KeySym in the
+table with the prefix XK_ removed, then a call to
+XStringToKeysym returns that KeySym.
+METH: For each KeySym name in table with code G:
+METH: Call XStringToKeysym to obtain the KeySym defined for that string.
+METH: Verify that XStringToKeysym did not return NoSymbol.
+METH: Verify that the returned string is correct.
+CHECK: XStringToKeysym-7 1, line 130
+CHECK: XStringToKeysym-7 2, line 140
+CHECK: XStringToKeysym-7 3, line 150
+CHECK: XStringToKeysym-7 4, line 160
+CHECK: XStringToKeysym-7 5, line 170
+CHECK: XStringToKeysym-7 6, line 180
+CHECK: XStringToKeysym-7 7, line 190
+CHECK: XStringToKeysym-7 8, line 200
+CHECK: XStringToKeysym-7 9, line 210
+CHECK: XStringToKeysym-7 10, line 220
+CHECK: XStringToKeysym-7 11, line 230
+CHECK: XStringToKeysym-7 12, line 240
+CHECK: XStringToKeysym-7 13, line 250
+CHECK: XStringToKeysym-7 14, line 260
+CHECK: XStringToKeysym-7 15, line 270
+CHECK: XStringToKeysym-7 16, line 280
+CHECK: XStringToKeysym-7 17, line 290
+CHECK: XStringToKeysym-7 18, line 300
+CHECK: XStringToKeysym-7 19, line 310
+CHECK: XStringToKeysym-7 20, line 320
Upstream-Status: Pending
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 0/3]
2012-03-03 10:59 [PATCH 0/3] Xiaofeng Yan
` (2 preceding siblings ...)
2012-03-03 10:59 ` [PATCH 3/3] libx11-trim: Add error information from LSB Test Suite to makekeys_crosscompile.patch Xiaofeng Yan
@ 2012-03-04 12:24 ` Richard Purdie
3 siblings, 0 replies; 6+ messages in thread
From: Richard Purdie @ 2012-03-04 12:24 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Sat, 2012-03-03 at 18:59 +0800, Xiaofeng Yan wrote:
> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
>
> LSB report the following information when running lsb test.
>
> VSW5TESTSUITE PURPOSE 7
> Assertion XStringToKeysym-7.(A)
> When the string argument is the name of a KeySym in the
> table with the prefix XK_ removed, then a call to
> XStringToKeysym returns that KeySym.
> METH: For each KeySym name in table with code G:
> METH: Call XStringToKeysym to obtain the KeySym defined for that string.
> METH: Verify that XStringToKeysym did not return NoSymbol.
> METH: Verify that the returned string is correct.
> CHECK: XStringToKeysym-7 1, line 130
> CHECK: XStringToKeysym-7 2, line 140
> CHECK: XStringToKeysym-7 3, line 150
> CHECK: XStringToKeysym-7 4, line 160
> CHECK: XStringToKeysym-7 5, line 170
>
> This is host contamination problem. libx11-1.4.4 hasn't patch
> "makekeys_crosscompile.patch" in libx11-trim-1.4.4 because core-image-lsb-qt3
> use libx11 instead of libx11-trim.
>
>
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
> Branch: xiaofeng/1970
> Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/1970
>
> Thanks,
> Xiaofeng Yan <xiaofeng.yan@windriver.com>
> ---
>
>
> Xiaofeng Yan (3):
> libx11-1.4.4: Add patch makekeys_crosscompile.patch
> libx11-1.4.4: Add patch "makekeys_crosscompile.patch"
> libx11-trim: Add error information from LSB Test Suite to
> makekeys_crosscompile.patch
Merged to master, thanks.
Richard
^ permalink raw reply [flat|nested] 6+ messages in thread