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

login
register
mail settings
Submitter Nitin A Kamble
Date May 9, 2012, 9:20 p.m.
Message ID <43db6eddb847eef615f636bddf9be966fefe1a94.1336598125.git.nitin.a.kamble@intel.com>
Download mbox | patch
Permalink /patch/27407/
State New
Headers show

Comments

Nitin A Kamble - May 9, 2012, 9:20 p.m.
From: Nitin A Kamble <nitin.a.kamble@intel.com>

This fixes bug [YOCTO #2443]

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../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
Darren Hart - May 9, 2012, 11:36 p.m.
Hi Nitin,

On 05/09/2012 02:20 PM, nitin.a.kamble@intel.com wrote:
> From: Nitin A Kamble <nitin.a.kamble@intel.com>
> 
> 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

> 
> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
> ---
>  .../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
> 
> diff --git a/meta/recipes-core/eglibc/eglibc-2.15/eglibc_fix_findidx_parameters.patch b/meta/recipes-core/eglibc/eglibc-2.15/eglibc_fix_findidx_parameters.patch
> new file mode 100644
> index 0000000..bbf4605
> --- /dev/null
> +++ b/meta/recipes-core/eglibc/eglibc-2.15/eglibc_fix_findidx_parameters.patch
> @@ -0,0 +1,38 @@
> +Upstream-Status: backport
> +
> +Imported patch from: http://www.eglibc.org/archives/patches/msg01124.html
> +
> +Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
> +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
> diff --git a/meta/recipes-core/eglibc/eglibc_2.15.bb b/meta/recipes-core/eglibc/eglibc_2.15.bb
> index e61816d..6b6b55c 100644
> --- a/meta/recipes-core/eglibc/eglibc_2.15.bb
> +++ b/meta/recipes-core/eglibc/eglibc_2.15.bb
> @@ -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 \
Nitin A Kamble - May 9, 2012, 11:57 p.m.
> -----Original Message-----
> From: Darren Hart [mailto:dvhart@linux.intel.com]
> 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,
> 
> On 05/09/2012 02:20 PM, nitin.a.kamble@intel.com wrote:
> > From: Nitin A Kamble <nitin.a.kamble@intel.com>
> >
> > 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.

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

Yes. Tested with poky-tiny for qemux86

Nitin

> Thanks,
> 
> Darren
> 
> >
> > Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
> > ---
> >  .../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.pat
> > ch
> >
> > diff --git
> > a/meta/recipes-core/eglibc/eglibc-
> 2.15/eglibc_fix_findidx_parameters.p
> > atch
> > b/meta/recipes-core/eglibc/eglibc-
> 2.15/eglibc_fix_findidx_parameters.p
> > atch
> > new file mode 100644
> > index 0000000..bbf4605
> > --- /dev/null
> > +++ b/meta/recipes-core/eglibc/eglibc-
> 2.15/eglibc_fix_findidx_paramete
> > +++ rs.patch
> > @@ -0,0 +1,38 @@
> > +Upstream-Status: backport
> > +
> > +Imported patch from:
> > +http://www.eglibc.org/archives/patches/msg01124.html
> > +
> > +Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
> > +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
> > diff --git a/meta/recipes-core/eglibc/eglibc_2.15.bb
> > b/meta/recipes-core/eglibc/eglibc_2.15.bb
> > index e61816d..6b6b55c 100644
> > --- a/meta/recipes-core/eglibc/eglibc_2.15.bb
> > +++ b/meta/recipes-core/eglibc/eglibc_2.15.bb
> > @@ -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 \
> 
> --
> Darren Hart
> Intel Open Source Technology Center
> Yocto Project - Linux Kernel

Patch

diff --git a/meta/recipes-core/eglibc/eglibc-2.15/eglibc_fix_findidx_parameters.patch b/meta/recipes-core/eglibc/eglibc-2.15/eglibc_fix_findidx_parameters.patch
new file mode 100644
index 0000000..bbf4605
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.15/eglibc_fix_findidx_parameters.patch
@@ -0,0 +1,38 @@ 
+Upstream-Status: backport
+
+Imported patch from: http://www.eglibc.org/archives/patches/msg01124.html
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+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
diff --git a/meta/recipes-core/eglibc/eglibc_2.15.bb b/meta/recipes-core/eglibc/eglibc_2.15.bb
index e61816d..6b6b55c 100644
--- a/meta/recipes-core/eglibc/eglibc_2.15.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.15.bb
@@ -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 \