[oe-commits] org.oe.dev merge of 'af9c4bad732edd2f3538bbcc59c4aa70520a54e1'
rwhitby commit
openembedded-commits at lists.openembedded.org
Thu Jun 21 17:39:19 UTC 2007
merge of 'af9c4bad732edd2f3538bbcc59c4aa70520a54e1'
and 'e35c79c0e44e6a58add42e2dc50ecfaad4e02c0e'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 9a5743f40b7e8b6c87c1e54d50262a06068b8b94
ViewMTN: http://monotone.openembedded.org/revision.psp?id=9a5743f40b7e8b6c87c1e54d50262a06068b8b94
Files:
1
packages/ipkg-utils/ipkg-utils/index_speedup.patch
packages/ipkg-utils/ipkg-utils-native
packages/ipkg-utils/ipkg-utils-native/ipkg-py-sane-vercompare.patch
packages/ipkg-utils/ipkg-utils-native/ipkg-utils-fix.patch
packages/pointercal/files/h2200
packages/pointercal/files/h2200/pointercal
packages/pointercal/files/hx4700
packages/pointercal/files/hx4700/pointercal
packages/pointercal/files/magician
packages/pointercal/files/magician/pointercal
packages/iana-etc
packages/mISDN
packages/mISDN/files
packages/iana-etc/iana-etc_2.20.bb
packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch
packages/ipkg-utils/ipkg-utils/ipkg-py-sane-vercompare.patch
packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch
packages/ipkg-utils/ipkg-utils/ipkg-utils-fix.patch
packages/llvm/llvm-native_2.0.bb
packages/mISDN/files/Makefile
packages/mISDN/files/hfcs_usb_endianchecks.diff
packages/mISDN/misdn_cvs.bb
packages/ntp/ntp.inc
packages/telepathy/empathy_0.5.bb
conf/bitbake.conf
conf/distro/include/angstrom.inc
conf/distro/unslung.conf
packages/glibc/glibc_2.2.5.bb
packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
packages/ntp/ntp-ssl_4.1.2.bb
packages/ntp/ntp_4.1.2.bb
packages/ntp/ntp_4.2.0.bb
packages/ntp/ntp_4.2.2p3.bb
packages/pointercal/pointercal_0.0.bb
Diffs:
#
# mt diff -raf9c4bad732edd2f3538bbcc59c4aa70520a54e1 -r9a5743f40b7e8b6c87c1e54d50262a06068b8b94
#
#
#
# delete "packages/ipkg-utils/ipkg-utils/index_speedup.patch"
#
# delete "packages/ipkg-utils/ipkg-utils-native"
#
# delete "packages/ipkg-utils/ipkg-utils-native/ipkg-py-sane-vercompare.patch"
#
# delete "packages/ipkg-utils/ipkg-utils-native/ipkg-utils-fix.patch"
#
# delete "packages/pointercal/files/h2200"
#
# delete "packages/pointercal/files/h2200/pointercal"
#
# delete "packages/pointercal/files/hx4700"
#
# delete "packages/pointercal/files/hx4700/pointercal"
#
# delete "packages/pointercal/files/magician"
#
# delete "packages/pointercal/files/magician/pointercal"
#
# add_dir "packages/iana-etc"
#
# add_dir "packages/mISDN"
#
# add_dir "packages/mISDN/files"
#
# add_file "packages/iana-etc/iana-etc_2.20.bb"
# content [1ac37d6f2237b8b3d2698cb9043b507d850169dc]
#
# add_file "packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch"
# content [13aa70d3fb4af7f44dd20be52a40d70acc6420a6]
#
# add_file "packages/ipkg-utils/ipkg-utils/ipkg-py-sane-vercompare.patch"
# content [a533f3484b87031c12b00510830579d719f4f898]
#
# add_file "packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch"
# content [a351c21502faa71fd5c654d9062d5ad3c0f172d1]
#
# add_file "packages/ipkg-utils/ipkg-utils/ipkg-utils-fix.patch"
# content [376af87b36ba801509d17088639cc92ecf124344]
#
# add_file "packages/llvm/llvm-native_2.0.bb"
# content [ced3e88496cb6d6761a1f140a84df86765804bc5]
#
# add_file "packages/mISDN/files/Makefile"
# content [ae4ba1d1d78da0a8e996e575f070bb6b2eab249a]
#
# add_file "packages/mISDN/files/hfcs_usb_endianchecks.diff"
# content [4068d04ec1f523da0057c29f6bfe8e237848e8cc]
#
# add_file "packages/mISDN/misdn_cvs.bb"
# content [31c94d552e008078de77171c9283bcaea7b9087f]
#
# add_file "packages/ntp/ntp.inc"
# content [aff13a765f8e30ab45462d4c147100a7257e81de]
#
# add_file "packages/telepathy/empathy_0.5.bb"
# content [11444159523898c8408383c3ddf44670c4b6b122]
#
# patch "conf/bitbake.conf"
# from [5ff7f47628e50badd5eecf166c188815f80f85c1]
# to [51cc7d722038648d335388305f9dcdec4356c3f9]
#
# patch "conf/distro/include/angstrom.inc"
# from [fba9f115bec0545cef8caf0548b6c3fec242339a]
# to [f253ad10578eef3bc7d8c9b9fc9109e63bbc0e53]
#
# patch "conf/distro/unslung.conf"
# from [ff1cf470a007fbade45594572fd61f85e707a45a]
# to [4d0f8e59d6730a558058257e734ba921cd4e30c2]
#
# patch "packages/glibc/glibc_2.2.5.bb"
# from [6356af6dc0fee387d496f4113d9a47d31ff19969]
# to [995d93bdb007daea101ad6dcc7927ed839ae65ac]
#
# patch "packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb"
# from [bd4992d548728ae583c7011fd8d2c7c0ffdd3866]
# to [991a74ee34804eb8b0aadde9d528ae65a2786d8f]
#
# patch "packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb"
# from [f6d41b6ec89a49d9b83b2c4fd7b4825e43d158ab]
# to [23cdf8b2d949450edbc40f4123ca3d976b7ce2b4]
#
# patch "packages/ntp/ntp-ssl_4.1.2.bb"
# from [058ff3423c424196f3befd3c92b9fc1de8b8365a]
# to [3e44ea294419efe5b7943dfa4a5294db090e5b93]
#
# patch "packages/ntp/ntp_4.1.2.bb"
# from [2676ce7943ee388680d9b1c10e4c48be2345e8bb]
# to [88668bb1991af8f677895828878da82d1b9f2610]
#
# patch "packages/ntp/ntp_4.2.0.bb"
# from [3d4581f5dfe79d36bb49b49fb1689fd8786e3d61]
# to [1cc396be7f989349696af33f38e64608200e3c8a]
#
# patch "packages/ntp/ntp_4.2.2p3.bb"
# from [957c3ea639734533de1a1dacbac71d3222001314]
# to [6101494a76d050c7b395badf7ba8e05640523149]
#
# patch "packages/pointercal/pointercal_0.0.bb"
# from [f844162e85bf240047b8d37dde91394cc6886e23]
# to [e69b72c81ea45bef7178461338ea8f93c5630827]
#
============================================================
--- packages/iana-etc/iana-etc_2.20.bb 1ac37d6f2237b8b3d2698cb9043b507d850169dc
+++ packages/iana-etc/iana-etc_2.20.bb 1ac37d6f2237b8b3d2698cb9043b507d850169dc
@@ -0,0 +1,15 @@
+DESCRIPTION = "The iana-etc package provides the Unix/Linux /etc/services and /etc/protocols files."
+AUTHOR = "Seth W. Klein"
+HOMEPAGE = "http://www.sethwklein.net/projects/iana-etc/"
+SECTION = "base"
+LICENSE = "OPL"
+
+SRC_URI = "http://www.sethwklein.net/projects/iana-etc/downloads/${P}.tar.bz2"
+
+do_make(){
+ oe_runmake 'STRIP=yes'
+}
+
+do_install(){
+ oe_runmake 'DESTDIR=${D}' install
+}
============================================================
--- packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch 13aa70d3fb4af7f44dd20be52a40d70acc6420a6
+++ packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch 13aa70d3fb4af7f44dd20be52a40d70acc6420a6
@@ -0,0 +1,97 @@
+---
+ ipkg-make-index | 31 +++++++++++++++++++++++++++----
+ 1 file changed, 27 insertions(+), 4 deletions(-)
+
+Index: ipkg-utils/ipkg-make-index
+===================================================================
+--- ipkg-utils.orig/ipkg-make-index 2007-05-26 23:45:56.000000000 +0100
++++ ipkg-utils/ipkg-make-index 2007-05-26 23:47:25.000000000 +0100
+@@ -40,6 +40,7 @@ def to_locale(filename, locale):
+ old_filename = None
+ packages_filename = None
+ filelist_filename = "Packages.filelist"
++stamplist_filename = "Packages.stamps"
+ opt_s = 0
+ opt_m = 0
+ (opts, remaining_args) = getopt.getopt(sys.argv[1:], "hl:p:vsmr:L:")
+@@ -50,6 +51,7 @@ for (optkey, optval) in opts:
+ opt_s = 1
+ if optkey == '-p':
+ packages_filename = optval
++ stamplist_filename = optval + ".stamps"
+ if optkey == '-l':
+ filelist_filename = optval
+ if optkey == '-v':
+@@ -72,6 +74,7 @@ old_pkg_hash = {}
+ if packages_filename and not old_filename and os.path.exists(packages_filename):
+ old_filename = packages_filename
+
++pkgsStamps = {}
+ if old_filename:
+ if (verbose):
+ sys.stderr.write("Reading package list from " + old_filename + "\n")
+@@ -80,6 +83,14 @@ if old_filename:
+ for k in old_packages.packages.keys():
+ p = old_packages.packages[k]
+ old_pkg_hash[p.filename] = p
++ try:
++ f = open(stamplist_filename, "r")
++ for l in f:
++ l = l.strip()
++ s, f = l.split(" ", 1)
++ pkgsStamps[f] = int(s)
++ except IOError:
++ pass
+
+ if (verbose):
+ sys.stderr.write("Reading in all the package info from %s\n" % (pkg_dir, ))
+@@ -87,11 +98,17 @@ files=glob(pkg_dir + '/*.ipk') + glob(pk
+ files.sort()
+ for filename in files:
+ basename = os.path.basename(filename)
++ pkg = None
++ fnameStat = os.stat(filename)
+ if old_pkg_hash.has_key(basename):
+- if (verbose):
++ if pkgsStamps.has_key(basename) and fnameStat.st_mtime == pkgsStamps[basename]:
++ if (verbose):
+ sys.stderr.write("Found %s in Packages\n" % (filename,))
+- pkg = old_pkg_hash[basename]
+- else:
++ pkg = old_pkg_hash[basename]
++ else:
++ sys.stderr.write("Found %s in Packages, but mtime differs - re-reading\n" % (filename,))
++
++ if not pkg:
+ if (verbose):
+ sys.stderr.write("Reading info for package %s\n" % (filename,))
+ pkg = ipkg.Package(filename)
+@@ -101,6 +118,7 @@ for filename in files:
+ else:
+ old_filename = ""
+ s = packages.add_package(pkg)
++ pkgsStamps[basename] = fnameStat.st_mtime
+ if s == 0:
+ if old_filename:
+ # old package was displaced by newer
+@@ -114,6 +132,11 @@ for filename in files:
+ if opt_s:
+ print filename
+
++pkgsStampsFile = open(stamplist_filename, "w")
++for f in pkgsStamps.keys():
++ pkgsStampsFile.write("%d %s\n" % (pkgsStamps[f], f))
++pkgsStampsFile.close()
++
+ if opt_s:
+ sys.exit(0)
+
+@@ -154,7 +177,7 @@ if packages_filename:
+ os.rename(tmp_packages_filename, packages_filename)
+ os.rename(tmp_gzip_filename, gzip_filename)
+
+-if verbose:
++if verbose:
+ sys.stderr.write("Generate Packages.filelist file\n")
+ files = {}
+ names = packages.packages.keys()
============================================================
--- packages/ipkg-utils/ipkg-utils/ipkg-py-sane-vercompare.patch a533f3484b87031c12b00510830579d719f4f898
+++ packages/ipkg-utils/ipkg-utils/ipkg-py-sane-vercompare.patch a533f3484b87031c12b00510830579d719f4f898
@@ -0,0 +1,51 @@
+Only in ipkg-utils: ipkg-py-sane-vercompare.patch
+diff -ur ipkg-utils.org/ipkg.py ipkg-utils/ipkg.py
+--- ipkg-utils.org/ipkg.py 2005-01-08 18:08:52.000000000 +0000
++++ ipkg-utils/ipkg.py 2007-04-04 11:52:46.000000000 +0000
+@@ -48,9 +48,9 @@
+ self.epoch = epoch
+ self.version = version
+
+- def _versioncompare(self, ref):
+- selfversion = self.version
+- refversion = ref.version
++ def _versioncompare(self, selfversion, refversion):
++ if not selfversion: selfversion = ""
++ if not refversion: refversion = ""
+ while 1:
+ ## first look for non-numeric version component
+ selfm = re.match('([^0-9]*)(.*)', selfversion)
+@@ -89,7 +89,18 @@
+ elif (self.epoch < ref.epoch):
+ return -1
+ else:
+- return self._versioncompare(ref)
++ self_ver_comps = re.match(r"(.+?)(-r.+)?$", self.version)
++ ref_ver_comps = re.match(r"(.+?)(-r.+)?$", ref.version)
++ #print (self_ver_comps.group(1), self_ver_comps.group(2))
++ #print (ref_ver_comps.group(1), ref_ver_comps.group(2))
++ r = self._versioncompare(self_ver_comps.group(1), ref_ver_comps.group(1))
++ if r == 0:
++ r = self._versioncompare(self_ver_comps.group(2), ref_ver_comps.group(2))
++ #print "compare: %s vs %s = %d" % (self, ref, r)
++ return r
++
++ def __str__(self):
++ return str(self.epoch) + ":" + self.version
+
+ def parse_version(versionstr):
+ epoch = 0
+@@ -445,6 +456,13 @@
+ return self.packages[key]
+
+ if __name__ == "__main__":
++
++ assert Version(0, "1.2.2-r1").compare(Version(0, "1.2.3-r0")) == -1
++ assert Version(0, "1.2.2-r0").compare(Version(0, "1.2.2+cvs20070308-r0")) == -1
++ assert Version(0, "1.2.2+cvs20070308").compare(Version(0, "1.2.2-r0")) == 1
++ assert Version(0, "1.2.2-r0").compare(Version(0, "1.2.2-r0")) == 0
++ assert Version(0, "1.2.2-r5").compare(Version(0, "1.2.2-r0")) == 1
++
+ package = Package()
+
+ package.set_package("FooBar")
============================================================
--- packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch a351c21502faa71fd5c654d9062d5ad3c0f172d1
+++ packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch a351c21502faa71fd5c654d9062d5ad3c0f172d1
@@ -0,0 +1,306 @@
+---
+ 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
+@@ -0,0 +1,124 @@
++"""
++arfile - A module to parse GNU ar archives.
++
++Copyright (c) 2006-7 Paul Sokolovsky
++This file is released under the terms
++of GNU General Public License v2 or later.
++"""
++import sys
++import os
++import tarfile
++
++
++class FileSection:
++ "A class which allows to treat portion of file as separate file object."
++
++ def __init__(self, f, offset, size):
++ self.f = f
++ self.offset = offset
++ self.size = size
++ self.seek(0, 0)
++
++ def seek(self, offset, whence = 0):
++# print "seek(%x, %d)" % (offset, whence)
++ if whence == 0:
++ return self.f.seek(offset + self.offset, whence)
++ elif whence == 1:
++ return self.f.seek(offset, whence)
++ elif whence == 2:
++ return self.f.seek(self.offset + self.size + offset, 0)
++ else:
++ assert False
++
++ def tell(self):
++# print "tell()"
++ return self.f.tell() - self.offset
++
++ def read(self, size = -1):
++# print "read(%d)" % size
++ return self.f.read(size)
++
++class ArFile:
++
++ def __init__(self, f):
++ self.f = f
++ self.directory = {}
++ self.directoryRead = False
++
++ signature = self.f.readline()
++ assert signature == "!<arch>\n"
++ self.directoryOffset = self.f.tell()
++
++ def open(self, fname):
++ if self.directory.has_key(fname):
++ return FileSection(self.f, self.directory[fname][-1], int(self.directory[fname][5]))
++
++ if self.directoryRead:
++ raise IOError, (2, "AR member not found: " + fname)
++
++ f = self._scan(fname)
++ if f == None:
++ raise IOError, (2, "AR member not found: " + fname)
++ return f
++
++
++ def _scan(self, fname):
++ self.f.seek(self.directoryOffset, 0)
++
++ while True:
++ l = self.f.readline()
++ if not l:
++ self.directoryRead = True
++ return None
++
++ if l == "\n":
++ l = self.f.readline()
++ if not l: break
++ descriptor = l.split()
++# print descriptor
++ size = int(descriptor[5])
++ memberName = descriptor[0][:-1]
++ self.directory[memberName] = descriptor + [self.f.tell()]
++# print "read:", memberName
++ if memberName == fname:
++ # Record directory offset to start from next time
++ self.directoryOffset = self.f.tell() + size
++ return FileSection(self.f, self.f.tell(), size)
++
++ # Skip data and loop
++ data = self.f.seek(size, 1)
++# print hex(f.tell())
++
++
++if __name__ == "__main__":
++ if None:
++ f = open(sys.argv[1], "rb")
++
++ ar = ArFile(f)
++ tarStream = ar.open("data.tar.gz")
++ print "--------"
++ tarStream = ar.open("data.tar.gz")
++ print "--------"
++ tarStream = ar.open("control.tar.gz")
++ print "--------"
++ tarStream = ar.open("control.tar.gz2")
++
++ sys.exit(0)
++
++
++ dir = "."
++ if len(sys.argv) > 1:
++ dir = sys.argv[1]
++ for f in os.listdir(dir):
++ if not f.endswith(".ipk"): continue
++
++ print "=== %s ===" % f
++ f = open(dir + "/" + f, "rb")
++
++ ar = ArFile(f)
++ tarStream = ar.open("control.tar.gz")
++ tarf = tarfile.open("control.tar.gz", "r", tarStream)
++ #tarf.list()
++
++ 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
+ import string
+ import commands
+ from stat import ST_SIZE
++import arfile
++import tarfile
+
+ class Version:
+ """A class for holding parsed package version information."""
+@@ -131,78 +133,58 @@ class Package:
+ self.section = None
+ self.filename_header = None
+ self.file_list = []
+- self.md5 = None
++ # md5 is lazy attribute, computed on demand
++ #self.md5 = None
+ self.size = None
+ self.installed_size = None
+ self.filename = None
+ self.isdeb = 0
++ self.fn = fn
+
+ if fn:
+ # see if it is deb format
+- f = open(fn, "r")
++ f = open(fn, "rb")
+ magic = f.read(4)
+- f.close()
++ f.seek(0, 0)
+ if (magic == "!<ar"):
+ %s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -re35c79c0e44e6a58add42e2dc50ecfaad4e02c0e -r9a5743f40b7e8b6c87c1e54d50262a06068b8b94
#
#
# no changes
#
More information about the Openembedded-commits
mailing list