apply misc. packaging patches courtesy Philip Blundell

BKrev: 4066c0c1GbB5MlJ52Kb-TsfEZj5lxQ

diff --git a/db/db3_3.2.9.oe b/db/db3_3.2.9.oe
index a92c0af..c95cd51 100644 (file)
--- a/db/db3_3.2.9.oe
+++ b/db/db3_3.2.9.oe
@@ -13,8 +13,11 @@ EXTRA_OEMAKE = "'SHELL=/bin/sh' 'ar=`which ${AR}` cr' 'chmod=`which chmod`' \
                'cp=`which cp`' 'ln=`which ln`' 'mkdir=`which mkdir`' 'ranlib=`which ${RANLIB}`' \
                'rm=`which rm`' 'strip=`which ${STRIP}`'"
 
-FILES_${PN} = "${bindir} ${libdir}/libdb-3.2*"
-FILES_${PN}-dev = "${includedir} ${libdir}/libdb.so ${libdir}/libdb.a ${libdir}/libdb-3.so"
+PACKAGES = "${PN} ${PN}-bin ${PN}-dev ${PN}-doc ${PN}-locale"
+
+FILES_${PN} = "${libdir}/libdb-3.2*so*"
+FILES_${PN}-bin = "${bindir}"
+FILES_${PN}-dev = "${includedir} ${libdir}/libdb.so ${libdir}/libdb.a ${libdir}/libdb-3.so ${libdir}/libdb.la"
 
 do_configure_prepend () {
        set -e
@@ -80,3 +83,8 @@ do_install () {
                install
        done
 }
+
+python do_package_prepend() {
+       if oe.data.getVar('DEBIAN_NAMES', d, 1):
+               oe.data.setVar('PKG_${PN}', 'libdb3', d)
+}

diff --git a/gcc/gcc-cross_3.3.3.oe b/gcc/gcc-cross_3.3.3.oe
index 1dac954..4aae2b6 100644 (file)
--- a/gcc/gcc-cross_3.3.3.oe
+++ b/gcc/gcc-cross_3.3.3.oe
@@ -72,6 +72,11 @@ do_stage_append () {
        rm -rf ${CROSS_DIR}/share
 }
 
+python do_package_prepend() {
+       if oe.data.getVar('DEBIAN_NAMES', d, 1):
+               oe.data.setVar('PKG_libgcc', 'libgcc1', d)
+}
+
 do_install () {
        oe_runmake 'DESTDIR=${D}' install
 

diff --git a/glibc/glibc_2.3.2.oe b/glibc/glibc_2.3.2.oe
index a9ebefb..4d91dc0 100644 (file)
--- a/glibc/glibc_2.3.2.oe
+++ b/glibc/glibc_2.3.2.oe
@@ -209,3 +209,8 @@ do_install() {
                install -m 0644 ${S}/sunrpc/rpcsvc/$h ${D}/${includedir}/rpcsvc/
        done
 }
+
+python do_package_prepend() {
+       if oe.data.getVar('DEBIAN_NAMES', d, 1):
+               oe.data.setVar('PKG_${PN}', 'libc6', d)
+}

diff --git a/libpng/libpng_1.2.5.oe b/libpng/libpng_1.2.5.oe
index 91e0b68..e76d8e6 100644 (file)
--- a/libpng/libpng_1.2.5.oe
+++ b/libpng/libpng_1.2.5.oe
@@ -3,8 +3,6 @@ SECTION = "libs"
 PRIORITY = "required"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DEPENDS = "virtual/libc base/zlib"
-RDEPENDS = "libc6 zlib1g"
-RDEPENDS_append_libpng3 = " libpng12"
 
 FILES_${PN} = ${libdir}/lib*.so.*
 FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
@@ -42,3 +40,8 @@ do_install () {
                   'DL=${D}/${libdir}' 'DM=${D}/${mandir}' \
                   install
 }
+
+python do_package_prepend() {
+       if oe.data.getVar('DEBIAN_NAMES', d, 1):
+               oe.data.setVar('PKG_${PN}', 'libpng12', d)
+}