[oe-commits] org.oe.dev merge of '328e55791e71db3003684a8030a9577de72e294a'
rpurdie commit
openembedded-commits at lists.openembedded.org
Tue Feb 19 06:50:19 UTC 2008
merge of '328e55791e71db3003684a8030a9577de72e294a'
and 'd4732f85d42b87e990dd3cdfed1c9d40f04ff5e8'
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 9a5c15be9874f0b2b7306eef34bbc113197516e3
ViewMTN: http://monotone.openembedded.org/revision/info/9a5c15be9874f0b2b7306eef34bbc113197516e3
Files:
1
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
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/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch
packages/xorg-xserver/files/fix-picturestr-include-order.patch
conf/machine/nokia770.conf
packages/maemo4/hildon-thumbnail_0.14.bb
packages/maemo4/libhildonmime_1.10.0.bb
packages/maemo4/libosso.inc
packages/xorg-proto/renderproto_0.9.3.bb
packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
Diffs:
#
# mt diff -r328e55791e71db3003684a8030a9577de72e294a -r9a5c15be9874f0b2b7306eef34bbc113197516e3
#
#
#
# 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]
#
============================================================
--- 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}"
#
# mt diff -rd4732f85d42b87e990dd3cdfed1c9d40f04ff5e8 -r9a5c15be9874f0b2b7306eef34bbc113197516e3
#
#
#
# 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"
#
# rename "packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch"
# to "packages/xorg-xserver/files/fix-picturestr-include-order.patch"
#
# patch "conf/machine/nokia770.conf"
# from [b58eed429663f0f6aabcf2e4b041d266fdc463f3]
# to [166593848b21599e1958aa05bef25162b9e867e4]
#
# patch "packages/maemo4/hildon-thumbnail_0.14.bb"
# from [b965c3b2137d65d559b6e2fc3a5d1b06f42af721]
# to [b9572a53fa61f91c39714ccab1af3eb56c039fa1]
#
# patch "packages/maemo4/libhildonmime_1.10.0.bb"
# from [25951b1409cc178b5fb12b25009d3b44aa028546]
# to [c24b3bf5acb08c0cb5512eb3be8cd1c2bfa1f51d]
#
# patch "packages/maemo4/libosso.inc"
# from [304467b6e4fd87052f5fe7daf6f379f4a96c86ad]
# to [aab03cbd418b8b2b547d82d33a2bff10c76ac7fb]
#
# patch "packages/python/python-dbus_0.82.4.bb"
# from [c5e18d63589267e732b6a661f4047e5c7e9d1fa0]
# to [265ecdc8752ede90876f5c5e513aa9a60ff60100]
#
# patch "packages/xorg-proto/renderproto_0.9.3.bb"
# from [941a64141dc39736fe734344c9ecc6cbbb9620f4]
# to [1bb8221a34173072ea7c764733f75f2a635ff066]
#
# patch "packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb"
# from [fff9bb7a58826586a6abaa9ab7e87b9661eef224]
# to [0e72a73ed8c431c237be94d012f71e1c0ba17de4]
#
============================================================
--- conf/machine/nokia770.conf b58eed429663f0f6aabcf2e4b041d266fdc463f3
+++ conf/machine/nokia770.conf 166593848b21599e1958aa05bef25162b9e867e4
@@ -1,10 +1,10 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv
#@TYPE: Machine
#@NAME: Nokia 770 internet tablet
#@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet
TARGET_ARCH = "arm"
PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-xomap"
PREFERRED_PROVIDER_virtual/bootloader = ""
PREFERRED_PROVIDER_tslib = "tslib-maemo"
============================================================
--- packages/maemo4/hildon-thumbnail_0.14.bb b965c3b2137d65d559b6e2fc3a5d1b06f42af721
+++ packages/maemo4/hildon-thumbnail_0.14.bb b9572a53fa61f91c39714ccab1af3eb56c039fa1
@@ -1,6 +1,6 @@ require hildon-thumbnail.inc
require hildon-thumbnail.inc
-DEPENDS = "libhildon libosso"
+DEPENDS = "libhildon libosso osso-gnome-vfs2"
PR = "r0"
============================================================
--- packages/maemo4/libhildonmime_1.10.0.bb 25951b1409cc178b5fb12b25009d3b44aa028546
+++ packages/maemo4/libhildonmime_1.10.0.bb c24b3bf5acb08c0cb5512eb3be8cd1c2bfa1f51d
@@ -5,3 +5,5 @@ SRC_URI = "http://repository.maemo.org/p
PR = "r0"
SRC_URI = "http://repository.maemo.org/pool/maemo4.0/free/source/libh/${PN}/${PN}_${PV}-1.tar.gz"
+
+EXTRA_OECONF += "--with-compile-warnings=no"
============================================================
--- packages/maemo4/libosso.inc 304467b6e4fd87052f5fe7daf6f379f4a96c86ad
+++ packages/maemo4/libosso.inc aab03cbd418b8b2b547d82d33a2bff10c76ac7fb
@@ -1,7 +1,7 @@ LICENSE = "LGPL"
LICENSE = "LGPL"
-DESCRIPTION = "Nokia osso library"
+DESCRIPTION = "Nokia OSSO IPC library"
-DEPENDS = "dbus-glib glib-2.0"
+DEPENDS = "dbus-glib glib-2.0 mce-dev"
inherit autotools pkgconfig lib_package
============================================================
--- 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
============================================================
--- packages/xorg-proto/renderproto_0.9.3.bb 941a64141dc39736fe734344c9ecc6cbbb9620f4
+++ packages/xorg-proto/renderproto_0.9.3.bb 1bb8221a34173072ea7c764733f75f2a635ff066
@@ -1,6 +1,4 @@ PE = "1"
require xorg-proto-common.inc
CONFLICTS = "renderext"
PE = "1"
-
-DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb fff9bb7a58826586a6abaa9ab7e87b9661eef224
+++ packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb 0e72a73ed8c431c237be94d012f71e1c0ba17de4
@@ -7,6 +7,7 @@ DESCRIPTION_xserver-kdrive-xomap = "X se
DESCRIPTION = "X server from freedesktop.org"
DESCRIPTION_xserver-kdrive-xomap = "X server for the OMAP in the Nokia 800"
+PR = "r1"
PE = "1"
COMPATIBLE_MACHINE = "nokia(800|770)"
@@ -23,6 +24,7 @@ SRC_URI = "http://repository.maemo.org/p
file://fixups.patch;patch=1 \
file://button_only.patch;patch=1 \
file://calibrateext.patch;patch=1 \
+ file://fix-picturestr-include-order.patch;patch=1 \
file://xcalibrate_coords.patch;patch=1"
# file://kdrive-evdev.patch;patch=1 \
# file://kdrive-use-evdev.patch;patch=1 \
More information about the Openembedded-commits
mailing list