eglibc-2.15 fix for poky-tiny

PATCH Applied [email protected] 3 participants 5 messages May 9, 2012 – May 11, 2012

lore

Share & tools

lore

[email protected]

author

2012-05-09 21:33 UTC #0 lore raw

cover eglibc-2.15 fix for poky-tiny

From: Nitin A Kamble <[email protected]>

The following changes since commit 6841abd17268a1c1ca5e3634f0ae9e21426ca9c9:

Hob: change the workflow about click 'Run Image' to run directly after builded a qemu image (2012-05-09 21:56:47 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib nitin/eglibc-fix
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/eglibc-fix

Nitin A Kamble (1):
eglibc: fix build with poky-tiny distro

 .../eglibc_fix_findidx_parameters.patch            |   38 ++++++++++++++++++++
 meta/recipes-core/eglibc/eglibc_2.15.bb            |    3 +-
 2 files changed, 40 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-core/eglibc/eglibc-2.15/eglibc_fix_findidx_parameters.patch

Signature · 1 line

1.7.7.6

[email protected]

author

2012-05-09 21:33 UTC #1 lore raw

PATCH 1/1 eglibc: fix build with poky-tiny distro

From: Nitin A Kamble <[email protected]>

This fixes bug [YOCTO #2443]

Signed-off-by Nitin A Kamble <[email protected]>

---
 .../eglibc_fix_findidx_parameters.patch            |   38 ++++++++++++++++++++
 meta/recipes-core/eglibc/eglibc_2.15.bb            |    3 +-
 2 files changed, 40 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-core/eglibc/eglibc-2.15/eglibc_fix_findidx_parameters.patch

meta/recipes-core/eglibc/eglibc-2.15/eglibc_fix_findidx_parameters.patch new file +38 -0

new file mode 100644
index 0000000..bbf4605
@@ -0,0 +1,38 @@
+Upstream-Status: backport
+
+Imported patch from: http://www.eglibc.org/archives/patches/msg01124.html
+
+Signed-Off-By: Nitin A Kamble <[email protected]>
+2012/05/09
+
+Index: libc/posix/xregex.c
+===================================================================
+--- libc.orig/posix/xregex.c
++++ libc/posix/xregex.c
+@@ -2943,7 +2943,7 @@ PREFIX(regex_compile) (const char *ARG_P
+ 				  _NL_CURRENT (LC_COLLATE,
+ 					       _NL_COLLATE_INDIRECTWC);
+ 
+-				idx = findidx ((const wint_t**)&cp);
++				idx = findidx ((const wint_t**)&cp, -1);
+ 				if (idx == 0 || cp < (wint_t*) str + c1)
+ 				  /* This is no valid character.  */
+ 				  FREE_STACK_RETURN (REG_ECOLLATE);
+@@ -3392,7 +3392,7 @@ PREFIX(regex_compile) (const char *ARG_P
+ 			    indirect = (const int32_t *)
+ 			      _NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTMB);
+ 
+-			    idx = findidx (&cp);
++			    idx = findidx (&cp, -1);
+ 			    if (idx == 0 || cp < str + c1)
+ 			      /* This is no valid character.  */
+ 			      FREE_STACK_RETURN (REG_ECOLLATE);
+@@ -6363,7 +6363,7 @@ byte_re_match_2_internal (struct re_patt
+ 		      }
+ 		    str_buf[i] = TRANSLATE(*(d+i));
+ 		    str_buf[i+1] = '\0'; /* sentinel */
+-		    idx2 = findidx ((const wint_t**)&cp);
++		    idx2 = findidx ((const wint_t**)&cp, -1);
+ 		  }
+ 
+ 		/* Update d, however d will be incremented at

meta/recipes-core/eglibc/eglibc_2.15.bb +2 -1

index e61816d..6b6b55c 100644
@@ -3,7 +3,7 @@ require eglibc.inc
 SRCREV = "17386"
 
 DEPENDS += "gperf-native"
-PR = "r8"
+PR = "r9"
 PR_append = "+svnr${SRCPV}"
 
 EGLIBC_BRANCH="eglibc-2_15"

@@ -24,6 +24,7 @@ SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http
            file://GLRO_dl_debug_mask.patch \
            file://initgroups_keys.patch \
            file://add-prefix-to-var.patch \
+           file://eglibc_fix_findidx_parameters.patch \
           "
 LIC_FILES_CHKSUM = "file://LICENSES;md5=98a1128c4b58120182cbea3b1752d8b9 \
       file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \

Signature · 1 line

1.7.7.6

Darren Hart

2012-05-09 23:46 UTC #2 lore raw

Re: [PATCH 1/1] eglibc: fix build with poky-tiny distro

Hi Nitin,

Quoted 3 lines · On 05/09/2012 02:20 PM, [email protected] wrote:

From: Nitin A Kamble <[email protected]>
This fixes bug [YOCTO #2443]

Awesome!

Please include something about what the problem is and how the backported patch addresses it. The bugzilla reference is required, but it isn't sufficient. People need to be able to understand the problem and the approach of the solution from the commit log.

Tested building an image for qemu with DISTRO="poky-tiny" I assume?

Thanks,

Darren

Quoted 73 lines

Signed-off-by Nitin A Kamble <[email protected]>

---
 .../eglibc_fix_findidx_parameters.patch            |   38 ++++++++++++++++++++
 meta/recipes-core/eglibc/eglibc_2.15.bb            |    3 +-
 2 files changed, 40 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-core/eglibc/eglibc-2.15/eglibc_fix_findidx_parameters.patch

meta/recipes-core/eglibc/eglibc-2.15/eglibc_fix_findidx_parameters.patch new file +38 -0

new file mode 100644
index 0000000..bbf4605
@@ -0,0 +1,38 @@
+Upstream-Status: backport
+
+Imported patch from: http://www.eglibc.org/archives/patches/msg01124.html
+
+Signed-Off-By: Nitin A Kamble <[email protected]>
+2012/05/09
+
+Index: libc/posix/xregex.c
+===================================================================
+--- libc.orig/posix/xregex.c
++++ libc/posix/xregex.c
+@@ -2943,7 +2943,7 @@ PREFIX(regex_compile) (const char *ARG_P
+ 				  _NL_CURRENT (LC_COLLATE,
+ 					       _NL_COLLATE_INDIRECTWC);
+ 
+-				idx = findidx ((const wint_t**)&cp);
++				idx = findidx ((const wint_t**)&cp, -1);
+ 				if (idx == 0 || cp < (wint_t*) str + c1)
+ 				  /* This is no valid character.  */
+ 				  FREE_STACK_RETURN (REG_ECOLLATE);
+@@ -3392,7 +3392,7 @@ PREFIX(regex_compile) (const char *ARG_P
+ 			    indirect = (const int32_t *)
+ 			      _NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTMB);
+ 
+-			    idx = findidx (&cp);
++			    idx = findidx (&cp, -1);
+ 			    if (idx == 0 || cp < str + c1)
+ 			      /* This is no valid character.  */
+ 			      FREE_STACK_RETURN (REG_ECOLLATE);
+@@ -6363,7 +6363,7 @@ byte_re_match_2_internal (struct re_patt
+ 		      }
+ 		    str_buf[i] = TRANSLATE(*(d+i));
+ 		    str_buf[i+1] = '\0'; /* sentinel */
+-		    idx2 = findidx ((const wint_t**)&cp);
++		    idx2 = findidx ((const wint_t**)&cp, -1);
+ 		  }
+ 
+ 		/* Update d, however d will be incremented at

meta/recipes-core/eglibc/eglibc_2.15.bb +2 -1

index e61816d..6b6b55c 100644
@@ -3,7 +3,7 @@ require eglibc.inc
 SRCREV = "17386"
 
 DEPENDS += "gperf-native"
-PR = "r8"
+PR = "r9"
 PR_append = "+svnr${SRCPV}"
 
 EGLIBC_BRANCH="eglibc-2_15"

@@ -24,6 +24,7 @@ SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http
            file://GLRO_dl_debug_mask.patch \
            file://initgroups_keys.patch \
            file://add-prefix-to-var.patch \
+           file://eglibc_fix_findidx_parameters.patch \
           "
 LIC_FILES_CHKSUM = "file://LICENSES;md5=98a1128c4b58120182cbea3b1752d8b9 \
       file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \

Signature · 3 lines

Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

Kamble, Nitin A

author

2012-05-10 00:07 UTC #3 lore raw

Re: [PATCH 1/1] eglibc: fix build with poky-tiny distro

Quoted 15 lines

-----Original Message-----
From: Darren Hart [mailto:[email protected]]
Sent: Wednesday, May 09, 2012 4:36 PM
To: Patches and discussions about the oe-core layer
Cc: Kamble, Nitin A
Subject: Re: [OE-core] [PATCH 1/1] eglibc: fix build with poky-tiny distro
Hi Nitin,
Quoted 2 lines · On 05/09/2012 02:20 PM, [email protected] wrote:
From: Nitin A Kamble <[email protected]>

Quoted 9 lines

Quoted 1 line
This fixes bug [YOCTO #2443]
Awesome!
Please include something about what the problem is and how the backported patch addresses it. The bugzilla reference is required, but it isn't sufficient. People need to be able to understand the problem and the approach of the solution from the commit log.

Ok, adding more information in the commit log on the contrib branch.

Quoted 2 lines

Tested building an image for qemu with DISTRO="poky-tiny" I assume?

Yes. Tested with poky-tiny for qemux86

Nitin

Quoted 101 lines

Thanks,
Darren
Quoted 4 lines
Signed-off-by Nitin A Kamble <[email protected]>
---
 .../eglibc_fix_findidx_parameters.patch            |   38
++++++++++++++++++++
Quoted 2 lines
 meta/recipes-core/eglibc/eglibc_2.15.bb            |    3 +-
 2 files changed, 40 insertions(+), 1 deletions(-)  create mode
100644
Quoted 1 line
meta/recipes-core/eglibc/eglibc-
2.15/eglibc_fix_findidx_parameters.pat
Quoted 4 lines
ch
diff --git
a/meta/recipes-core/eglibc/eglibc-
2.15/eglibc_fix_findidx_parameters.p
Quoted 2 lines
atch
b/meta/recipes-core/eglibc/eglibc-
2.15/eglibc_fix_findidx_parameters.p
meta/recipes-core/eglibc/eglibc-
Quoted 5 lines
atch
new file mode 100644
index 0000000..bbf4605
meta/recipes-core/eglibc/eglibc- new file +0 -0
2.15/eglibc_fix_findidx_paramete
Quoted 13 lines
+++ rs.patch
meta/recipes-core/eglibc/eglibc- new file +11 -0
@@ -0,0 +1,38 @@
+Upstream-Status: backport
+
+Imported patch from:
+http://www.eglibc.org/archives/patches/msg01124.html
+
+Signed-Off-By: Nitin A Kamble <[email protected]>
+2012/05/09
+
+Index: libc/posix/xregex.c
+===================================================================
+--- libc.orig/posix/xregex.c
meta/recipes-core/eglibc/eglibc- line 21
Quoted 10 lines
meta/recipes-core/eglibc/eglibc- new file +10 -0
++++ libc/posix/xregex.c
+@@ -2943,7 +2943,7 @@ PREFIX(regex_compile) (const char *ARG_P
+ 				  _NL_CURRENT (LC_COLLATE,
+ 					       _NL_COLLATE_INDIRECTWC);
+
+-				idx = findidx ((const wint_t**)&cp);
++				idx = findidx ((const wint_t**)&cp, -1);
+ 				if (idx == 0 || cp < (wint_t*) str + c1)
+ 				  /* This is no valid character.  */
+ 				  FREE_STACK_RETURN (REG_ECOLLATE); @@ -3392,7
+3392,7 @@
meta/recipes-core/eglibc/eglibc- line 24
Quoted 3 lines
meta/recipes-core/eglibc/eglibc- new file +3 -0
+PREFIX(regex_compile) (const char *ARG_P
+ 			    indirect = (const int32_t *)
+ 			      _NL_CURRENT (LC_COLLATE,
_NL_COLLATE_INDIRECTMB);
meta/recipes-core/eglibc/eglibc- line 30
Quoted 6 lines
meta/recipes-core/eglibc/eglibc- new file +6 -0
+
+-			    idx = findidx (&cp);
++			    idx = findidx (&cp, -1);
+ 			    if (idx == 0 || cp < str + c1)
+ 			      /* This is no valid character.  */
+ 			      FREE_STACK_RETURN (REG_ECOLLATE); @@ -6363,7
+6363,7 @@
meta/recipes-core/eglibc/eglibc_2.15.bb SRC_URI =
Quoted 24 lines
meta/recipes-core/eglibc/eglibc- new file +9 -0
+byte_re_match_2_internal (struct re_patt
+ 		      }
+ 		    str_buf[i] = TRANSLATE(*(d+i));
+ 		    str_buf[i+1] = '\0'; /* sentinel */
+-		    idx2 = findidx ((const wint_t**)&cp);
++		    idx2 = findidx ((const wint_t**)&cp, -1);
+ 		  }
+
+ 		/* Update d, however d will be incremented at
meta/recipes-core/eglibc/eglibc_2.15.bb +1 -1
index e61816d..6b6b55c 100644
@@ -3,7 +3,7 @@ require eglibc.inc
 SRCREV = "17386"
 
 DEPENDS += "gperf-native"
-PR = "r8"
+PR = "r9"
 PR_append = "+svnr${SRCPV}"
 
 EGLIBC_BRANCH="eglibc-2_15"
@@ -24,6 +24,7 @@ SRC_URI =
"svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http
meta/recipes-core/eglibc/eglibc_2.15.bb SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http
Quoted 6 lines
meta/recipes-core/eglibc/eglibc_2.15.bb +1 -0
            file://GLRO_dl_debug_mask.patch \
            file://initgroups_keys.patch \
            file://add-prefix-to-var.patch \
+           file://eglibc_fix_findidx_parameters.patch \
           "
 LIC_FILES_CHKSUM =
"file://LICENSES;md5=98a1128c4b58120182cbea3b1752d8b9 \
meta/recipes-core/eglibc/eglibc_2.15.bb SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http · line 30
Quoted 1 line
meta/recipes-core/eglibc/eglibc_2.15.bb +0 -0
       file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
--
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

Saul Wold

Applied

2012-05-11 17:47 UTC #4 lore raw

In reply to [email protected]

Quoted 10 lines · On 05/09/2012 02:20 PM, [email protected] wrote:

From: Nitin A Kamble<[email protected]>
The following changes since commit 6841abd17268a1c1ca5e3634f0ae9e21426ca9c9:
Hob: change the workflow about click 'Run Image' to run directly after builded a qemu image (2012-05-09 21:56:47 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib nitin/eglibc-fix
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/eglibc-fix

Quoted 8 lines

Nitin A Kamble (1):
eglibc: fix build with poky-tiny distro
  .../eglibc_fix_findidx_parameters.patch            |   38 ++++++++++++++++++++
  meta/recipes-core/eglibc/eglibc_2.15.bb            |    3 +-
  2 files changed, 40 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-core/eglibc/eglibc-2.15/eglibc_fix_findidx_parameters.patch

Merged into OE-Core

Thanks
Sau!