Skip to contentSkip to conversation

[PATCH 0/3]

PATCH Applied Xiaofeng Yan 2 participants 5 messages Mar 3, 2012 – Mar 4, 2012

lore
Share & tools
lore

Xiaofeng Yan

author
#0 lore raw

cover [PATCH 0/3]

From: Xiaofeng Yan <[email protected]>

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 <[email protected]>
---

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

 .../libx11-1.4.4/makekeys_crosscompile.patch       |   76 ++++++++++++++++++++
 .../libx11-trim-1.4.4/makekeys_crosscompile.patch  |   33 ++++++++-
 meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb     |    3 +-
 3 files changed, 110 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch
author
#1 lore raw

PATCH 1/3 libx11-1.4.4: Add patch makekeys_crosscompile.patch

From: Xiaofeng Yan <[email protected]>

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 <[email protected]>
---
 .../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
meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch new file +76 -0
new file mode 100644
index 0000000..daf3696
@@ -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: [email protected]
+
+--- 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;
Signature · 1 line
1.7.0.4
author
#2 lore raw

PATCH 2/3 libx11-1.4.4: Add patch "makekeys_crosscompile.patch"

In reply to Xiaofeng Yan

From: Xiaofeng Yan <[email protected]>

Add patch "makekeys_crosscompile.patch" to libx11-1.4.4 for fixing bug 1970.

[YOCTO #1970]

Signed-off-by Xiaofeng Yan <[email protected]>
---
 meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb +2 -1
index ee1d919..0428ff5 100644
@@ -1,7 +1,7 @@
 require libx11.inc
 inherit gettext
 
-PR = "r1"
+PR = "r2"
 
 BBCLASSEXTEND = "native nativesdk"
 

@@ -15,6 +15,7 @@ DEPENDS += "util-macros xtrans libxdmcp libxau \
 SRC_URI += " file://keysymdef_include.patch \
              file://x11_disable_makekeys.patch \
              file://0001-Add-_XGetRequest-as-substitute-for-GetReq-GetReqExtr.patch \
+             file://makekeys_crosscompile.patch \
              "
 
 SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9"
Signature · 1 line
1.7.0.4
author
#3 lore raw

PATCH 3/3 libx11-trim: Add error information from LSB Test Suite to makekeys_crosscompile.patch

In reply to Xiaofeng Yan

From: Xiaofeng Yan <[email protected]>

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 <[email protected]>
---
 .../libx11-trim-1.4.4/makekeys_crosscompile.patch  |   33 +++++++++++++++++++-
 1 files changed, 32 insertions(+), 1 deletions(-)
meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/makekeys_crosscompile.patch +32 -1
index e5eacf0..daf3696 100644
@@ -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
Signature · 1 line
1.7.0.4
Applied
#4 lore raw
In reply to Xiaofeng Yan
Quoted 34 lines · Xiaofeng Yan

From: Xiaofeng Yan <[email protected]>

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 <[email protected]>
---

Quoted 5 lines

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