summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-08-28 06:41:39 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-28 15:53:07 (GMT)
commita259fdb296a43b89028edb342ca9967a1b50ab5d (patch)
tree7c18709e9952ae2561f0efb3fbbd86483d09363a /meta/recipes-devtools
parent55997cbf3d4778083dd1073f415fc4396d86f0a0 (diff)
downloadpoky-a259fdb296a43b89028edb342ca9967a1b50ab5d.tar.gz
opkg-utils: bump SRCREV for Packages cache fix and other fixes
(From OE-Core rev: ce5b46980f35097bd5fcc8195c5d5be1b980c870) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/opkg-utils/opkg-utils/add-license-field.patch39
-rw-r--r--meta/recipes-devtools/opkg-utils/opkg-utils/arfile_header_split.patch27
-rw-r--r--meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch73
-rw-r--r--meta/recipes-devtools/opkg-utils/opkg-utils/mtime-int.patch30
-rw-r--r--meta/recipes-devtools/opkg-utils/opkg-utils/shebang.patch46
-rw-r--r--meta/recipes-devtools/opkg-utils/opkg-utils_git.bb7
6 files changed, 1 insertions, 221 deletions
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/add-license-field.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/add-license-field.patch
deleted file mode 100644
index 0d33459..0000000
--- a/meta/recipes-devtools/opkg-utils/opkg-utils/add-license-field.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1Add knowledge about License field in ipk headers
2
3Upstream-Status: Pending
4
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6
7Index: opkg-utils/opkg.py
8===================================================================
9--- opkg-utils.orig/opkg.py 2010-11-01 04:52:35.000000000 -0700
10+++ opkg-utils/opkg.py 2011-07-13 15:18:03.900037344 -0700
11@@ -145,6 +145,7 @@
12 self.priority = None
13 self.tags = None
14 self.fn = fn
15+ self.license = None
16
17 if fn:
18 # see if it is deb format
19@@ -319,6 +320,12 @@
20 def get_section(self, section):
21 return self.section
22
23+ def set_license(self, license):
24+ self.license = license
25+
26+ def get_license(self, license):
27+ return self.license
28+
29 def get_file_list(self):
30 if not self.fn:
31 return []
32@@ -425,6 +432,7 @@
33 if self.description: out = out + "Description: %s\n" % (self.description)
34 if self.oe: out = out + "OE: %s\n" % (self.oe)
35 if self.homepage: out = out + "HomePage: %s\n" % (self.homepage)
36+ if self.license: out = out + "License: %s\n" % (self.license)
37 if self.priority: out = out + "Priority: %s\n" % (self.priority)
38 if self.tags: out = out + "Tags: %s\n" % (self.tags)
39 out = out + "\n"
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/arfile_header_split.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/arfile_header_split.patch
deleted file mode 100644
index b679f8b..0000000
--- a/meta/recipes-devtools/opkg-utils/opkg-utils/arfile_header_split.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From: Scott Anderson <o2e@saaworld.com>
2Subject: ipkg-utils: Make arfile.py handle six digit UIDs
3
4 Essentially, the problem is that arfile.py is splitting the ar header with
5 white-space instead of fixed-width fields, so two fields would get treated
6 as a single field. This makes things better than before as it now honors
7 the fixed field widths.
8
9Upstream-Status: Pending (there is no upstream after openmoko imploded)
10
11--- ipkg-utils/arfile.py.orig 2010-09-29 13:38:15.000000000 -0700
12+++ ipkg-utils/arfile.py 2010-10-01 16:06:00.000000000 -0700
13@@ -74,7 +74,12 @@
14 if l == "\n":
15 l = self.f.readline()
16 if not l: break
17 l = l.replace('`', '')
18- descriptor = l.split()
19+ # Field lengths from /usr/include/ar.h:
20+ ar_field_lens = [ 16, 12, 6, 6, 8, 10, 2 ]
21+ descriptor = []
22+ for field_len in ar_field_lens:
23+ descriptor.append(l[:field_len].strip())
24+ l = l[field_len:]
25 # print descriptor
26 size = int(descriptor[5])
27 memberName = descriptor[0][:-1]
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
deleted file mode 100644
index f0f0fcf..0000000
--- a/meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
+++ /dev/null
@@ -1,73 +0,0 @@
1If we're building an image and some package rebuilds while this is happening
2some package can be removed/added to the ipk deploy directory. The image will
3not depend on this package so we can safely ignore these cases rather than
4error out.
5
6RP - 26/8/09
7
8Upstream-Status: Inappropriate [embedded specific]
9
10Index: opkg-utils/opkg-make-index
11===================================================================
12--- opkg-utils.orig/opkg-make-index 2009-08-26 17:21:26.000000000 +0100
13+++ opkg-utils/opkg-make-index 2009-08-27 16:11:22.000000000 +0100
14@@ -96,6 +96,7 @@
15 files=glob(pkg_dir + '/*.ipk') + glob(pkg_dir + '/*.deb')
16 files.sort()
17 for filename in files:
18+ try:
19 basename = os.path.basename(filename)
20 pkg = None
21 fnameStat = os.stat(filename)
22@@ -130,6 +131,12 @@
23 to_morgue(basename)
24 if opt_s:
25 print filename
26+ except OSError:
27+ sys.stderr.write("Package %s disappeared on us!\n" % (filename))
28+ continue
29+ except IOError:
30+ sys.stderr.write("Package %s disappeared on us!\n" % (filename))
31+ continue
32
33 pkgsStampsFile = open(stamplist_filename, "w")
34 for f in pkgsStamps.keys():
35@@ -148,6 +155,7 @@
36 names = packages.packages.keys()
37 names.sort()
38 for name in names:
39+ try:
40 pkg = packages.packages[name]
41 if locales_dir and pkg.depends:
42 depends = string.split(pkg.depends, ',')
43@@ -165,6 +173,13 @@
44 if (verbose):
45 sys.stderr.write("Writing info for package %s\n" % (pkg.package,))
46 print pkg
47+ except OSError:
48+ sys.stderr.write("Package %s disappeared on us!\n" % (name))
49+ continue
50+ except IOError:
51+ sys.stderr.write("Package %s disappeared on us!\n" % (name))
52+ continue
53+
54 if packages_filename:
55 sys.stdout.close()
56 sys.stdout = old_stdout
57@@ -197,7 +197,15 @@
58 names = packages.packages.keys()
59 names.sort()
60 for name in names:
61- for fn in packages[name].get_file_list():
62+ try:
63+ fnlist = packages[name].get_file_list()
64+ except OSError, e:
65+ sys.stderr.write("Package %s disappeared on us!\n" % (name))
66+ continue
67+ except IOError, e:
68+ sys.stderr.write("Package %s disappeared on us!\n" % (name))
69+ continue
70+ for fn in fnlist:
71 (h,t) = os.path.split(fn)
72 if not t: continue
73 if not files.has_key(t): files[t] = name+':'+fn
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/mtime-int.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/mtime-int.patch
deleted file mode 100644
index 483a62a..0000000
--- a/meta/recipes-devtools/opkg-utils/opkg-utils/mtime-int.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1Convert mtime to int before comparing it
2
3The st_mtime attribute (which is a float) is compared against a value
4from the timestamp database, which was stored as an integer there.
5
6When working on a filesystem with precise timestamps the comparision
7will fail nearly everytime hence.
8
9Although it might be possible to enhance the database to store the
10fractional part too, this will complicate things more than we would
11gain by this change.
12
13Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
14
15Upstream-Status: Pending
16(Contacting the original author, no response yet.)
17
18Index: opkg-utils/opkg-make-index
19===================================================================
20--- opkg-utils.orig/opkg-make-index
21+++ opkg-utils/opkg-make-index
22@@ -100,7 +100,7 @@ for filename in files:
23 pkg = None
24 fnameStat = os.stat(filename)
25 if old_pkg_hash.has_key(basename):
26- if pkgsStamps.has_key(basename) and fnameStat.st_mtime == pkgsStamps[basename]:
27+ if pkgsStamps.has_key(basename) and int(fnameStat.st_mtime) == pkgsStamps[basename]:
28 if (verbose):
29 sys.stderr.write("Found %s in Packages\n" % (filename,))
30 pkg = old_pkg_hash[basename]
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/shebang.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/shebang.patch
deleted file mode 100644
index f6a2ef9..0000000
--- a/meta/recipes-devtools/opkg-utils/opkg-utils/shebang.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1Use python via the PATH, rather than hardcoding /usr/bin/python
2
3Upstream-Status: Pending
4
5Signed-off-by: Christopher Larson <kergoth@gmail.com>
6
7--- opkg-utils.orig/opkg-list-fields
8+++ opkg-utils/opkg-list-fields
9@@ -1,4 +1,4 @@
10-#!/usr/bin/python
11+#!/usr/bin/env python
12
13 import sys, opkg
14
15--- opkg-utils.orig/opkg-make-index
16+++ opkg-utils/opkg-make-index
17@@ -1,4 +1,4 @@
18-#!/usr/bin/python
19+#!/usr/bin/env python
20
21 import sys, os, posixpath
22 from glob import glob
23--- opkg-utils.orig/opkg-show-deps
24+++ opkg-utils/opkg-show-deps
25@@ -1,4 +1,4 @@
26-#!/usr/bin/python
27+#!/usr/bin/env python
28
29 import sys, os, posixpath
30 from glob import glob
31--- opkg-utils.orig/opkg-unbuild
32+++ opkg-utils/opkg-unbuild
33@@ -1,4 +1,4 @@
34-#!/usr/bin/python
35+#!/usr/bin/env python
36
37 import sys, os, re
38
39--- opkg-utils.orig/opkg-update-index
40+++ opkg-utils/opkg-update-index
41@@ -1,4 +1,4 @@
42-#!/usr/bin/env python2.1
43+#!/usr/bin/env python
44
45 import sys, os
46 from glob import glob
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
index 4fe4038..1996c75 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
@@ -6,16 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
6 file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083" 6 file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083"
7RDEPENDS_${PN} = "python" 7RDEPENDS_${PN} = "python"
8RDEPENDS_${PN}_virtclass-native = "" 8RDEPENDS_${PN}_virtclass-native = ""
9SRCREV = "16665959c330b5958c0f0f4624a9ca7f823f98de" 9SRCREV = "44df9dd3dc411ca1255cb4b23bde7eb71aed4778"
10PV = "0.1.8+git${SRCPV}" 10PV = "0.1.8+git${SRCPV}"
11PR = "r1" 11PR = "r1"
12 12
13SRC_URI = "git://git.yoctoproject.org/opkg-utils;protocol=git \ 13SRC_URI = "git://git.yoctoproject.org/opkg-utils;protocol=git \
14 file://index-ignore-filenotfound.patch \
15 file://mtime-int.patch \
16 file://add-license-field.patch \
17 file://arfile_header_split.patch \
18 file://shebang.patch \
19 " 14 "
20 15
21S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"