Skip to contentSkip to conversation

Package gdbm compat libs in gdbm-compat and PR bumps

PATCH Applied Andrei Gherzan 3 participants 6 messages Apr 13, 2012

lore
Share & tools
lore
#0 lore raw

v5 cover Package gdbm compat libs in gdbm-compat and PR bumps

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(-)
Signature · 1 line
1.7.5.4
#1 lore raw

PATCH v5 1/2 gdbm: Package compat libs in gdbm-compat

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.

---
 meta/recipes-support/gdbm/gdbm_1.10.bb |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
meta/recipes-support/gdbm/gdbm_1.10.bb +6 -1
index 26b8009..6b68d27 100644
@@ -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} \
+                     "
Signature · 1 line
1.7.5.4
#2 lore raw

PATCH v5 2/2 PR bump packages with gdbm in DEPENDS

This is done because of this change in gdbm:
"gdbm: Package compat libs in gdbm-compat"

---
 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(-)
meta/recipes-devtools/perl/perl_5.14.2.bb +1 -1
index 92ca9b8..8f3ad25 100644
@@ -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"
meta/recipes-devtools/python/python_2.7.2.bb +1 -1
index d1d0d83..0a1708a 100644
@@ -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 = ""
meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb +1 -1
index e98a591..fd61149 100644
@@ -1,6 +1,6 @@
 require pulseaudio.inc
 
-PR = "r7"
+PR = "r8"
 
 DEPENDS += "libjson gdbm speex libxml-parser-perl-native"
 
meta/recipes-support/apr/apr-util_1.4.1.bb +1 -1
index 029cf7e..deb608f 100644
@@ -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 \
Signature · 1 line
1.7.5.4
Acked-by on v5 2/2
#3 lore raw

Re: [V5 2/2] PR bump packages with gdbm in DEPENDS

Quoted 4 lines · Andrei Gherzan

This is done because of this change in gdbm:
"gdbm: Package compat libs in gdbm-compat"

Quoted 65 lines
---
 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(-)
meta/recipes-devtools/perl/perl_5.14.2.bb +1 -1
index 92ca9b8..8f3ad25 100644
@@ -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"
meta/recipes-devtools/python/python_2.7.2.bb +1 -1
index d1d0d83..0a1708a 100644
@@ -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 = ""
meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb +1 -1
index e98a591..fd61149 100644
@@ -1,6 +1,6 @@
 require pulseaudio.inc
 
-PR = "r7"
+PR = "r8"
 
 DEPENDS += "libjson gdbm speex libxml-parser-perl-native"
 
meta/recipes-support/apr/apr-util_1.4.1.bb +1 -1
index 029cf7e..deb608f 100644
@@ -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 \
Signature · 7 lines
1.7.5.4


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
Acked-by on v5 1/2
#4 lore raw

Re: [V5 1/2] gdbm: Package compat libs in gdbm-compat

In reply to Andrei Gherzan
Quoted 4 lines · Andrei Gherzan

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.

Quoted 34 lines
---
 meta/recipes-support/gdbm/gdbm_1.10.bb |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
meta/recipes-support/gdbm/gdbm_1.10.bb +6 -1
index 26b8009..6b68d27 100644
@@ -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} \
+                     "
Signature · 7 lines
1.7.5.4


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
Applied
#5 lore raw
In reply to Andrei Gherzan
Quoted 15 lines · Andrei Gherzan

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

Quoted 7 lines
  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!