* [PATCH 1/2] libc-package bbclass: fix binary localedata dependency code @ 2011-08-24 18:32 Koen Kooi 2011-08-24 18:32 ` [PATCH 2/2] tcl: fix networking breakage Koen Kooi ` (2 more replies) 0 siblings, 3 replies; 15+ messages in thread From: Koen Kooi @ 2011-08-24 18:32 UTC (permalink / raw) To: openembedded-core; +Cc: Koen Kooi When using binary locales rootfs generation fails with: | Unknown package 'locale-base-en-us'. | Collected errors: | * opkg_install_cmd: Cannot install package locale-base-en-us. This is due to: $ dpkg-deb -I ipk/armv7a/locale-base-en-us_2.12-r16_armv7a.ipk | grep Depends Depends: eglibc-binary-localedata-en.us Note the '.' seperator $ ls ipk/armv7a/ | grep binary-localedata-en | grep us eglibc-binary-localedata-en-us_2.12-r16_armv7a.ipk Note the '-' seperator vs the '.' in the locale-base packages. Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> --- meta/classes/libc-package.bbclass | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass index 0d5ce20..d3b33d6 100644 --- a/meta/classes/libc-package.bbclass +++ b/meta/classes/libc-package.bbclass @@ -243,7 +243,7 @@ python package_do_split_gconvs () { def output_locale_binary_rdepends(name, pkgname, locale, encoding): m = re.match("(.*)_(.*)", name) if m: - libc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-","")) + libc_name = "%s-%s" % (m.group(1), m.group(2).lower().replace("-","")) else: libc_name = name bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \ -- 1.6.6.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 2/2] tcl: fix networking breakage 2011-08-24 18:32 [PATCH 1/2] libc-package bbclass: fix binary localedata dependency code Koen Kooi @ 2011-08-24 18:32 ` Koen Kooi 2011-08-24 18:36 ` Saul Wold 2011-08-25 2:26 ` [PATCH 1/2] libc-package bbclass: fix binary localedata dependency code Richard Purdie 2011-08-25 9:24 ` Phil Blundell 2 siblings, 1 reply; 15+ messages in thread From: Koen Kooi @ 2011-08-24 18:32 UTC (permalink / raw) To: openembedded-core; +Cc: Koen Kooi Without providing these site entries tcl networking doesn't work on the target. Original OE commit: commit 0c340037644f87054462f62b50cd397c162615b7 Author: Koen Kooi <koen@openembedded.org> Date: Wed May 26 13:04:18 2010 +0200 tcl: add 2 entries to arm-linux site file (possibly only glibc specific, need to check) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> --- meta/recipes-devtools/tcltk/tcl_8.5.9.bb | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/tcltk/tcl_8.5.9.bb b/meta/recipes-devtools/tcltk/tcl_8.5.9.bb index 2eabb4d..1b4ae83 100644 --- a/meta/recipes-devtools/tcltk/tcl_8.5.9.bb +++ b/meta/recipes-devtools/tcltk/tcl_8.5.9.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://../license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 file://../win/license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 \ " -PR = "r1" +PR = "r2" BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \ file://tcl-add-soname.patch" @@ -30,7 +30,9 @@ inherit autotools DEPENDS_virtclass-native = "" -EXTRA_OECONF = "--enable-threads" +EXTRA_OECONF = "--enable-threads \ + tcl_cv_api_getaddrinfo=yes \ + " do_configure() { gnu-configize -- 1.6.6.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 2/2] tcl: fix networking breakage 2011-08-24 18:32 ` [PATCH 2/2] tcl: fix networking breakage Koen Kooi @ 2011-08-24 18:36 ` Saul Wold 2011-08-24 19:45 ` Koen Kooi 0 siblings, 1 reply; 15+ messages in thread From: Saul Wold @ 2011-08-24 18:36 UTC (permalink / raw) To: Patches and discussions about the oe-core layer; +Cc: Koen Kooi On 08/24/2011 11:32 AM, Koen Kooi wrote: > Without providing these site entries tcl networking doesn't work on the target. > > Original OE commit: > > commit 0c340037644f87054462f62b50cd397c162615b7 > Author: Koen Kooi<koen@openembedded.org> > Date: Wed May 26 13:04:18 2010 +0200 > > tcl: add 2 entries to arm-linux site file (possibly only glibc specific, need to check) > > Signed-off-by: Koen Kooi<koen@dominion.thruhere.net> > --- > meta/recipes-devtools/tcltk/tcl_8.5.9.bb | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-devtools/tcltk/tcl_8.5.9.bb b/meta/recipes-devtools/tcltk/tcl_8.5.9.bb > index 2eabb4d..1b4ae83 100644 > --- a/meta/recipes-devtools/tcltk/tcl_8.5.9.bb > +++ b/meta/recipes-devtools/tcltk/tcl_8.5.9.bb > @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://../license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 > file://../win/license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 \ > " > > -PR = "r1" > +PR = "r2" > > BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \ > file://tcl-add-soname.patch" > @@ -30,7 +30,9 @@ inherit autotools > > DEPENDS_virtclass-native = "" > > -EXTRA_OECONF = "--enable-threads" > +EXTRA_OECONF = "--enable-threads \ > + tcl_cv_api_getaddrinfo=yes \ > + " > Koen, This was asked last time you submitted this, what's the reasoning for adding it here vs in a site files? Sau! > do_configure() { > gnu-configize ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/2] tcl: fix networking breakage 2011-08-24 18:36 ` Saul Wold @ 2011-08-24 19:45 ` Koen Kooi 0 siblings, 0 replies; 15+ messages in thread From: Koen Kooi @ 2011-08-24 19:45 UTC (permalink / raw) To: Saul Wold; +Cc: Patches and discussions about the oe-core layer Op 24 aug. 2011 om 20:36 heeft Saul Wold <sgw@linux.intel.com> het volgende geschreven: > On 08/24/2011 11:32 AM, Koen Kooi wrote: >> Without providing these site entries tcl networking doesn't work on the target. >> >> Original OE commit: >> >> commit 0c340037644f87054462f62b50cd397c162615b7 >> Author: Koen Kooi<koen@openembedded.org> >> Date: Wed May 26 13:04:18 2010 +0200 >> >> tcl: add 2 entries to arm-linux site file (possibly only glibc specific, need to check) >> >> Signed-off-by: Koen Kooi<koen@dominion.thruhere.net> >> --- >> meta/recipes-devtools/tcltk/tcl_8.5.9.bb | 6 ++++-- >> 1 files changed, 4 insertions(+), 2 deletions(-) >> >> diff --git a/meta/recipes-devtools/tcltk/tcl_8.5.9.bb b/meta/recipes-devtools/tcltk/tcl_8.5.9.bb >> index 2eabb4d..1b4ae83 100644 >> --- a/meta/recipes-devtools/tcltk/tcl_8.5.9.bb >> +++ b/meta/recipes-devtools/tcltk/tcl_8.5.9.bb >> @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://../license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 >> file://../win/license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 \ >> " >> >> -PR = "r1" >> +PR = "r2" >> >> BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \ >> file://tcl-add-soname.patch" >> @@ -30,7 +30,9 @@ inherit autotools >> >> DEPENDS_virtclass-native = "" >> >> -EXTRA_OECONF = "--enable-threads" >> +EXTRA_OECONF = "--enable-threads \ >> + tcl_cv_api_getaddrinfo=yes \ >> + " >> > Koen, > > This was asked last time you submitted this, what's the reasoning for adding it here vs in a site files? Just minicing the original commit, I have no objection to putting it in a site file > > Sau! > > >> do_configure() { >> gnu-configize ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/2] libc-package bbclass: fix binary localedata dependency code 2011-08-24 18:32 [PATCH 1/2] libc-package bbclass: fix binary localedata dependency code Koen Kooi 2011-08-24 18:32 ` [PATCH 2/2] tcl: fix networking breakage Koen Kooi @ 2011-08-25 2:26 ` Richard Purdie 2011-08-25 9:24 ` Phil Blundell 2 siblings, 0 replies; 15+ messages in thread From: Richard Purdie @ 2011-08-25 2:26 UTC (permalink / raw) To: Patches and discussions about the oe-core layer; +Cc: Koen Kooi On Wed, 2011-08-24 at 20:32 +0200, Koen Kooi wrote: > When using binary locales rootfs generation fails with: > > | Unknown package 'locale-base-en-us'. > | Collected errors: > | * opkg_install_cmd: Cannot install package locale-base-en-us. > > This is due to: > > $ dpkg-deb -I ipk/armv7a/locale-base-en-us_2.12-r16_armv7a.ipk | grep Depends > Depends: eglibc-binary-localedata-en.us > > Note the '.' seperator > > $ ls ipk/armv7a/ | grep binary-localedata-en | grep us > eglibc-binary-localedata-en-us_2.12-r16_armv7a.ipk > > Note the '-' seperator vs the '.' in the locale-base packages. > > Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Merged to master, thanks. Richard ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/2] libc-package bbclass: fix binary localedata dependency code 2011-08-24 18:32 [PATCH 1/2] libc-package bbclass: fix binary localedata dependency code Koen Kooi 2011-08-24 18:32 ` [PATCH 2/2] tcl: fix networking breakage Koen Kooi 2011-08-25 2:26 ` [PATCH 1/2] libc-package bbclass: fix binary localedata dependency code Richard Purdie @ 2011-08-25 9:24 ` Phil Blundell 2011-08-25 14:58 ` Richard Purdie 2 siblings, 1 reply; 15+ messages in thread From: Phil Blundell @ 2011-08-25 9:24 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Wed, 2011-08-24 at 20:32 +0200, Koen Kooi wrote: > diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass > index 0d5ce20..d3b33d6 100644 > --- a/meta/classes/libc-package.bbclass > +++ b/meta/classes/libc-package.bbclass > @@ -243,7 +243,7 @@ python package_do_split_gconvs () { > def output_locale_binary_rdepends(name, pkgname, locale, encoding): > m = re.match("(.*)_(.*)", name) > if m: > - libc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-","")) > + libc_name = "%s-%s" % (m.group(1), m.group(2).lower().replace("-","")) > else: > libc_name = name > bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \ For what it's worth (probably not much), this is not quite the right fix. Joining with "." was correct; it was the splitting on "_" that was wrong. The right thing would be to put it back how it was before the glibc/eglibc merge commit, i.e. change the re to "(*.)\.(*.)" and leave the output pattern alone. That ought to fix your problem and also allow the encoding to be correctly canonicalised. p. ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/2] libc-package bbclass: fix binary localedata dependency code 2011-08-25 9:24 ` Phil Blundell @ 2011-08-25 14:58 ` Richard Purdie 2011-08-26 14:12 ` Phil Blundell 0 siblings, 1 reply; 15+ messages in thread From: Richard Purdie @ 2011-08-25 14:58 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Thu, 2011-08-25 at 10:24 +0100, Phil Blundell wrote: > On Wed, 2011-08-24 at 20:32 +0200, Koen Kooi wrote: > > diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass > > index 0d5ce20..d3b33d6 100644 > > --- a/meta/classes/libc-package.bbclass > > +++ b/meta/classes/libc-package.bbclass > > @@ -243,7 +243,7 @@ python package_do_split_gconvs () { > > def output_locale_binary_rdepends(name, pkgname, locale, encoding): > > m = re.match("(.*)_(.*)", name) > > if m: > > - libc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-","")) > > + libc_name = "%s-%s" % (m.group(1), m.group(2).lower().replace("-","")) > > else: > > libc_name = name > > bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \ > > For what it's worth (probably not much), this is not quite the right > fix. Joining with "." was correct; it was the splitting on "_" that was > wrong. The right thing would be to put it back how it was before the > glibc/eglibc merge commit, i.e. change the re to "(*.)\.(*.)" and leave > the output pattern alone. That ought to fix your problem and also allow > the encoding to be correctly canonicalised. Can someone please send me the correct patch against master? :) Cheers, Richard ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/2] libc-package bbclass: fix binary localedata dependency code 2011-08-25 14:58 ` Richard Purdie @ 2011-08-26 14:12 ` Phil Blundell 2011-08-26 14:54 ` Koen Kooi 2011-08-26 15:26 ` Koen Kooi 0 siblings, 2 replies; 15+ messages in thread From: Phil Blundell @ 2011-08-26 14:12 UTC (permalink / raw) To: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 1545 bytes --] On Thu, 2011-08-25 at 07:58 -0700, Richard Purdie wrote: > On Thu, 2011-08-25 at 10:24 +0100, Phil Blundell wrote: > > On Wed, 2011-08-24 at 20:32 +0200, Koen Kooi wrote: > > > diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass > > > index 0d5ce20..d3b33d6 100644 > > > --- a/meta/classes/libc-package.bbclass > > > +++ b/meta/classes/libc-package.bbclass > > > @@ -243,7 +243,7 @@ python package_do_split_gconvs () { > > > def output_locale_binary_rdepends(name, pkgname, locale, encoding): > > > m = re.match("(.*)_(.*)", name) > > > if m: > > > - libc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-","")) > > > + libc_name = "%s-%s" % (m.group(1), m.group(2).lower().replace("-","")) > > > else: > > > libc_name = name > > > bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \ > > > > For what it's worth (probably not much), this is not quite the right > > fix. Joining with "." was correct; it was the splitting on "_" that was > > wrong. The right thing would be to put it back how it was before the > > glibc/eglibc merge commit, i.e. change the re to "(*.)\.(*.)" and leave > > the output pattern alone. That ought to fix your problem and also allow > > the encoding to be correctly canonicalised. > > Can someone please send me the correct patch against master? :) I think the attached is what you need. Koen, maybe you could confirm whether this does indeed fix your original problem. p. [-- Attachment #2: 0001-libc-package-restore-correct-mangling-behavior-for-l.patch --] [-- Type: text/x-patch, Size: 1403 bytes --] From 1cd91a91802776ddede041cfa222b603da6c8453 Mon Sep 17 00:00:00 2001 From: Phil Blundell <philb@gnu.org> Date: Fri, 26 Aug 2011 15:05:11 +0100 Subject: [PATCH] libc-package: restore correct mangling behavior for locale names This reverts 19fb07bf337e1d724798e2eb4479c35fc45b1941 and restores the behaviour of the code to the way it was prior to 561d875404ef1783f94f37314b6e756766db8411. See http://lists.linuxtogo.org/pipermail/openembedded-core/2011-August/007407.html and subsequent messages. Signed-off-by: Phil Blundell <philb@gnu.org> --- meta/classes/libc-package.bbclass | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass index d3b33d6..f8df6a4 100644 --- a/meta/classes/libc-package.bbclass +++ b/meta/classes/libc-package.bbclass @@ -241,9 +241,9 @@ python package_do_split_gconvs () { (locale, encoding, locale), d) def output_locale_binary_rdepends(name, pkgname, locale, encoding): - m = re.match("(.*)_(.*)", name) + m = re.match("(.*).(.*)", name) if m: - libc_name = "%s-%s" % (m.group(1), m.group(2).lower().replace("-","")) + libc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-","")) else: libc_name = name bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \ -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 1/2] libc-package bbclass: fix binary localedata dependency code 2011-08-26 14:12 ` Phil Blundell @ 2011-08-26 14:54 ` Koen Kooi 2011-08-26 15:26 ` Koen Kooi 1 sibling, 0 replies; 15+ messages in thread From: Koen Kooi @ 2011-08-26 14:54 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Op 26 aug. 2011, om 16:12 heeft Phil Blundell het volgende geschreven: > On Thu, 2011-08-25 at 07:58 -0700, Richard Purdie wrote: >> On Thu, 2011-08-25 at 10:24 +0100, Phil Blundell wrote: >>> On Wed, 2011-08-24 at 20:32 +0200, Koen Kooi wrote: >>>> diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass >>>> index 0d5ce20..d3b33d6 100644 >>>> --- a/meta/classes/libc-package.bbclass >>>> +++ b/meta/classes/libc-package.bbclass >>>> @@ -243,7 +243,7 @@ python package_do_split_gconvs () { >>>> def output_locale_binary_rdepends(name, pkgname, locale, encoding): >>>> m = re.match("(.*)_(.*)", name) >>>> if m: >>>> - libc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-","")) >>>> + libc_name = "%s-%s" % (m.group(1), m.group(2).lower().replace("-","")) >>>> else: >>>> libc_name = name >>>> bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \ >>> >>> For what it's worth (probably not much), this is not quite the right >>> fix. Joining with "." was correct; it was the splitting on "_" that was >>> wrong. The right thing would be to put it back how it was before the >>> glibc/eglibc merge commit, i.e. change the re to "(*.)\.(*.)" and leave >>> the output pattern alone. That ought to fix your problem and also allow >>> the encoding to be correctly canonicalised. >> >> Can someone please send me the correct patch against master? :) > > I think the attached is what you need. Koen, maybe you could confirm > whether this does indeed fix your original problem. doing a test build now, will report back later ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/2] libc-package bbclass: fix binary localedata dependency code 2011-08-26 14:12 ` Phil Blundell 2011-08-26 14:54 ` Koen Kooi @ 2011-08-26 15:26 ` Koen Kooi 2011-08-26 15:30 ` Phil Blundell 1 sibling, 1 reply; 15+ messages in thread From: Koen Kooi @ 2011-08-26 15:26 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Op 26 aug. 2011, om 16:12 heeft Phil Blundell het volgende geschreven: > On Thu, 2011-08-25 at 07:58 -0700, Richard Purdie wrote: >> On Thu, 2011-08-25 at 10:24 +0100, Phil Blundell wrote: >>> On Wed, 2011-08-24 at 20:32 +0200, Koen Kooi wrote: >>>> diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass >>>> index 0d5ce20..d3b33d6 100644 >>>> --- a/meta/classes/libc-package.bbclass >>>> +++ b/meta/classes/libc-package.bbclass >>>> @@ -243,7 +243,7 @@ python package_do_split_gconvs () { >>>> def output_locale_binary_rdepends(name, pkgname, locale, encoding): >>>> m = re.match("(.*)_(.*)", name) >>>> if m: >>>> - libc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-","")) >>>> + libc_name = "%s-%s" % (m.group(1), m.group(2).lower().replace("-","")) >>>> else: >>>> libc_name = name >>>> bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \ >>> >>> For what it's worth (probably not much), this is not quite the right >>> fix. Joining with "." was correct; it was the splitting on "_" that was >>> wrong. The right thing would be to put it back how it was before the >>> glibc/eglibc merge commit, i.e. change the re to "(*.)\.(*.)" and leave >>> the output pattern alone. That ought to fix your problem and also allow >>> the encoding to be correctly canonicalised. >> >> Can someone please send me the correct patch against master? :) > > I think the attached is what you need. Koen, maybe you could confirm > whether this does indeed fix your original problem. I built some images before applying this patch and then: bitbake -ccleansstate eglibc eglibc-locale bitbake systemd-image And that gives me http://git.angstrom-distribution.org/cgi-bin/cgit.cgi/testlab/commit/?h=yocto&id=9b2e08e0c4da4881ba8c83be39697a40a63b75fd -locale_base_en_us -> eglibc_binary_localedata_en_us; +locale_base_en_us -> eglibc_binary_localedata_en_u_; So something regexp is being a bit too greedy by the looks of it. ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/2] libc-package bbclass: fix binary localedata dependency code 2011-08-26 15:26 ` Koen Kooi @ 2011-08-26 15:30 ` Phil Blundell 2011-08-26 16:31 ` Koen Kooi 0 siblings, 1 reply; 15+ messages in thread From: Phil Blundell @ 2011-08-26 15:30 UTC (permalink / raw) To: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 469 bytes --] On Fri, 2011-08-26 at 17:26 +0200, Koen Kooi wrote: > And that gives me http://git.angstrom-distribution.org/cgi-bin/cgit.cgi/testlab/commit/?h=yocto&id=9b2e08e0c4da4881ba8c83be39697a40a63b75fd > > -locale_base_en_us -> eglibc_binary_localedata_en_us; > +locale_base_en_us -> eglibc_binary_localedata_en_u_; > > So something regexp is being a bit too greedy by the looks of it. Ah whoops, the old missing backslash. Could you try this one instead? p. [-- Attachment #2: 0001-libc-package-restore-correct-mangling-behavior-for-l.patch --] [-- Type: text/x-patch, Size: 1408 bytes --] From 1cd91a91802776ddede041cfa222b603da6c8453 Mon Sep 17 00:00:00 2001 From: Phil Blundell <philb@gnu.org> Date: Fri, 26 Aug 2011 15:05:11 +0100 Subject: [PATCH v2] libc-package: restore correct mangling behavior for locale names This reverts 19fb07bf337e1d724798e2eb4479c35fc45b1941 and restores the behaviour of the code to the way it was prior to 561d875404ef1783f94f37314b6e756766db8411. See http://lists.linuxtogo.org/pipermail/openembedded-core/2011-August/007407.html and subsequent messages. Signed-off-by: Phil Blundell <philb@gnu.org> --- meta/classes/libc-package.bbclass | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass index d3b33d6..f8df6a4 100644 --- a/meta/classes/libc-package.bbclass +++ b/meta/classes/libc-package.bbclass @@ -241,10 +241,9 @@ python package_do_split_gconvs () { (locale, encoding, locale), d) def output_locale_binary_rdepends(name, pkgname, locale, encoding): - m = re.match("(.*)_(.*)", name) + m = re.match("(.*)\.(.*)", name) if m: - libc_name = "%s-%s" % (m.group(1), m.group(2).lower().replace("-","")) + libc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-","")) else: libc_name = name bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \ -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 1/2] libc-package bbclass: fix binary localedata dependency code 2011-08-26 15:30 ` Phil Blundell @ 2011-08-26 16:31 ` Koen Kooi 2011-08-30 9:26 ` Phil Blundell 0 siblings, 1 reply; 15+ messages in thread From: Koen Kooi @ 2011-08-26 16:31 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Op 26 aug. 2011, om 17:30 heeft Phil Blundell het volgende geschreven: > On Fri, 2011-08-26 at 17:26 +0200, Koen Kooi wrote: >> And that gives me http://git.angstrom-distribution.org/cgi-bin/cgit.cgi/testlab/commit/?h=yocto&id=9b2e08e0c4da4881ba8c83be39697a40a63b75fd >> >> -locale_base_en_us -> eglibc_binary_localedata_en_us; >> +locale_base_en_us -> eglibc_binary_localedata_en_u_; >> >> So something regexp is being a bit too greedy by the looks of it. > > Ah whoops, the old missing backslash. Could you try this one instead? That one doesn't seem to apply: koen@dominion:/OE/tentacle/sources/openembedded-core$ git am -s /tmp/0001-libc-package-restore-correct-mangling-behavior-for-l-1.patch Applying: libc-package: restore correct mangling behavior for locale names error: patch failed: meta/classes/libc-package.bbclass:241 error: meta/classes/libc-package.bbclass: patch does not apply Patch failed at 0001 libc-package: restore correct mangling behavior for locale names When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/2] libc-package bbclass: fix binary localedata dependency code 2011-08-26 16:31 ` Koen Kooi @ 2011-08-30 9:26 ` Phil Blundell 2011-08-31 13:47 ` Koen Kooi 2011-08-31 17:05 ` Richard Purdie 0 siblings, 2 replies; 15+ messages in thread From: Phil Blundell @ 2011-08-30 9:26 UTC (permalink / raw) To: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 187 bytes --] On Fri, 2011-08-26 at 18:31 +0200, Koen Kooi wrote: > That one doesn't seem to apply: Hm, yes, it seems I somehow damaged the patch in my last mail. Third time lucky then. p. [-- Attachment #2: 0001-libc-package-restore-correct-mangling-behavior-for-l.patch --] [-- Type: text/x-patch, Size: 1404 bytes --] From c3a2a50b6693e54aeb8c2fa635360aea53df2957 Mon Sep 17 00:00:00 2001 From: Phil Blundell <philb@gnu.org> Date: Fri, 26 Aug 2011 17:51:47 +0100 Subject: [PATCH] libc-package: restore correct mangling behavior for locale names This reverts 19fb07bf337e1d724798e2eb4479c35fc45b1941 and restores the behaviour of the code to the way it was prior to 561d875404ef1783f94f37314b6e756766db8411. See http://lists.linuxtogo.org/pipermail/openembedded-core/2011-August/007407.html and subsequent messages. Signed-off-by: Phil Blundell <philb@gnu.org> --- meta/classes/libc-package.bbclass | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass index d3b33d6..9d32844 100644 --- a/meta/classes/libc-package.bbclass +++ b/meta/classes/libc-package.bbclass @@ -241,9 +241,9 @@ python package_do_split_gconvs () { (locale, encoding, locale), d) def output_locale_binary_rdepends(name, pkgname, locale, encoding): - m = re.match("(.*)_(.*)", name) + m = re.match("(.*)\.(.*)", name) if m: - libc_name = "%s-%s" % (m.group(1), m.group(2).lower().replace("-","")) + libc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-","")) else: libc_name = name bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \ -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 1/2] libc-package bbclass: fix binary localedata dependency code 2011-08-30 9:26 ` Phil Blundell @ 2011-08-31 13:47 ` Koen Kooi 2011-08-31 17:05 ` Richard Purdie 1 sibling, 0 replies; 15+ messages in thread From: Koen Kooi @ 2011-08-31 13:47 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Op 30 aug. 2011, om 11:26 heeft Phil Blundell het volgende geschreven: > On Fri, 2011-08-26 at 18:31 +0200, Koen Kooi wrote: >> That one doesn't seem to apply: > > Hm, yes, it seems I somehow damaged the patch in my last mail. Third > time lucky then. That seems to fix it, thanks ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/2] libc-package bbclass: fix binary localedata dependency code 2011-08-30 9:26 ` Phil Blundell 2011-08-31 13:47 ` Koen Kooi @ 2011-08-31 17:05 ` Richard Purdie 1 sibling, 0 replies; 15+ messages in thread From: Richard Purdie @ 2011-08-31 17:05 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Tue, 2011-08-30 at 10:26 +0100, Phil Blundell wrote: > On Fri, 2011-08-26 at 18:31 +0200, Koen Kooi wrote: > > That one doesn't seem to apply: > > Hm, yes, it seems I somehow damaged the patch in my last mail. Third > time lucky then. Merged to master, thanks. Richard ^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2011-08-31 17:10 UTC | newest] Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2011-08-24 18:32 [PATCH 1/2] libc-package bbclass: fix binary localedata dependency code Koen Kooi 2011-08-24 18:32 ` [PATCH 2/2] tcl: fix networking breakage Koen Kooi 2011-08-24 18:36 ` Saul Wold 2011-08-24 19:45 ` Koen Kooi 2011-08-25 2:26 ` [PATCH 1/2] libc-package bbclass: fix binary localedata dependency code Richard Purdie 2011-08-25 9:24 ` Phil Blundell 2011-08-25 14:58 ` Richard Purdie 2011-08-26 14:12 ` Phil Blundell 2011-08-26 14:54 ` Koen Kooi 2011-08-26 15:26 ` Koen Kooi 2011-08-26 15:30 ` Phil Blundell 2011-08-26 16:31 ` Koen Kooi 2011-08-30 9:26 ` Phil Blundell 2011-08-31 13:47 ` Koen Kooi 2011-08-31 17:05 ` Richard Purdie
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.