* [V5 0/2] Package gdbm compat libs in gdbm-compat and PR bumps
@ 2012-04-13 10:33 Andrei Gherzan
2012-04-13 10:34 ` [V5 1/2] gdbm: Package compat libs in gdbm-compat Andrei Gherzan
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Andrei Gherzan @ 2012-04-13 10:33 UTC (permalink / raw)
To: openembedded-core
V4 had some commits sent to oe-core and are not merged and forgot about
those. This led to a confict in python bb file.
The following changes since commit 6703173449ad21e1623ac75a66535cb2ed52aeeb:
package_rpm.bbclass: Set tmppath for rpm to somewhere which won't conflict with the rootfs (2012-04-12 21:25:10 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib ag/gdbm
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ag/gdbm
Andrei Gherzan (2):
gdbm: Package compat libs in gdbm-compat
PR bump packages with gdbm in DEPENDS
meta/recipes-devtools/perl/perl_5.14.2.bb | 2 +-
meta/recipes-devtools/python/python_2.7.2.bb | 2 +-
.../pulseaudio/pulseaudio_1.1.bb | 2 +-
meta/recipes-support/apr/apr-util_1.4.1.bb | 2 +-
meta/recipes-support/gdbm/gdbm_1.10.bb | 7 ++++++-
5 files changed, 10 insertions(+), 5 deletions(-)
--
1.7.5.4
^ permalink raw reply [flat|nested] 6+ messages in thread* [V5 1/2] gdbm: Package compat libs in gdbm-compat 2012-04-13 10:33 [V5 0/2] Package gdbm compat libs in gdbm-compat and PR bumps Andrei Gherzan @ 2012-04-13 10:34 ` Andrei Gherzan 2012-04-13 12:33 ` Martin Jansa 2012-04-13 10:34 ` [V5 2/2] PR bump packages with gdbm in DEPENDS Andrei Gherzan 2012-04-13 22:18 ` [V5 0/2] Package gdbm compat libs in gdbm-compat and PR bumps Saul Wold 2 siblings, 1 reply; 6+ messages in thread From: Andrei Gherzan @ 2012-04-13 10:34 UTC (permalink / raw) To: openembedded-core In order to avoid breaking packages which depend on old package name libgdbm4 (>= 1.10), compat libs are packaged into a separate package named gdbm-compat. Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> --- meta/recipes-support/gdbm/gdbm_1.10.bb | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/meta/recipes-support/gdbm/gdbm_1.10.bb b/meta/recipes-support/gdbm/gdbm_1.10.bb index 26b8009..6b68d27 100644 --- a/meta/recipes-support/gdbm/gdbm_1.10.bb +++ b/meta/recipes-support/gdbm/gdbm_1.10.bb @@ -4,7 +4,7 @@ SECTION = "libs" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=241da1b9fe42e642cbb2c24d5e0c4d24" -PR = "r2" +PR = "r3" SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz" @@ -25,3 +25,8 @@ do_install_append () { ln -sf ../ndbm.h ${D}/${includedir}/gdbm/ndbm.h ln -sf ../gdbm.h ${D}/${includedir}/gdbm/gdbm.h } + +PACKAGES =+ "${PN}-compat \ + " +FILES_${PN}-compat = "${libdir}/libgdbm_compat${SOLIBS} \ + " -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [V5 1/2] gdbm: Package compat libs in gdbm-compat 2012-04-13 10:34 ` [V5 1/2] gdbm: Package compat libs in gdbm-compat Andrei Gherzan @ 2012-04-13 12:33 ` Martin Jansa 0 siblings, 0 replies; 6+ messages in thread From: Martin Jansa @ 2012-04-13 12:33 UTC (permalink / raw) To: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 1511 bytes --] On Fri, Apr 13, 2012 at 01:34:18PM +0300, Andrei Gherzan wrote: > In order to avoid breaking packages which depend on old package name libgdbm4 (>= 1.10), > compat libs are packaged into a separate package named gdbm-compat. > > Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> Acked-by: Martin Jansa <Martin.Jansa@gmail.com> > --- > meta/recipes-support/gdbm/gdbm_1.10.bb | 7 ++++++- > 1 files changed, 6 insertions(+), 1 deletions(-) > > diff --git a/meta/recipes-support/gdbm/gdbm_1.10.bb b/meta/recipes-support/gdbm/gdbm_1.10.bb > index 26b8009..6b68d27 100644 > --- a/meta/recipes-support/gdbm/gdbm_1.10.bb > +++ b/meta/recipes-support/gdbm/gdbm_1.10.bb > @@ -4,7 +4,7 @@ SECTION = "libs" > LICENSE = "GPLv3" > LIC_FILES_CHKSUM = "file://COPYING;md5=241da1b9fe42e642cbb2c24d5e0c4d24" > > -PR = "r2" > +PR = "r3" > > SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz" > > @@ -25,3 +25,8 @@ do_install_append () { > ln -sf ../ndbm.h ${D}/${includedir}/gdbm/ndbm.h > ln -sf ../gdbm.h ${D}/${includedir}/gdbm/gdbm.h > } > + > +PACKAGES =+ "${PN}-compat \ > + " > +FILES_${PN}-compat = "${libdir}/libgdbm_compat${SOLIBS} \ > + " > -- > 1.7.5.4 > > > _______________________________________________ > 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] 6+ messages in thread
* [V5 2/2] PR bump packages with gdbm in DEPENDS 2012-04-13 10:33 [V5 0/2] Package gdbm compat libs in gdbm-compat and PR bumps Andrei Gherzan 2012-04-13 10:34 ` [V5 1/2] gdbm: Package compat libs in gdbm-compat Andrei Gherzan @ 2012-04-13 10:34 ` Andrei Gherzan 2012-04-13 12:33 ` Martin Jansa 2012-04-13 22:18 ` [V5 0/2] Package gdbm compat libs in gdbm-compat and PR bumps Saul Wold 2 siblings, 1 reply; 6+ messages in thread From: Andrei Gherzan @ 2012-04-13 10:34 UTC (permalink / raw) To: openembedded-core This is done because of this change in gdbm: "gdbm: Package compat libs in gdbm-compat" Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> --- meta/recipes-devtools/perl/perl_5.14.2.bb | 2 +- meta/recipes-devtools/python/python_2.7.2.bb | 2 +- .../pulseaudio/pulseaudio_1.1.bb | 2 +- meta/recipes-support/apr/apr-util_1.4.1.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb index 92ca9b8..8f3ad25 100644 --- a/meta/recipes-devtools/perl/perl_5.14.2.bb +++ b/meta/recipes-devtools/perl/perl_5.14.2.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \ # We need gnugrep (for -I) DEPENDS = "virtual/db grep-native" DEPENDS += "gdbm zlib" -PR = "r4" +PR = "r5" # 5.10.1 has Module::Build built-in PROVIDES += "libmodule-build-perl" diff --git a/meta/recipes-devtools/python/python_2.7.2.bb b/meta/recipes-devtools/python/python_2.7.2.bb index d1d0d83..0a1708a 100644 --- a/meta/recipes-devtools/python/python_2.7.2.bb +++ b/meta/recipes-devtools/python/python_2.7.2.bb @@ -1,6 +1,6 @@ require python.inc DEPENDS = "python-native bzip2 db gdbm openssl readline sqlite3 zlib" -PR = "${INC_PR}.10" +PR = "${INC_PR}.11" DISTRO_SRC_URI ?= "file://sitecustomize.py" DISTRO_SRC_URI_linuxstdbase = "" diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb index e98a591..fd61149 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb @@ -1,6 +1,6 @@ require pulseaudio.inc -PR = "r7" +PR = "r8" DEPENDS += "libjson gdbm speex libxml-parser-perl-native" diff --git a/meta/recipes-support/apr/apr-util_1.4.1.bb b/meta/recipes-support/apr/apr-util_1.4.1.bb index 029cf7e..deb608f 100644 --- a/meta/recipes-support/apr/apr-util_1.4.1.bb +++ b/meta/recipes-support/apr/apr-util_1.4.1.bb @@ -9,7 +9,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=519e0a18e03f7c023070568c14b077bb \ file://include/apu_version.h;endline=17;md5=806685a84e71f10c80144c48eb35df42" -PR = "r0" +PR = "r1" SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \ file://configfix.patch \ -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [V5 2/2] PR bump packages with gdbm in DEPENDS 2012-04-13 10:34 ` [V5 2/2] PR bump packages with gdbm in DEPENDS Andrei Gherzan @ 2012-04-13 12:33 ` Martin Jansa 0 siblings, 0 replies; 6+ messages in thread From: Martin Jansa @ 2012-04-13 12:33 UTC (permalink / raw) To: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 2957 bytes --] On Fri, Apr 13, 2012 at 01:34:19PM +0300, Andrei Gherzan wrote: > This is done because of this change in gdbm: > "gdbm: Package compat libs in gdbm-compat" > > Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> Acked-by: Martin Jansa <Martin.Jansa@gmail.com> > --- > meta/recipes-devtools/perl/perl_5.14.2.bb | 2 +- > meta/recipes-devtools/python/python_2.7.2.bb | 2 +- > .../pulseaudio/pulseaudio_1.1.bb | 2 +- > meta/recipes-support/apr/apr-util_1.4.1.bb | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb > index 92ca9b8..8f3ad25 100644 > --- a/meta/recipes-devtools/perl/perl_5.14.2.bb > +++ b/meta/recipes-devtools/perl/perl_5.14.2.bb > @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \ > # We need gnugrep (for -I) > DEPENDS = "virtual/db grep-native" > DEPENDS += "gdbm zlib" > -PR = "r4" > +PR = "r5" > > # 5.10.1 has Module::Build built-in > PROVIDES += "libmodule-build-perl" > diff --git a/meta/recipes-devtools/python/python_2.7.2.bb b/meta/recipes-devtools/python/python_2.7.2.bb > index d1d0d83..0a1708a 100644 > --- a/meta/recipes-devtools/python/python_2.7.2.bb > +++ b/meta/recipes-devtools/python/python_2.7.2.bb > @@ -1,6 +1,6 @@ > require python.inc > DEPENDS = "python-native bzip2 db gdbm openssl readline sqlite3 zlib" > -PR = "${INC_PR}.10" > +PR = "${INC_PR}.11" > > DISTRO_SRC_URI ?= "file://sitecustomize.py" > DISTRO_SRC_URI_linuxstdbase = "" > diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb > index e98a591..fd61149 100644 > --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb > +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb > @@ -1,6 +1,6 @@ > require pulseaudio.inc > > -PR = "r7" > +PR = "r8" > > DEPENDS += "libjson gdbm speex libxml-parser-perl-native" > > diff --git a/meta/recipes-support/apr/apr-util_1.4.1.bb b/meta/recipes-support/apr/apr-util_1.4.1.bb > index 029cf7e..deb608f 100644 > --- a/meta/recipes-support/apr/apr-util_1.4.1.bb > +++ b/meta/recipes-support/apr/apr-util_1.4.1.bb > @@ -9,7 +9,7 @@ LICENSE = "Apache-2.0" > LIC_FILES_CHKSUM = "file://LICENSE;md5=519e0a18e03f7c023070568c14b077bb \ > file://include/apu_version.h;endline=17;md5=806685a84e71f10c80144c48eb35df42" > > -PR = "r0" > +PR = "r1" > > SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \ > file://configfix.patch \ > -- > 1.7.5.4 > > > _______________________________________________ > 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] 6+ messages in thread
* Re: [V5 0/2] Package gdbm compat libs in gdbm-compat and PR bumps 2012-04-13 10:33 [V5 0/2] Package gdbm compat libs in gdbm-compat and PR bumps Andrei Gherzan 2012-04-13 10:34 ` [V5 1/2] gdbm: Package compat libs in gdbm-compat Andrei Gherzan 2012-04-13 10:34 ` [V5 2/2] PR bump packages with gdbm in DEPENDS Andrei Gherzan @ 2012-04-13 22:18 ` Saul Wold 2 siblings, 0 replies; 6+ messages in thread From: Saul Wold @ 2012-04-13 22:18 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On 04/13/2012 03:33 AM, Andrei Gherzan wrote: > V4 had some commits sent to oe-core and are not merged and forgot about > those. This led to a confict in python bb file. > > The following changes since commit 6703173449ad21e1623ac75a66535cb2ed52aeeb: > > package_rpm.bbclass: Set tmppath for rpm to somewhere which won't conflict with the rootfs (2012-04-12 21:25:10 +0100) > > are available in the git repository at: > git://git.yoctoproject.org/poky-contrib ag/gdbm > http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ag/gdbm > > Andrei Gherzan (2): > gdbm: Package compat libs in gdbm-compat > PR bump packages with gdbm in DEPENDS > > meta/recipes-devtools/perl/perl_5.14.2.bb | 2 +- > meta/recipes-devtools/python/python_2.7.2.bb | 2 +- > .../pulseaudio/pulseaudio_1.1.bb | 2 +- > meta/recipes-support/apr/apr-util_1.4.1.bb | 2 +- > meta/recipes-support/gdbm/gdbm_1.10.bb | 7 ++++++- > 5 files changed, 10 insertions(+), 5 deletions(-) > Merged into OE-Core Thanks Sau! ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-04-13 22:28 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-04-13 10:33 [V5 0/2] Package gdbm compat libs in gdbm-compat and PR bumps Andrei Gherzan 2012-04-13 10:34 ` [V5 1/2] gdbm: Package compat libs in gdbm-compat Andrei Gherzan 2012-04-13 12:33 ` Martin Jansa 2012-04-13 10:34 ` [V5 2/2] PR bump packages with gdbm in DEPENDS Andrei Gherzan 2012-04-13 12:33 ` Martin Jansa 2012-04-13 22:18 ` [V5 0/2] Package gdbm compat libs in gdbm-compat and PR bumps Saul Wold
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox