[oe-commits] org.oe.dev merge of '694c143930f178ea5ccba7d4b239f54693907dfd'
rpurdie commit
openembedded-commits at lists.openembedded.org
Tue Feb 19 06:50:26 UTC 2008
merge of '694c143930f178ea5ccba7d4b239f54693907dfd'
and '9a5c15be9874f0b2b7306eef34bbc113197516e3'
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: dc78fa6fb30bfacc4b6c6b5d3387729f9555401e
ViewMTN: http://monotone.openembedded.org/revision/info/dc78fa6fb30bfacc4b6c6b5d3387729f9555401e
Files:
1
packages/python/python-dbus
packages/python/python-dbus/allow-older-autotools.patch
packages/python/python-dbus/python-path.patch
packages/python/python-dbus_0.81.1.bb
packages/python/python-dbus_0.82.4.bb
packages/ipkg/files/enable_debversion.patch
packages/ipkg/files/update_version_comparision.patch
packages/ipkg/ipkg-native_0.99.163.bb
packages/ipkg/ipkg.inc
packages/ipkg/ipkg_0.99.163.bb
Diffs:
#
# mt diff -r694c143930f178ea5ccba7d4b239f54693907dfd -rdc78fa6fb30bfacc4b6c6b5d3387729f9555401e
#
#
#
# delete "packages/python/python-dbus"
#
# delete "packages/python/python-dbus/allow-older-autotools.patch"
#
# delete "packages/python/python-dbus/python-path.patch"
#
# rename "packages/python/python-dbus_0.81.1.bb"
# to "packages/python/python-dbus_0.82.4.bb"
#
# add_file "packages/ipkg/files/enable_debversion.patch"
# content [cfd1c8fd5cad184b93ed62423f5d2cc8d5cbbeb4]
#
# patch "packages/ipkg/files/update_version_comparision.patch"
# from [b940420d7d71ccae026536ddf7f2c5c503485a9d]
# to [b27a147719155ca75d7585e69ef2e15235abdcbc]
#
# patch "packages/ipkg/ipkg-native_0.99.163.bb"
# from [a204f18c290c5da4e91d8300e8461c07ebc1795e]
# to [0d7e87a2e2f66d624a7e034690d53d974ae9e57e]
#
# patch "packages/ipkg/ipkg.inc"
# from [24a763cc5bb1e3e620137a13ec1a20d94c5f06a8]
# to [332bfe0f61d6c8443783d20a9719146515a88286]
#
# patch "packages/ipkg/ipkg_0.99.163.bb"
# from [3bd38599bcc9677fbd8d3f25e54fb498786d46f2]
# to [262c4c75aad0d5ab5de6232839bec4f9a98e15d3]
#
# patch "packages/python/python-dbus_0.82.4.bb"
# from [c5e18d63589267e732b6a661f4047e5c7e9d1fa0]
# to [265ecdc8752ede90876f5c5e513aa9a60ff60100]
#
============================================================
--- packages/ipkg/files/enable_debversion.patch cfd1c8fd5cad184b93ed62423f5d2cc8d5cbbeb4
+++ packages/ipkg/files/enable_debversion.patch cfd1c8fd5cad184b93ed62423f5d2cc8d5cbbeb4
@@ -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",
============================================================
--- packages/ipkg/files/update_version_comparision.patch b940420d7d71ccae026536ddf7f2c5c503485a9d
+++ packages/ipkg/files/update_version_comparision.patch b27a147719155ca75d7585e69ef2e15235abdcbc
@@ -1,6 +1,8 @@ means it now recognises 0.0-foo > 0.0+fo
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
============================================================
--- packages/ipkg/ipkg-native_0.99.163.bb a204f18c290c5da4e91d8300e8461c07ebc1795e
+++ packages/ipkg/ipkg-native_0.99.163.bb 0d7e87a2e2f66d624a7e034690d53d974ae9e57e
@@ -1,13 +1,14 @@ require ipkg-native.inc
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 \
============================================================
--- packages/ipkg/ipkg.inc 24a763cc5bb1e3e620137a13ec1a20d94c5f06a8
+++ packages/ipkg/ipkg.inc 332bfe0f61d6c8443783d20a9719146515a88286
@@ -11,6 +11,7 @@ SRC_URI = "${HANDHELDS_CVS};module=famil
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"
============================================================
--- packages/ipkg/ipkg_0.99.163.bb 3bd38599bcc9677fbd8d3f25e54fb498786d46f2
+++ packages/ipkg/ipkg_0.99.163.bb 262c4c75aad0d5ab5de6232839bec4f9a98e15d3
@@ -1,5 +1,5 @@ include ipkg.inc
include ipkg.inc
-PR = "r7"
+PR = "r8"
S = "${WORKDIR}/ipkg-${PV}"
============================================================
--- packages/python/python-dbus_0.81.1.bb c5e18d63589267e732b6a661f4047e5c7e9d1fa0
+++ packages/python/python-dbus_0.82.4.bb 265ecdc8752ede90876f5c5e513aa9a60ff60100
@@ -1,20 +1,18 @@ HOMEPAGE = "http://www.freedesktop.org/S
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"
+PR = "ml0"
-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"
-
+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
#
# mt diff -r9a5c15be9874f0b2b7306eef34bbc113197516e3 -rdc78fa6fb30bfacc4b6c6b5d3387729f9555401e
#
#
# no changes
#
More information about the Openembedded-commits
mailing list