diff options
| -rw-r--r-- | packages/ipkg/files/enable_debversion.patch | 111 | ||||
| -rw-r--r-- | packages/ipkg/files/update_version_comparision.patch | 2 | ||||
| -rw-r--r-- | packages/ipkg/ipkg-native_0.99.163.bb | 3 | ||||
| -rw-r--r-- | packages/ipkg/ipkg.inc | 1 | ||||
| -rw-r--r-- | packages/ipkg/ipkg_0.99.163.bb | 2 | ||||
| -rw-r--r-- | packages/python/python-dbus/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/python/python-dbus/allow-older-autotools.patch | 27 | ||||
| -rw-r--r-- | packages/python/python-dbus/python-path.patch | 21 | ||||
| -rw-r--r-- | packages/python/python-dbus_0.82.4.bb (renamed from packages/python/python-dbus_0.81.1.bb) | 12 |
9 files changed, 122 insertions, 57 deletions
diff --git a/packages/ipkg/files/enable_debversion.patch b/packages/ipkg/files/enable_debversion.patch new file mode 100644 index 0000000000..e9c3a7a1d4 --- /dev/null +++ b/packages/ipkg/files/enable_debversion.patch @@ -0,0 +1,111 @@ +OE makes heavy use of the revision field so it makes sense to +enable it. We don't want the familiar stuff though so patch that +out. + +RP - 19/02/2008 + +Index: ipkg-0.99.163/pkg.c +=================================================================== +--- ipkg-0.99.163.orig/pkg.c 2008-02-19 00:35:03.000000000 +0000 ++++ ipkg-0.99.163/pkg.c 2008-02-19 00:36:02.000000000 +0000 +@@ -1118,15 +1118,11 @@ + return r; + } + +-#ifdef USE_DEBVERSION + r = verrevcmp(pkg->revision, ref_pkg->revision); + if (r) { + return r; + } + +- r = verrevcmp(pkg->familiar_revision, ref_pkg->familiar_revision); +-#endif +- + return r; + } + +@@ -1240,10 +1236,7 @@ + { + char *complete_version; + char *epoch_str; +-#ifdef USE_DEBVERSION + char *revision_str; +- char *familiar_revision_str; +-#endif + + if (pkg->epoch) { + sprintf_alloc(&epoch_str, "%d:", pkg->epoch); +@@ -1251,33 +1244,18 @@ + epoch_str = strdup(""); + } + +-#ifdef USE_DEBVERSION + if (pkg->revision && strlen(pkg->revision)) { + sprintf_alloc(&revision_str, "-%s", pkg->revision); + } else { + revision_str = strdup(""); + } + +- if (pkg->familiar_revision && strlen(pkg->familiar_revision)) { +- sprintf_alloc(&familiar_revision_str, "-fam%s", pkg->familiar_revision); +- } else { +- familiar_revision_str = strdup(""); +- } +-#endif + +-#ifdef USE_DEBVERSION +- sprintf_alloc(&complete_version, "%s%s%s%s", +- epoch_str, pkg->version, revision_str, familiar_revision_str); +-#else +- sprintf_alloc(&complete_version, "%s%s", +- epoch_str, pkg->version); +-#endif ++ sprintf_alloc(&complete_version, "%s%s%s", ++ epoch_str, pkg->version, revision_str); + + free(epoch_str); +-#ifdef USE_DEBVERSION + free(revision_str); +- free(familiar_revision_str); +-#endif + + return complete_version; + } +Index: ipkg-0.99.163/pkg_parse.c +=================================================================== +--- ipkg-0.99.163.orig/pkg_parse.c 2008-02-19 00:35:03.000000000 +0000 ++++ ipkg-0.99.163/pkg_parse.c 2008-02-19 00:38:42.000000000 +0000 +@@ -105,9 +105,7 @@ + int parseVersion(pkg_t *pkg, char *raw) + { + char *colon, *eepochcolon; +-#ifdef USE_DEBVERSION + char *hyphen; +-#endif + unsigned long epoch; + + if (!*raw) { +@@ -149,23 +147,12 @@ + } + strcpy(pkg->version, raw); + +-#ifdef USE_DEBVERSION + hyphen= strrchr(pkg->version,'-'); + + if (hyphen) { + *hyphen++= 0; +- if (strncmp("fam", hyphen, 3) == 0) { +- pkg->familiar_revision=hyphen+3; +- hyphen= strrchr(pkg->version,'-'); +- if (hyphen) { +- *hyphen++= 0; +- pkg->revision = hyphen; +- } +- } else { + pkg->revision = hyphen; +- } + } +-#endif + + /* + fprintf(stderr,"Parsed version: %lu, %s, %s, %s\n", diff --git a/packages/ipkg/files/update_version_comparision.patch b/packages/ipkg/files/update_version_comparision.patch index 9f617ef9f0..b0d0df525b 100644 --- a/packages/ipkg/files/update_version_comparision.patch +++ b/packages/ipkg/files/update_version_comparision.patch @@ -1,6 +1,8 @@ Update the version comparision to a more recent one from dpkg. This means it now recognises 0.0-foo > 0.0+foo as it should. +RP - 19/02/2008 + Index: ipkg-0.99.163/pkg.c =================================================================== --- ipkg-0.99.163.orig/pkg.c 2008-02-18 11:24:45.000000000 +0000 diff --git a/packages/ipkg/ipkg-native_0.99.163.bb b/packages/ipkg/ipkg-native_0.99.163.bb index 163eba62e2..dd9ff16b65 100644 --- a/packages/ipkg/ipkg-native_0.99.163.bb +++ b/packages/ipkg/ipkg-native_0.99.163.bb @@ -2,12 +2,13 @@ S = "${WORKDIR}/ipkg-${PV}" #require ipkg_${PV}.bb require ipkg-native.inc -PR = "r5" +PR = "r6" inherit autotools pkgconfig native SRC_URI = "http://www.handhelds.org/pub/packages/ipkg/ipkg-${PV}.tar.gz \ file://update_version_comparision.patch;patch=1 \ + file://enable_debversion.patch;patch=1 \ file://is-processing.patch;patch=1 \ file://1-pkg-parse--Optimize-inefficient-parsing.patch;patch=1 \ file://2-pkg-vec--Optimize-gross-inefficiency.patch;patch=1 \ diff --git a/packages/ipkg/ipkg.inc b/packages/ipkg/ipkg.inc index 980a4265bd..ee5da71c22 100644 --- a/packages/ipkg/ipkg.inc +++ b/packages/ipkg/ipkg.inc @@ -11,6 +11,7 @@ AUTO_LIBNAME_PKGS = "libipkg" SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \ file://update_version_comparision.patch;patch=1 \ + file://enable_debversion.patch;patch=1 \ file://ipkg-configure \ file://terse.patch;patch=1" diff --git a/packages/ipkg/ipkg_0.99.163.bb b/packages/ipkg/ipkg_0.99.163.bb index f2d7652b89..f546f6e6c8 100644 --- a/packages/ipkg/ipkg_0.99.163.bb +++ b/packages/ipkg/ipkg_0.99.163.bb @@ -1,5 +1,5 @@ include ipkg.inc -PR = "r7" +PR = "r8" S = "${WORKDIR}/ipkg-${PV}" diff --git a/packages/python/python-dbus/.mtn2git_empty b/packages/python/python-dbus/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/python/python-dbus/.mtn2git_empty +++ /dev/null diff --git a/packages/python/python-dbus/allow-older-autotools.patch b/packages/python/python-dbus/allow-older-autotools.patch deleted file mode 100644 index 7595f70e5d..0000000000 --- a/packages/python/python-dbus/allow-older-autotools.patch +++ /dev/null @@ -1,27 +0,0 @@ -# -# so it looks like dbus-python really doesn't make use of any 2.59c features -# Signed-Off: mickey@openmoko.org -# -Index: dbus-python-0.81.1/configure.ac -=================================================================== ---- dbus-python-0.81.1.orig/configure.ac 2007-06-04 13:17:10.000000000 +0000 -+++ dbus-python-0.81.1/configure.ac 2007-06-11 06:57:20.000000000 +0000 -@@ -1,5 +1,5 @@ - -*- mode: m4 -*- --AC_PREREQ(2.59c) -+AC_PREREQ(2.59) - - dnl If not 1, append datestamp to the version number - m4_define(dbus_python_released, 1) -Index: dbus-python-0.81.1/Makefile.am -=================================================================== ---- dbus-python-0.81.1.orig/Makefile.am 2007-05-09 09:44:40.000000000 +0000 -+++ dbus-python-0.81.1/Makefile.am 2007-06-11 06:59:23.000000000 +0000 -@@ -38,6 +38,7 @@ - - TXT_RSTDOCS = doc/tutorial.txt doc/API_CHANGES.txt doc/HACKING.txt - RSTDOCS = README NEWS TODO -+docdir=foo - dist_doc_DATA = $(TXT_RSTDOCS) $(RSTDOCS) - - maintainer-update-website: _maintainer-update-apidocs \ diff --git a/packages/python/python-dbus/python-path.patch b/packages/python/python-dbus/python-path.patch deleted file mode 100644 index 6bdbd19d03..0000000000 --- a/packages/python/python-dbus/python-path.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- dbus-python-0.81.1/m4.orig/am-check-python-headers.m4 -+++ dbus-python-0.81.1/m4/am-check-python-headers.m4 -@@ -7214,12 +7214,18 @@ - [AC_REQUIRE([AM_PATH_PYTHON]) - AC_MSG_CHECKING(for headers required to compile python extensions) - dnl deduce PYTHON_INCLUDES -+AC_ARG_WITH(python-includes, -+ [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval) -+if test x$py_exec_prefix != x; then -+PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}" -+else - py_prefix=`$PYTHON -c "import sys; print sys.prefix"` - py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` - PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" - if test "$py_prefix" != "$py_exec_prefix"; then - PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" - fi -+fi - AC_SUBST(PYTHON_INCLUDES) - dnl check if the headers exist: - save_CPPFLAGS="$CPPFLAGS" diff --git a/packages/python/python-dbus_0.81.1.bb b/packages/python/python-dbus_0.82.4.bb index 86628bad26..9f00c64701 100644 --- a/packages/python/python-dbus_0.81.1.bb +++ b/packages/python/python-dbus_0.82.4.bb @@ -1,20 +1,18 @@ DESCRIPTION = "Python bindings for DBus, a socket-based message bus system for interprocess communication" SECTION = "devel/python" HOMEPAGE = "http://www.freedesktop.org/Software/dbus" -LICENSE = "GPL" +LICENSE = "MIT" DEPENDS = "expat glib-2.0 virtual/libintl python-pyrex-native python" RDEPENDS = "dbus python-threading python-io python-stringold python-logging" -PR = "ml2" - -SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz \ - file://allow-older-autotools.patch;patch=1 \ - file://python-path.patch;patch=1" +PR = "ml0" +SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz" S = "${WORKDIR}/dbus-python-${PV}" inherit distutils-base autotools -EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" +export BUILD_SYS := "${BUILD_SYS}" +export HOST_SYS := "${HOST_SYS}" do_stage() { autotools_stage_all |