[oe-commits] org.oe.dev merge of '52c62dd05756b14c442b2b031264855e264ee6fd'
pfalcon commit
openembedded-commits at lists.openembedded.org
Tue Feb 19 21:57:27 UTC 2008
merge of '52c62dd05756b14c442b2b031264855e264ee6fd'
and '76d408008f1f7528f07e505cb8346d8d4b239d12'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: cb1970d64a9cdb9559e137f509557905fbc174b5
ViewMTN: http://monotone.openembedded.org/revision/info/cb1970d64a9cdb9559e137f509557905fbc174b5
Files:
1
packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch
packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
packages/libjson
packages/libjson/libjson_0.6.bb
packages/images/openmoko-python-devel-image.bb
packages/tasks/task-python-efl-examples.bb
Diffs:
#
# mt diff -r52c62dd05756b14c442b2b031264855e264ee6fd -rcb1970d64a9cdb9559e137f509557905fbc174b5
#
#
#
# patch "packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch"
# from [c624f83ac8b14092c184c051137a6dadd55508a6]
# to [ddbc1887bea6b823a043d3ded7f4d0e559b20437]
#
# patch "packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb"
# from [9ec0920876981474a325a47766fa7d50bbb1cfd3]
# to [054d2acb3ff8284167043e5554633713ebdba2cf]
#
# patch "packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb"
# from [f248fbf9a457e0555c36e5377bc412ced8f568db]
# to [53716efd0be08661e891166feef9298502f1ff73]
#
============================================================
--- packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch c624f83ac8b14092c184c051137a6dadd55508a6
+++ packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch ddbc1887bea6b823a043d3ded7f4d0e559b20437
@@ -1,13 +1,6 @@
----
- arfile.py | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- ipkg.py | 106 ++++++++++++++++++++++++++---------------------------
- setup.py | 2 -
- 3 files changed, 177 insertions(+), 55 deletions(-)
-
-Index: ipkg-utils/arfile.py
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ipkg-utils/arfile.py 2007-05-26 23:46:59.000000000 +0100
+diff -r 720080c24d2f arfile.py
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/arfile.py Sun Jan 27 23:26:35 2008 +0200
@@ -0,0 +1,124 @@
+"""
+arfile - A module to parse GNU ar archives.
@@ -133,23 +126,10 @@ Index: ipkg-utils/arfile.py
+
+ f2 = tarf.extractfile("control")
+ print f2.read()
-Index: ipkg-utils/setup.py
-===================================================================
---- ipkg-utils.orig/setup.py 2007-05-26 23:45:55.000000000 +0100
-+++ ipkg-utils/setup.py 2007-05-26 23:46:59.000000000 +0100
-@@ -16,6 +16,6 @@ distutils.core.setup( name = 'ipkg-utils
- platforms = 'POSIX',
- keywords = 'ipkg familiar',
- url = 'http://www.handhelds.org/sources.html/',
-- py_modules = [ 'ipkg' ],
-+ py_modules = [ 'ipkg', 'arfile' ],
- scripts = ['ipkg-compare-indexes', 'ipkg-make-index', 'ipkg-update-index', 'ipkg-build', 'ipkg-unbuild', 'ipkg-upload']
- )
-Index: ipkg-utils/ipkg.py
-===================================================================
---- ipkg-utils.orig/ipkg.py 2007-05-26 23:46:55.000000000 +0100
-+++ ipkg-utils/ipkg.py 2007-05-26 23:45:20.000000000 +0100
-@@ -41,6 +41,8 @@ import re
+diff -r 720080c24d2f ipkg.py
+--- a/ipkg.py Sun Jan 27 23:13:26 2008 +0200
++++ b/ipkg.py Sun Jan 27 23:26:35 2008 +0200
+@@ -41,6 +41,8 @@ import string
import string
import commands
from stat import ST_SIZE
@@ -158,7 +138,7 @@ Index: ipkg-utils/ipkg.py
class Version:
"""A class for holding parsed package version information."""
-@@ -131,78 +133,61 @@ class Package:
+@@ -131,77 +133,61 @@ class Package:
self.section = None
self.filename_header = None
self.file_list = []
@@ -198,8 +178,6 @@ Index: ipkg-utils/ipkg.py
- self.size = stat[ST_SIZE]
+
self.filename = os.path.basename(fn)
-+ assert self.isdeb == 1, "Old ipk format (non-deb) is unsupported"
-+
## sys.stderr.write(" extracting control.tar.gz from %s\n"% (fn,))
- if self.isdeb:
- control = os.popen("ar p "+fn+" control.tar.gz | tar xfzO - './control'","r")
@@ -227,15 +205,18 @@ Index: ipkg-utils/ipkg.py
- self.__dict__[name] = value
- else:
- line = control.readline()
++ if self.isdeb:
++ ar = arfile.ArFile(f)
++ tarStream = ar.open("control.tar.gz")
++ tarf = tarfile.open("control.tar.gz", "r", tarStream)
+
-+ ar = arfile.ArFile(f)
-+ tarStream = ar.open("control.tar.gz")
-+ tarf = tarfile.open("control.tar.gz", "r", tarStream)
++ try:
++ control = tarf.extractfile("control")
++ except KeyError:
++ control = tarf.extractfile("./control")
++ else:
++ control = os.popen("tar --wildcards -xzO -f " + fn + " '*control.tar.gz' | tar xfzO - './control'", "r")
+
-+ try:
-+ control = tarf.extractfile("control")
-+ except KeyError:
-+ control = tarf.extractfile("./control")
+ self.read_control(control)
control.close()
- if self.isdeb:
@@ -251,7 +232,7 @@ Index: ipkg-utils/ipkg.py
self.scratch_dir = None
self.file_dir = None
self.meta_dir = None
-
++
+ def __getattr__(self, name):
+ if name == "md5":
+ self._computeFileMD5()
@@ -269,11 +250,10 @@ Index: ipkg-utils/ipkg.py
+ sum.update(data)
+ f.close()
+ self.md5 = sum.hexdigest()
-+
+
def read_control(self, control):
import os
-
-@@ -221,9 +203,15 @@ class Package:
+@@ -221,9 +207,15 @@ class Package:
value = value + '\n' + line
if name == 'size':
self.size = int(value)
@@ -290,20 +270,43 @@ Index: ipkg-utils/ipkg.py
return # consumes one blank line at end of package descriptoin
else:
line = control.readline()
-@@ -314,6 +302,16 @@ class Package:
+@@ -314,7 +306,27 @@ class Package:
return self.section
def get_file_list(self):
+- return self.file_list
+ if not self.fn:
+ return []
-+ f = open(self.fn, "rb")
-+ ar = arfile.ArFile(f)
-+ tarStream = ar.open("data.tar.gz")
-+ tarf = tarfile.open("data.tar.gz", "r", tarStream)
-+ self.file_list = tarf.getnames()
++
++ if self.isdeb:
++ f = open(self.fn, "rb")
++ ar = arfile.ArFile(f)
++ tarStream = ar.open("data.tar.gz")
++ tarf = tarfile.open("data.tar.gz", "r", tarStream)
++ self.file_list = tarf.getnames()
++ f.close()
++ else:
++ f = os.popen("tar xfzO " + self.fn + " '*data.tar.gz' | tar tfz -","r")
++ while 1:
++ line = f.readline()
++ if not line: break
++ self.file_list.append(string.rstrip(line))
++ f.close()
++
++ # Make sure that filelist has consistent format regardless of tar version
+ self.file_list = map(lambda a: ["./", ""][a.startswith("./")] + a, self.file_list)
-+
-+ f.close()
- return self.file_list
++ return self.file_list
def write_package(self, dirname):
+ buf = self.render_control()
+diff -r 720080c24d2f setup.py
+--- a/setup.py Sun Jan 27 23:13:26 2008 +0200
++++ b/setup.py Sun Jan 27 23:26:35 2008 +0200
+@@ -16,6 +16,6 @@ distutils.core.setup( name = 'ipkg-utils
+ platforms = 'POSIX',
+ keywords = 'ipkg familiar',
+ url = 'http://www.handhelds.org/sources.html/',
+- py_modules = [ 'ipkg' ],
++ py_modules = [ 'ipkg', 'arfile' ],
+ scripts = ['ipkg-compare-indexes', 'ipkg-make-index', 'ipkg-update-index', 'ipkg-build', 'ipkg-unbuild', 'ipkg-upload']
+ )
============================================================
--- packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb 9ec0920876981474a325a47766fa7d50bbb1cfd3
+++ packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb 054d2acb3ff8284167043e5554633713ebdba2cf
@@ -1,7 +1,7 @@ RDEPENDS = ""
require ipkg-utils_${PV}.bb
RDEPENDS = ""
-PR = "r15"
+PR = "r16"
inherit native
============================================================
--- packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb f248fbf9a457e0555c36e5377bc412ced8f568db
+++ packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb 53716efd0be08661e891166feef9298502f1ff73
@@ -5,7 +5,7 @@ SRCDATE = "20050404"
CONFLICTS = "ipkg-link"
RDEPENDS = "python"
SRCDATE = "20050404"
-PR = "r17"
+PR = "r18"
SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
file://ipkg-utils-fix.patch;patch=1 \
#
# mt diff -r76d408008f1f7528f07e505cb8346d8d4b239d12 -rcb1970d64a9cdb9559e137f509557905fbc174b5
#
#
#
# add_dir "packages/libjson"
#
# add_file "packages/libjson/libjson_0.6.bb"
# content [57349c69fb7f4206bcae0906624bdedfd3f6a5b8]
#
# patch "packages/images/openmoko-python-devel-image.bb"
# from [314c670f5711b4e925e3261db65ca753dbbd5a78]
# to [1eeadbbc4b1eaaea6a23762c1a47e6797b3de20b]
#
# patch "packages/tasks/task-python-efl-examples.bb"
# from [bf69dc5858a5a32c723a3146a32c4d96419db9ab]
# to [c735dfada39bf25a56a17bd3b671cb79ea1e9ecf]
#
============================================================
--- packages/libjson/libjson_0.6.bb 57349c69fb7f4206bcae0906624bdedfd3f6a5b8
+++ packages/libjson/libjson_0.6.bb 57349c69fb7f4206bcae0906624bdedfd3f6a5b8
@@ -0,0 +1,15 @@
+DESCRIPTION = "A library for parsing and creating JSON files"
+HOMEPAGE = "http://oss.metaparadigm.com/json-c/"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "BSD"
+PR = "r0"
+
+SRC_URI = "http://oss.metaparadigm.com/json-c/json-c-${PV}.tar.gz"
+S = "${WORKDIR}/json-c-${PV}"
+
+inherit autotools
+
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- packages/images/openmoko-python-devel-image.bb 314c670f5711b4e925e3261db65ca753dbbd5a78
+++ packages/images/openmoko-python-devel-image.bb 1eeadbbc4b1eaaea6a23762c1a47e6797b3de20b
@@ -1,6 +1,7 @@ IMAGE_INSTALL += "\
require openmoko-image.bb
IMAGE_INSTALL += "\
task-openmoko-python-devel \
+ task-python-efl-examples \
+ edje-viewer \
"
-
============================================================
--- packages/tasks/task-python-efl-examples.bb bf69dc5858a5a32c723a3146a32c4d96419db9ab
+++ packages/tasks/task-python-efl-examples.bb c735dfada39bf25a56a17bd3b671cb79ea1e9ecf
@@ -1,10 +1,14 @@ RDEPENDS = "\
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 \
+ task-python-efl \
+ python-ecore-examples \
+ python-emotion-examples \
+ python-edje-examples \
+ python-epsilon-examples \
python-math python-textutils \
"
-PR = "ml2"
+PR = "ml3"
ALLOW_EMPTY = "1"
More information about the Openembedded-commits
mailing list