* [PATCH] libc-common: Apply Debian-naming to libc debug symbols too
@ 2012-03-16 16:32 Mike Crowe
2012-03-16 19:39 ` Koen Kooi
0 siblings, 1 reply; 7+ messages in thread
From: Mike Crowe @ 2012-03-16 16:32 UTC (permalink / raw)
To: openembedded-core; +Cc: Mike Crowe
The magic in rootfs_ipk.bbclass expects to generate debug package
names by just appending '-dbg'. This breaks for eglibc because whilst
the binary package has been renamed to libc6 the debug package is
still called libc-dbg. This patch ensures that the debug package is
renamed too.
---
meta/classes/libc-common.bbclass | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass
index 962f205..d0c1ab4 100644
--- a/meta/classes/libc-common.bbclass
+++ b/meta/classes/libc-common.bbclass
@@ -27,4 +27,5 @@ python populate_packages_prepend () {
bpn = d.getVar('BPN', True)
d.setVar('PKG_'+bpn, 'libc6')
d.setVar('PKG_'+bpn+'-dev', 'libc6-dev')
+ d.setVar('PKG_'+bpn+'-dbg', 'libc6-dbg')
}
--
1.7.9
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] libc-common: Apply Debian-naming to libc debug symbols too
2012-03-16 16:32 [PATCH] libc-common: Apply Debian-naming to libc debug symbols too Mike Crowe
@ 2012-03-16 19:39 ` Koen Kooi
2012-03-19 11:52 ` Mike Crowe
0 siblings, 1 reply; 7+ messages in thread
From: Koen Kooi @ 2012-03-16 19:39 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Mike Crowe
Op 16 mrt. 2012, om 17:32 heeft Mike Crowe het volgende geschreven:
> The magic in rootfs_ipk.bbclass expects to generate debug package
> names by just appending '-dbg'. This breaks for eglibc because whilst
> the binary package has been renamed to libc6 the debug package is
> still called libc-dbg. This patch ensures that the debug package is
> renamed too.
> ---
> meta/classes/libc-common.bbclass | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass
> index 962f205..d0c1ab4 100644
> --- a/meta/classes/libc-common.bbclass
> +++ b/meta/classes/libc-common.bbclass
> @@ -27,4 +27,5 @@ python populate_packages_prepend () {
> bpn = d.getVar('BPN', True)
> d.setVar('PKG_'+bpn, 'libc6')
> d.setVar('PKG_'+bpn+'-dev', 'libc6-dev')
> + d.setVar('PKG_'+bpn+'-dbg', 'libc6-dbg')
> }
Missing PR bump and broken upgrade path.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] libc-common: Apply Debian-naming to libc debug symbols too
2012-03-16 19:39 ` Koen Kooi
@ 2012-03-19 11:52 ` Mike Crowe
2012-03-19 11:59 ` Koen Kooi
2012-03-19 12:03 ` Martin Jansa
0 siblings, 2 replies; 7+ messages in thread
From: Mike Crowe @ 2012-03-19 11:52 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Op 16 mrt. 2012, om 17:32 heeft Mike Crowe het volgende geschreven:
> > The magic in rootfs_ipk.bbclass expects to generate debug package
> > names by just appending '-dbg'.
It turns out that the above was a local change so that statement was
incorrect. Nevertheless the change probably makes sense anyway.
> > This breaks for eglibc because whilst
> > the binary package has been renamed to libc6 the debug package is
> > still called libc-dbg. This patch ensures that the debug package is
> > renamed too.
> > ---
> > meta/classes/libc-common.bbclass | 1 +
> > 1 files changed, 1 insertions(+), 0 deletions(-)
> >
> > diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass
> > index 962f205..d0c1ab4 100644
> > --- a/meta/classes/libc-common.bbclass
> > +++ b/meta/classes/libc-common.bbclass
> > @@ -27,4 +27,5 @@ python populate_packages_prepend () {
> > bpn = d.getVar('BPN', True)
> > d.setVar('PKG_'+bpn, 'libc6')
> > d.setVar('PKG_'+bpn+'-dev', 'libc6-dev')
> > + d.setVar('PKG_'+bpn+'-dbg', 'libc6-dbg')
> > }
On Fri, Mar 16, 2012 at 08:39:00PM +0100, Koen Kooi wrote:
> Missing PR bump
On eglibc?
> and broken upgrade path.
I'm having trouble coming up with a way to solve that. I think the
libc6-dbg package needs to RPROVIDE, RREPLACE and RCONFLICT with
libc-dbg but if I add the following:
d.setVar('RPROVIDES_' + bpn + '-dbg', bpn + '-dbg')
d.setVar('RCONFLICTS_' + bpn + '-dbg', bpn + '-dbg')
d.setVar('RREPLACES_' + bpn + '-dbg', bpn + '-dbg')
Then the package names undergo translation and I get:
Provides: libc6-dbg
Replaces: libc6-dbg
Conflicts: libc6-dbg
Which is clearly wrong. :(
How would you recommend I provide backward compatibility for this
change (assuming it is still seen as desirable?)
Thanks for your comments.
Mike.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] libc-common: Apply Debian-naming to libc debug symbols too
2012-03-19 11:52 ` Mike Crowe
@ 2012-03-19 11:59 ` Koen Kooi
2012-03-19 13:37 ` Mike Crowe
2012-03-19 12:03 ` Martin Jansa
1 sibling, 1 reply; 7+ messages in thread
From: Koen Kooi @ 2012-03-19 11:59 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Op 19 mrt. 2012, om 12:52 heeft Mike Crowe het volgende geschreven:
> Op 16 mrt. 2012, om 17:32 heeft Mike Crowe het volgende geschreven:
>>> The magic in rootfs_ipk.bbclass expects to generate debug package
>>> names by just appending '-dbg'.
>
> It turns out that the above was a local change so that statement was
> incorrect. Nevertheless the change probably makes sense anyway.
>
>>> This breaks for eglibc because whilst
>>> the binary package has been renamed to libc6 the debug package is
>>> still called libc-dbg. This patch ensures that the debug package is
>>> renamed too.
>>> ---
>>> meta/classes/libc-common.bbclass | 1 +
>>> 1 files changed, 1 insertions(+), 0 deletions(-)
>>>
>>> diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass
>>> index 962f205..d0c1ab4 100644
>>> --- a/meta/classes/libc-common.bbclass
>>> +++ b/meta/classes/libc-common.bbclass
>>> @@ -27,4 +27,5 @@ python populate_packages_prepend () {
>>> bpn = d.getVar('BPN', True)
>>> d.setVar('PKG_'+bpn, 'libc6')
>>> d.setVar('PKG_'+bpn+'-dev', 'libc6-dev')
>>> + d.setVar('PKG_'+bpn+'-dbg', 'libc6-dbg')
>>> }
>
> On Fri, Mar 16, 2012 at 08:39:00PM +0100, Koen Kooi wrote:
>> Missing PR bump
>
> On eglibc?
On everything that uses that class.
>
>> and broken upgrade path.
>
> I'm having trouble coming up with a way to solve that. I think the
> libc6-dbg package needs to RPROVIDE, RREPLACE and RCONFLICT with
> libc-dbg but if I add the following:
>
> d.setVar('RPROVIDES_' + bpn + '-dbg', bpn + '-dbg')
> d.setVar('RCONFLICTS_' + bpn + '-dbg', bpn + '-dbg')
> d.setVar('RREPLACES_' + bpn + '-dbg', bpn + '-dbg')
Does d.setVar('RREPLACES_' + bpn + '-dbg', 'libc-dbg') work?
regards,
Koen
>
> Then the package names undergo translation and I get:
>
> Provides: libc6-dbg
> Replaces: libc6-dbg
> Conflicts: libc6-dbg
>
> Which is clearly wrong. :(
>
> How would you recommend I provide backward compatibility for this
> change (assuming it is still seen as desirable?)
>
> Thanks for your comments.
>
> Mike.
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] libc-common: Apply Debian-naming to libc debug symbols too
2012-03-19 11:52 ` Mike Crowe
2012-03-19 11:59 ` Koen Kooi
@ 2012-03-19 12:03 ` Martin Jansa
1 sibling, 0 replies; 7+ messages in thread
From: Martin Jansa @ 2012-03-19 12:03 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 2484 bytes --]
On Mon, Mar 19, 2012 at 11:52:36AM +0000, Mike Crowe wrote:
> Op 16 mrt. 2012, om 17:32 heeft Mike Crowe het volgende geschreven:
> > > The magic in rootfs_ipk.bbclass expects to generate debug package
> > > names by just appending '-dbg'.
>
> It turns out that the above was a local change so that statement was
> incorrect. Nevertheless the change probably makes sense anyway.
>
> > > This breaks for eglibc because whilst
> > > the binary package has been renamed to libc6 the debug package is
> > > still called libc-dbg. This patch ensures that the debug package is
> > > renamed too.
> > > ---
> > > meta/classes/libc-common.bbclass | 1 +
> > > 1 files changed, 1 insertions(+), 0 deletions(-)
> > >
> > > diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass
> > > index 962f205..d0c1ab4 100644
> > > --- a/meta/classes/libc-common.bbclass
> > > +++ b/meta/classes/libc-common.bbclass
> > > @@ -27,4 +27,5 @@ python populate_packages_prepend () {
> > > bpn = d.getVar('BPN', True)
> > > d.setVar('PKG_'+bpn, 'libc6')
> > > d.setVar('PKG_'+bpn+'-dev', 'libc6-dev')
> > > + d.setVar('PKG_'+bpn+'-dbg', 'libc6-dbg')
> > > }
>
> On Fri, Mar 16, 2012 at 08:39:00PM +0100, Koen Kooi wrote:
> > Missing PR bump
>
> On eglibc?
>
> > and broken upgrade path.
>
> I'm having trouble coming up with a way to solve that. I think the
> libc6-dbg package needs to RPROVIDE, RREPLACE and RCONFLICT with
> libc-dbg but if I add the following:
>
> d.setVar('RPROVIDES_' + bpn + '-dbg', bpn + '-dbg')
> d.setVar('RCONFLICTS_' + bpn + '-dbg', bpn + '-dbg')
> d.setVar('RREPLACES_' + bpn + '-dbg', bpn + '-dbg')
try to hardcode "libc" instead of bpn in value if you want
Provides: libc-dbg
Replaces: libc-dbg
Conflicts: libc-dbg
>
> Then the package names undergo translation and I get:
>
> Provides: libc6-dbg
> Replaces: libc6-dbg
> Conflicts: libc6-dbg
>
> Which is clearly wrong. :(
>
> How would you recommend I provide backward compatibility for this
> change (assuming it is still seen as desirable?)
>
> Thanks for your comments.
>
> Mike.
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] libc-common: Apply Debian-naming to libc debug symbols too
2012-03-19 11:59 ` Koen Kooi
@ 2012-03-19 13:37 ` Mike Crowe
2012-03-20 17:27 ` Mike Crowe
0 siblings, 1 reply; 7+ messages in thread
From: Mike Crowe @ 2012-03-19 13:37 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Op 16 mrt. 2012, om 17:32 heeft Mike Crowe het volgende geschreven:
>>>> diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass
>>>> index 962f205..d0c1ab4 100644
>>>> --- a/meta/classes/libc-common.bbclass
>>>> +++ b/meta/classes/libc-common.bbclass
>>>> @@ -27,4 +27,5 @@ python populate_packages_prepend () {
>>>> bpn = d.getVar('BPN', True)
>>>> d.setVar('PKG_'+bpn, 'libc6')
>>>> d.setVar('PKG_'+bpn+'-dev', 'libc6-dev')
>>>> + d.setVar('PKG_'+bpn+'-dbg', 'libc6-dbg')
>>>> }
On Fri, Mar 16, 2012 at 08:39:00PM +0100, Koen Kooi wrote:
>>> Missing PR bump
Op 19 mrt. 2012, om 12:52 heeft Mike Crowe het volgende geschreven:
>> On eglibc?
On Mon, Mar 19, 2012 at 12:59:53PM +0100, Koen Kooi wrote:
> On everything that uses that class.
OK.
>>> and broken upgrade path.
>> I'm having trouble coming up with a way to solve that. I think the
>> libc6-dbg package needs to RPROVIDE, RREPLACE and RCONFLICT with
>> libc-dbg but if I add the following:
>>
>> d.setVar('RPROVIDES_' + bpn + '-dbg', bpn + '-dbg')
>> d.setVar('RCONFLICTS_' + bpn + '-dbg', bpn + '-dbg')
>> d.setVar('RREPLACES_' + bpn + '-dbg', bpn + '-dbg')
> Does d.setVar('RREPLACES_' + bpn + '-dbg', 'libc-dbg') work?
It seems to. Do I just need to set RREPLACES or all three?
Thanks.
Mike.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] libc-common: Apply Debian-naming to libc debug symbols too
2012-03-19 13:37 ` Mike Crowe
@ 2012-03-20 17:27 ` Mike Crowe
0 siblings, 0 replies; 7+ messages in thread
From: Mike Crowe @ 2012-03-20 17:27 UTC (permalink / raw)
To: openembedded-core; +Cc: Mike Crowe
Ensure that the eglibc-dbg package follows Debian naming too if
enabled. Retain backward compatibility with old libc-dbg naming.
Signed-off-by: Mike Crowe <mac@mcrowe.com>
---
meta/classes/libc-common.bbclass | 5 +++++
meta/recipes-core/eglibc/eglibc_2.13.bb | 2 +-
meta/recipes-core/eglibc/eglibc_2.15.bb | 1 +
3 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass
index 962f205..9b91f0a 100644
--- a/meta/classes/libc-common.bbclass
+++ b/meta/classes/libc-common.bbclass
@@ -27,4 +27,9 @@ python populate_packages_prepend () {
bpn = d.getVar('BPN', True)
d.setVar('PKG_'+bpn, 'libc6')
d.setVar('PKG_'+bpn+'-dev', 'libc6-dev')
+ d.setVar('PKG_'+bpn+'-dbg', 'libc6-dbg')
+ # For backward compatibility with old -dbg package
+ d.setVar('RPROVIDES_' + bpn + '-dbg', 'libc-dbg')
+ d.setVar('RCONFLICTS_' + bpn + '-dbg', 'libc-dbg')
+ d.setVar('RREPLACES_' + bpn + '-dbg', 'libc-dbg')
}
diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb
index e718a1f..a4f59b6 100644
--- a/meta/recipes-core/eglibc/eglibc_2.13.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.13.bb
@@ -3,7 +3,7 @@ require eglibc.inc
SRCREV = "15508"
DEPENDS += "gperf-native"
-PR = "r20"
+PR = "r21"
PR_append = "+svnr${SRCPV}"
EGLIBC_BRANCH="eglibc-2_13"
diff --git a/meta/recipes-core/eglibc/eglibc_2.15.bb b/meta/recipes-core/eglibc/eglibc_2.15.bb
index b4c1ea5..3820f5a 100644
--- a/meta/recipes-core/eglibc/eglibc_2.15.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.15.bb
@@ -3,6 +3,7 @@ require eglibc.inc
SRCREV = "16540"
DEPENDS += "gperf-native"
+PR = "r1"
PR_append = "+svnr${SRCPV}"
EGLIBC_BRANCH="eglibc-2_15"
--
1.7.9
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-03-20 17:36 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-16 16:32 [PATCH] libc-common: Apply Debian-naming to libc debug symbols too Mike Crowe
2012-03-16 19:39 ` Koen Kooi
2012-03-19 11:52 ` Mike Crowe
2012-03-19 11:59 ` Koen Kooi
2012-03-19 13:37 ` Mike Crowe
2012-03-20 17:27 ` Mike Crowe
2012-03-19 12:03 ` Martin Jansa
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.