diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-03-23 21:55:16 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-03-23 21:55:16 +0000 |
| commit | aa985c7142b76eb5f28e17ad540a6a0399d56f20 (patch) | |
| tree | 3fb93873990a50954d27ef2e0ac92a6d68e9a4da | |
| parent | 834d4ea7c3437b477c080ccc3e18a7197cf81990 (diff) | |
Fix the gtk+ and libmimedir builds, and a few cleanups elsewhere.
BKrev: 4060b244_wWIscmD0suOW04sJw7R1w
| -rw-r--r-- | gtk+/gtk+_2.2.4.oe | 4 | ||||
| -rw-r--r-- | ipkg-utils/ipkg-utils-native_1.6cvs.oe | 5 | ||||
| -rw-r--r-- | libmimedir/libmimedir_0.0-20040307.oe | 1 | ||||
| -rw-r--r-- | mtd/mtd.oe | 2 | ||||
| -rw-r--r-- | qplot/qplot_2.0.1cvs.oe | 2 |
5 files changed, 8 insertions, 6 deletions
diff --git a/gtk+/gtk+_2.2.4.oe b/gtk+/gtk+_2.2.4.oe index 8be4bb2a1e..eab6f950f0 100644 --- 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 f386930651..39a6343308 100644 --- 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 df887bd822..37d4eeb2cc 100644 --- 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 ac34f82782..facecd00b2 100644 --- 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 843afe7bee..1f3203496e 100644 --- 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" |