[oe-commits] org.oe.dev merge of '37503acf69411b447655a4711ed7b553120c14df'
oe commit
openembedded-commits at lists.openembedded.org
Sun Jan 13 17:36:50 UTC 2008
merge of '37503acf69411b447655a4711ed7b553120c14df'
and '99d10c4327664b741cfed74f3f99ac3f6d9e5b7b'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 32b7fa94caf6c038558548e252b9c813f4bf0891
ViewMTN: http://monotone.openembedded.org/revision/info/32b7fa94caf6c038558548e252b9c813f4bf0891
Files:
1
contrib/mtn2git/mtn2git.py
packages/python/python-edbus_cvs.bb
packages/python/python-efl-examples.bb
conf/distro/include/sane-srcdates.inc
packages/dtnrg/dtn_2.5.0.bb
packages/efl1/edbus_cvs.bb
packages/python/python-2.5-manifest.inc
packages/python/python-ecore_cvs.bb
packages/python/python-edje_cvs.bb
packages/python/python-efl.inc
packages/python/python-emotion_cvs.bb
packages/python/python-epsilon_cvs.bb
packages/python/python_2.5.1.bb
packages/tasks/task-python-everything.bb
Diffs:
#
# mt diff -r37503acf69411b447655a4711ed7b553120c14df -r32b7fa94caf6c038558548e252b9c813f4bf0891
#
#
#
# patch "contrib/mtn2git/mtn2git.py"
# from [152252b8f2f7f57c70d678432bd6cb8fa63f8946]
# to [1358f112d3cb844a52d78b014809a8a5a6609bc4]
#
============================================================
--- contrib/mtn2git/mtn2git.py 152252b8f2f7f57c70d678432bd6cb8fa63f8946
+++ contrib/mtn2git/mtn2git.py 1358f112d3cb844a52d78b014809a8a5a6609bc4
@@ -244,6 +244,12 @@ def fast_import(ops, revision):
all_modifications = all_modifications.union(modified)
all_deleted = all_deleted.union(deleted)
+ if len(revision["parent"]) == 0:
+ (added, modified, deleted) = diff_manifest(build_tree([],""), current_tree)
+ all_added = all_added.union(added)
+ all_modifications = all_modifications.union(modified)
+ all_deleted = all_deleted.union(deleted)
+
# TODO:
# Readd the sanity check to see if we deleted and modified an entry. This
# could probably happen if we have more than one parent (on a merge)?
@@ -424,10 +430,7 @@ def main(mtn_cli, db, rev):
for head in heads:
print >> sys.stderr, old_heads, head
all_revs += ops.ancestry_difference(head, old_heads)
- for rev in all_revs:
- if not rev in branch_heads:
- branch_heads[rev] = []
- branch_heads[rev].append(branch)
+ status.former_heads[branch] = heads
sorted_revs = [rev for rev in ops.toposort(all_revs)]
@@ -437,10 +440,6 @@ def main(mtn_cli, db, rev):
else:
print >> sys.stderr, "Going to import revision ", rev
fast_import(ops, parse_revision(ops, rev))
- branches = branch_heads[rev]
- for branch in branches:
- status.former_heads[branch] = [rev]
-
if __name__ == "__main__":
import optparse
@@ -465,3 +464,4 @@ if __name__ == "__main__":
print >> sys.stderr, "Failed to open the status file"
main(options.mtn, options.database, options.rev)
status.store(options.status)
+
#
# mt diff -r99d10c4327664b741cfed74f3f99ac3f6d9e5b7b -r32b7fa94caf6c038558548e252b9c813f4bf0891
#
#
#
# add_file "packages/python/python-edbus_cvs.bb"
# content [7812abc4380b4050cff4b3d2ce5a3d321fad99de]
#
# add_file "packages/python/python-efl-examples.bb"
# content [dcbda6005bd395ed7d984840e05f6f63e2a261c8]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [0ee8e930339f1d201ab01060c7de4f6f0e484056]
# to [0ef58973df9b8941b8366442a3ddffad77ae1202]
#
# patch "packages/dtnrg/dtn_2.5.0.bb"
# from [987af483064b66222040dae87a47b35f9a675f6f]
# to [9a0f05f06c0e6d83eecd598242754836134e6425]
#
# patch "packages/efl1/edbus_cvs.bb"
# from [1826c7cb68c61f853f9e04fb53e1b03a022c7894]
# to [c1a0f93864dece01ef62aab214eb056162154ffa]
#
# patch "packages/python/python-2.5-manifest.inc"
# from [353b94c02b2addae02ffac3246925056d10b3b71]
# to [222e6f2ebafb935c27a644f71de53f3e6604a0c9]
#
# patch "packages/python/python-ecore_cvs.bb"
# from [90845b99ab78eb6b0f8e1fa9647ab805cba9632e]
# to [295246b44c66e0eec08f9eaa1d8d53026cfaaf09]
#
# patch "packages/python/python-edje_cvs.bb"
# from [a6de8780758ddeaa8388510eb42f800808d4a1c4]
# to [db17cdf396a867475d95f9dea87fb4e37830205a]
#
# patch "packages/python/python-efl.inc"
# from [66b0f9ae3de72ea8591bb26d18c8e9294b68bad8]
# to [5f0e235661f8a3169fe44bcf12cdcbadfe21f3c7]
#
# patch "packages/python/python-emotion_cvs.bb"
# from [c08664082ddcea8156dbc60c3d71bcf3cfa305b4]
# to [66da00491bb184a006226359b718acabe5ec2fba]
#
# patch "packages/python/python-epsilon_cvs.bb"
# from [3905b2da72e626dc4d217ba5ae91084a14f82fb1]
# to [507d7f284e6ff28f55bba651b0660e4f56ee892e]
#
# patch "packages/python/python_2.5.1.bb"
# from [36a7f492ee7cc2b9c9fe2268b8b153dcb1729102]
# to [0198b3e00fbd71eb80cb5d69bb7d4cba293f89cb]
#
# patch "packages/tasks/task-python-everything.bb"
# from [67974c31da8be9bcedbda9f7dfa5963f89e262a2]
# to [f5a91e04a875fab4ab65964647105b0303fd6575]
#
============================================================
--- packages/python/python-edbus_cvs.bb 7812abc4380b4050cff4b3d2ce5a3d321fad99de
+++ packages/python/python-edbus_cvs.bb 7812abc4380b4050cff4b3d2ce5a3d321fad99de
@@ -0,0 +1,9 @@
+require python-efl.inc
+# broken until someone adds dbus 1.1.x
+DEPENDS += "edbus dbus-1.1"
+
+PR = "r0"
+
+SRC_URI = "${E_CVS};module=e17/proto/python-efl/python-e_dbus"
+S = "${WORKDIR}/python-e_dbus"
+
============================================================
--- packages/python/python-efl-examples.bb dcbda6005bd395ed7d984840e05f6f63e2a261c8
+++ packages/python/python-efl-examples.bb dcbda6005bd395ed7d984840e05f6f63e2a261c8
@@ -0,0 +1,7 @@
+DESCRIPTION = "Python Examples for the Enlightenment Foundation Libraries"
+LICENSE = "MIT"
+SECTION = "devel/python"
+RDEPENDS = "python-efl python-ecore-examples python-emotion-examples python-edje-examples python-epsilon-examples"
+PR = "ml1"
+
+ALLOW_EMPTY = "1"
============================================================
--- conf/distro/include/sane-srcdates.inc 0ee8e930339f1d201ab01060c7de4f6f0e484056
+++ conf/distro/include/sane-srcdates.inc 0ef58973df9b8941b8366442a3ddffad77ae1202
@@ -88,6 +88,7 @@ SRCDATE_python-edje ?= "${EFL_SRCDATE}"
SRCDATE_python-evas ?= "${EFL_SRCDATE}"
SRCDATE_python-ecore ?= "${EFL_SRCDATE}"
SRCDATE_python-edje ?= "${EFL_SRCDATE}"
+SRCDATE_python-edbus ?= "${EFL_SRCDATE}"
SRCDATE_python-emotion ?= "${EFL_SRCDATE}"
SRCDATE_python-epsilon ?= "${EFL_SRCDATE}"
SRCDATE_python-ewl ?= "${EFL_SRCDATE}"
============================================================
--- packages/dtnrg/dtn_2.5.0.bb 987af483064b66222040dae87a47b35f9a675f6f
+++ packages/dtnrg/dtn_2.5.0.bb 9a0f05f06c0e6d83eecd598242754836134e6425
@@ -1,9 +1,10 @@ SRC_URI = "http://www.dtnrg.org/docs/cod
DESCRIPTION = "Delay Tolerant Networking Package"
HOMEPAGE = "http://www.dtnrg.org/wiki"
SECTION = "libs"
DEPENDS = "db openssl python-native xerces-c"
LICENSE = "Apache"
SRC_URI = "http://www.dtnrg.org/docs/code/dtn_${PV}.tgz"
+PR = "r1"
inherit autotools
@@ -27,7 +28,7 @@ EXTRA_OECONF = "\
--with-openssl=${STAGING_DIR} \
"
-def python_dir(d):
+def dtn_python_dir(d):
import os, bb
staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 )
if os.path.exists( "%s/python2.5" % staging_incdir ): return "python2.5"
@@ -35,11 +36,15 @@ def python_dir(d):
if os.path.exists( "%s/python2.3" % staging_incdir ): return "python2.3"
raise "No Python in STAGING_INCDIR. Forgot to build python-native ?"
-PYTHON_DIR = "${@python_dir(d)}"
+PYTHON_DIR = "${@dtn_python_dir(d)}"
-export BUILD_SYS
-export HOST_SYS
+# use this syntax once everyone has at least bitbake 1.8.9
+#export BUILD_SYS
+#export HOST_SYS
+export BUILD_SYS:="${BUILD_SYS}"
+export HOST_SYS:="${HOST_SYS}"
+
do_configure_prepend() {
for i in aclocal/*.ac oasys/aclocal/*.ac; do
install -m 0644 $i ${STAGING_DATADIR}/aclocal/`basename $i`.m4
@@ -54,7 +59,7 @@ DESCRIPTION_python-dtn = "Python binding
PACKAGES += "python-dtn"
DESCRIPTION_python-dtn = "Python bindings to the DTN API"
-PR_python-dtn = "ml1"
+PR_python-dtn = "ml2"
FILES_python-dtn = "${libdir}/${PYTHON_DIR}"
RDEPENDS_python-dtn = "python-core"
FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug"
============================================================
--- packages/efl1/edbus_cvs.bb 1826c7cb68c61f853f9e04fb53e1b03a022c7894
+++ packages/efl1/edbus_cvs.bb c1a0f93864dece01ef62aab214eb056162154ffa
@@ -1,12 +1,18 @@ LICENSE = "MIT"
DESCRIPTION = "DBus and HAL convenience wrappers for EFL"
DEPENDS = "dbus ecore"
LICENSE = "MIT"
-PR = "r0"
+PR = "r1"
inherit efl_library
-SRC_URI = "${E_CVS};module=e17/proto/e_dbus"
+SRC_URI = "${E_CVS};module=e17/libs/e_dbus"
S = "${WORKDIR}/e_dbus"
# TODO increase package granularity
+PACKAGES =+ "${PN}-enotify ${PN}-edbus ${PN}-enm ${PN}-ehal"
+FILES_${PN}-enotify = "${libdir}/libenotify.so.*"
+FILES_${PN}-edbus = "${libdir}/libedbus.so.*"
+FILES_${PN}-enm = "${libdir}/libenm.so.*"
+FILES_${PN}-ehal = "${libdir}/libehal.so.*"
+
============================================================
--- packages/python/python-2.5-manifest.inc 353b94c02b2addae02ffac3246925056d10b3b71
+++ packages/python/python-2.5-manifest.inc 222e6f2ebafb935c27a644f71de53f3e6604a0c9
@@ -1,5 +1,5 @@
########################################################################################################################
-### AUTO-GENERATED by 'contrib/python/generate-manifest-2.5.py' [(C) 2002-2007 Michael 'Mickey' Lauer <mlauer at vanille-media.de>] on Fri Dec 7 11:51:27 2007
+### AUTO-GENERATED by '../../contrib/python/generate-manifest-2.5.py' [(C) 2002-2007 Michael 'Mickey' Lauer <mlauer at vanille-media.de>] on Sun Jan 13 16:02:57 2008
###
### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
###
@@ -13,287 +13,287 @@ DESCRIPTION_python-profile="Python Basic
PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
DESCRIPTION_python-profile="Python Basic Profiling Support"
-PR_python-profile="ml5"
+PR_python-profile="ml6"
RDEPENDS_python-profile="python-core"
FILES_python-profile="${libdir}/python2.5/profile.* ${libdir}/python2.5/pstats.* "
DESCRIPTION_python-threading="Python Threading & Synchronization Support"
-PR_python-threading="ml5"
+PR_python-threading="ml6"
RDEPENDS_python-threading="python-core python-lang"
FILES_python-threading="${libdir}/python2.5/_threading_local.* ${libdir}/python2.5/dummy_thread.* ${libdir}/python2.5/dummy_threading.* ${libdir}/python2.5/mutex.* ${libdir}/python2.5/threading.* ${libdir}/python2.5/Queue.* "
DESCRIPTION_python-distutils="Python Distribution Utilities"
-PR_python-distutils="ml5"
+PR_python-distutils="ml6"
RDEPENDS_python-distutils="python-core"
FILES_python-distutils="${libdir}/python2.5/config ${libdir}/python2.5/distutils "
DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support"
-PR_python-textutils="ml5"
+PR_python-textutils="ml6"
RDEPENDS_python-textutils="python-core python-io python-re python-stringold"
FILES_python-textutils="${libdir}/python2.5/lib-dynload/_csv.so ${libdir}/python2.5/csv.* ${libdir}/python2.5/optparse.* ${libdir}/python2.5/textwrap.* "
DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support"
-PR_python-codecs="ml5"
+PR_python-codecs="ml6"
RDEPENDS_python-codecs="python-core python-lang"
FILES_python-codecs="${libdir}/python2.5/codecs.* ${libdir}/python2.5/encodings ${libdir}/python2.5/gettext.* ${libdir}/python2.5/locale.* ${libdir}/python2.5/lib-dynload/_locale.so ${libdir}/python2.5/lib-dynload/unicodedata.so ${libdir}/python2.5/stringprep.* ${libdir}/python2.5/xdrlib.* "
DESCRIPTION_python-ctypes="Python C Types Support"
-PR_python-ctypes="ml5"
+PR_python-ctypes="ml6"
RDEPENDS_python-ctypes="python-core"
FILES_python-ctypes="${libdir}/python2.5/ctypes ${libdir}/python2.5/lib-dynload/_ctypes.so "
DESCRIPTION_python-pickle="Python Persistence Support"
-PR_python-pickle="ml5"
+PR_python-pickle="ml6"
RDEPENDS_python-pickle="python-core python-codecs python-io python-re"
FILES_python-pickle="${libdir}/python2.5/pickle.* ${libdir}/python2.5/shelve.* ${libdir}/python2.5/lib-dynload/cPickle.so "
DESCRIPTION_python-datetime="Python Calendar and Time support"
-PR_python-datetime="ml5"
+PR_python-datetime="ml6"
RDEPENDS_python-datetime="python-core python-codecs"
FILES_python-datetime="${libdir}/python2.5/_strptime.* ${libdir}/python2.5/calendar.* ${libdir}/python2.5/lib-dynload/datetime.so "
DESCRIPTION_python-core="Python Interpreter and core modules (needed!)"
-PR_python-core="ml5"
+PR_python-core="ml6"
RDEPENDS_python-core=""
FILES_python-core="${libdir}/python2.5/__future__.* ${libdir}/python2.5/copy.* ${libdir}/python2.5/copy_reg.* ${libdir}/python2.5/ConfigParser.* ${libdir}/python2.5/getopt.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/new.* ${libdir}/python2.5/os.* ${libdir}/python2.5/posixpath.* ${libdir}/python2.5/struct.* ${libdir}/python2.5/warnings.* ${libdir}/python2.5/site.* ${libdir}/python2.5/stat.* ${libdir}/python2.5/UserDict.* ${libdir}/python2.5/UserList.* ${libdir}/python2.5/UserString.* ${libdir}/python2.5/lib-dynload/binascii.so ${libdir}/python2.5/lib-dynload/_struct.so ${libdir}/python2.5/lib-dynload/time.so ${libdir}/python2.5/lib-dynload/xreadlines.so ${libdir}/python2.5/types.* ${bindir}/python* "
DESCRIPTION_python-io="Python Low-Level I/O"
-PR_python-io="ml5"
+PR_python-io="ml6"
RDEPENDS_python-io="python-core python-math"
FILES_python-io="${libdir}/python2.5/lib-dynload/_socket.so ${libdir}/python2.5/lib-dynload/_ssl.so ${libdir}/python2.5/lib-dynload/select.so ${libdir}/python2.5/lib-dynload/termios.so ${libdir}/python2.5/lib-dynload/cStringIO.so ${libdir}/python2.5/pipes.* ${libdir}/python2.5/socket.* ${libdir}/python2.5/tempfile.* ${libdir}/python2.5/StringIO.* "
DESCRIPTION_python-compiler="Python Compiler Support"
-PR_python-compiler="ml5"
+PR_python-compiler="ml6"
RDEPENDS_python-compiler="python-core"
FILES_python-compiler="${libdir}/python2.5/compiler "
DESCRIPTION_python-compression="Python High Level Compression Support"
-PR_python-compression="ml5"
+PR_python-compression="ml6"
RDEPENDS_python-compression="python-core python-zlib"
FILES_python-compression="${libdir}/python2.5/gzip.* ${libdir}/python2.5/zipfile.* "
DESCRIPTION_python-re="Python Regular Expression APIs"
-PR_python-re="ml5"
+PR_python-re="ml6"
RDEPENDS_python-re="python-core"
FILES_python-re="${libdir}/python2.5/re.* ${libdir}/python2.5/sre.* ${libdir}/python2.5/sre_compile.* ${libdir}/python2.5/sre_constants* ${libdir}/python2.5/sre_parse.* "
DESCRIPTION_python-xmlrpc="Python XMLRPC Support"
-PR_python-xmlrpc="ml5"
+PR_python-xmlrpc="ml6"
RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang"
FILES_python-xmlrpc="${libdir}/python2.5/xmlrpclib.* ${libdir}/python2.5/SimpleXMLRPCServer.* "
DESCRIPTION_python-terminal="Python Terminal Controlling Support"
-PR_python-terminal="ml5"
+PR_python-terminal="ml6"
RDEPENDS_python-terminal="python-core python-io"
FILES_python-terminal="${libdir}/python2.5/pty.* ${libdir}/python2.5/tty.* "
DESCRIPTION_python-email="Python Email Support"
-PR_python-email="ml5"
+PR_python-email="ml6"
RDEPENDS_python-email="python-core python-io python-re python-mime python-audio python-image"
FILES_python-email="${libdir}/python2.5/email "
DESCRIPTION_python-image="Python Graphical Image Handling"
-PR_python-image="ml5"
+PR_python-image="ml6"
RDEPENDS_python-image="python-core"
FILES_python-image="${libdir}/python2.5/colorsys.* ${libdir}/python2.5/imghdr.* ${libdir}/python2.5/lib-dynload/imageop.so ${libdir}/python2.5/lib-dynload/rgbimg.so "
DESCRIPTION_python-core-dbg="Python core module debug information"
-PR_python-core-dbg="ml5"
+PR_python-core-dbg="ml6"
RDEPENDS_python-core-dbg="python-core"
FILES_python-core-dbg="${libdir}/python2.5/lib-dynload/.debug ${bindir}/.debug ${libdir}/.debug "
DESCRIPTION_python-resource="Python Resource Control Interface"
-PR_python-resource="ml5"
+PR_python-resource="ml6"
RDEPENDS_python-resource="python-core"
FILES_python-resource="${libdir}/python2.5/lib-dynload/resource.so "
DESCRIPTION_python-devel="Python Development Package"
-PR_python-devel="ml5"
+PR_python-devel="ml6"
RDEPENDS_python-devel="python-core"
FILES_python-devel="${includedir} ${libdir}/python2.5/config "
DESCRIPTION_python-math="Python Math Support"
-PR_python-math="ml5"
+PR_python-math="ml6"
RDEPENDS_python-math="python-core"
FILES_python-math="${libdir}/python2.5/lib-dynload/cmath.so ${libdir}/python2.5/lib-dynload/math.so ${libdir}/python2.5/lib-dynload/_random.so ${libdir}/python2.5/random.* ${libdir}/python2.5/sets.* "
DESCRIPTION_python-hotshot="Python Hotshot Profiler"
-PR_python-hotshot="ml5"
+PR_python-hotshot="ml6"
RDEPENDS_python-hotshot="python-core"
FILES_python-hotshot="${libdir}/python2.5/hotshot ${libdir}/python2.5/lib-dynload/_hotshot.so "
DESCRIPTION_python-unixadmin="Python Unix Administration Support"
-PR_python-unixadmin="ml5"
+PR_python-unixadmin="ml6"
RDEPENDS_python-unixadmin="python-core"
FILES_python-unixadmin="${libdir}/python2.5/lib-dynload/nis.so ${libdir}/python2.5/lib-dynload/grp.so ${libdir}/python2.5/lib-dynload/pwd.so ${libdir}/python2.5/getpass.* "
DESCRIPTION_python-syslog="Python's syslog Interface"
-PR_python-syslog="ml5"
+PR_python-syslog="ml6"
RDEPENDS_python-syslog="python-core"
FILES_python-syslog="${libdir}/python2.5/lib-dynload/syslog.so "
DESCRIPTION_python-tkinter="Python Tcl/Tk Bindings"
-PR_python-tkinter="ml5"
+PR_python-tkinter="ml6"
RDEPENDS_python-tkinter="python-core"
FILES_python-tkinter="${libdir}/python2.5/lib-dynload/_tkinter.so ${libdir}/python2.5/lib-tk "
DESCRIPTION_python-gdbm="Python GNU Database Support"
-PR_python-gdbm="ml5"
+PR_python-gdbm="ml6"
RDEPENDS_python-gdbm="python-core"
FILES_python-gdbm="${libdir}/python2.5/lib-dynload/gdbm.so "
DESCRIPTION_python-fcntl="Python's fcntl Interface"
-PR_python-fcntl="ml5"
+PR_python-fcntl="ml6"
RDEPENDS_python-fcntl="python-core"
FILES_python-fcntl="${libdir}/python2.5/lib-dynload/fcntl.so "
DESCRIPTION_python-netclient="Python Internet Protocol Clients"
-PR_python-netclient="ml5"
+PR_python-netclient="ml6"
RDEPENDS_python-netclient="python-core python-crypt python-datetime python-io python-lang python-logging python-mime"
FILES_python-netclient="${libdir}/python2.5/*Cookie*.* ${libdir}/python2.5/base64.* ${libdir}/python2.5/cookielib.* ${libdir}/python2.5/ftplib.* ${libdir}/python2.5/gopherlib.* ${libdir}/python2.5/hmac.* ${libd%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list