Fix the gtk+ and libmimedir builds, and a few cleanups elsewhere.

BKrev: 4060b244_wWIscmD0suOW04sJw7R1w

diff --git a/gtk+/gtk+_2.2.4.oe b/gtk+/gtk+_2.2.4.oe
index 8be4bb2..eab6f95 100644 (file)
--- a/gtk+/gtk+_2.2.4.oe
+++ b/gtk+/gtk+_2.2.4.oe
@@ -67,7 +67,7 @@ do_stage () {
        install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DIR}/share/aclocal/
 }
 
-python do_package_prepend() {
+python do_package () {
        def do_split(root, pattern, format, description):
                dvar = data.getVar('D', d, 1)
                if not dvar:
@@ -106,4 +106,6 @@ python do_package_prepend() {
 
        do_split(loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s')
        do_split(immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s')
+
+       oe.build.exec_func("base_do_package", d)
 }

diff --git a/ipkg-utils/ipkg-utils-native_1.6cvs.oe b/ipkg-utils/ipkg-utils-native_1.6cvs.oe
index f386930..39a6343 100644 (file)
--- a/ipkg-utils/ipkg-utils-native_1.6cvs.oe
+++ b/ipkg-utils/ipkg-utils-native_1.6cvs.oe
@@ -1,8 +1,7 @@
 include ipkg-utils_${PV}.oe
 inherit native
-DEPENDS = python-native
-PACKAGES =
-
+DEPENDS = "python-native"
+PACKAGES = ""
 
 do_stage() {
        cp ipkg* ${STAGING_BINDIR}/

diff --git a/libmimedir/libmimedir_0.0-20040307.oe b/libmimedir/libmimedir_0.0-20040307.oe
index df887bd..37d4eeb 100644 (file)
--- a/libmimedir/libmimedir_0.0-20040307.oe
+++ b/libmimedir/libmimedir_0.0-20040307.oe
@@ -21,5 +21,6 @@ do_stage() {
        done
 
        oe_soinstall mimedir/.libs/${libname} ${STAGING_LIBDIR}/
+       ln -sf ${libname} ${STAGING_LIBDIR}/libmimedir.so
        install -m 0755 mimedir/libmimedir.la ${STAGING_LIBDIR}/
 }

diff --git a/mtd/mtd.oe b/mtd/mtd.oe
index ac34f82..facecd0 100644 (file)
--- a/mtd/mtd.oe
+++ b/mtd/mtd.oe
@@ -1,7 +1,7 @@
 DEPENDS = "virtual/libc zlib"
 RDEPENDS = "libc6 zlib1g"
 DESCRIPTION = "Tools for managing memory technology devices."
-PV = "${@os.popen("date +%Y%m%d").readline().strip()}"
+PV = "${CVSDATE}"
 
 S = "${WORKDIR}/mtd/util"
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.infradead.org/home/cvs;module=mtd"

diff --git a/qplot/qplot_2.0.1cvs.oe b/qplot/qplot_2.0.1cvs.oe
index 843afe7..1f32034 100644 (file)
--- a/qplot/qplot_2.0.1cvs.oe
+++ b/qplot/qplot_2.0.1cvs.oe
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 RDEPENDS = "libqpe1"
 DEPENDS = "virtual/libc"
 
-SRC_URI = "cvs://anonymous@cvs.qplot.sourceforge.net/cvsroot/qplot;module=qplot;tag=HEAD \
+SRC_URI = "cvs://anonymous@cvs.qplot.sourceforge.net/cvsroot/qplot;module=qplot \
            file://${FILESDIR}/gcc3.patch;patch=1"
 S = "${WORKDIR}/qplot"