diff options
author | Khem Raj <raj.khem@gmail.com> | 2011-05-19 13:56:00 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-20 12:40:44 +0100 |
commit | 7576968a0eebb1fef2b78f41026a7c83a56ffd32 (patch) | |
tree | 6f25d7e3b6d6d53985d7165982607001cb330ed2 /meta/recipes-devtools/opkg-utils | |
parent | 9fbd9b93aea780c8168f6de2692148b14dd9d6a7 (diff) | |
download | poky-7576968a0eebb1fef2b78f41026a7c83a56ffd32.tar.gz |
opkg-utils: Synchronise with OE
Import mtime-int.patch from OE commit
c81990aecae3bdf70a7c924699776b248ab7a006
Pass LDFLAGS to linker to avoid missing GNU_HASH QA errors
(From OE-Core rev: d85c4cb45159bbc1da138def38acd0134b9d0c4c)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/opkg-utils')
-rw-r--r-- | meta/recipes-devtools/opkg-utils/opkg-utils/mtime-int.patch | 29 | ||||
-rw-r--r-- | meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb | 7 |
2 files changed, 34 insertions, 2 deletions
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/mtime-int.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/mtime-int.patch new file mode 100644 index 0000000000..fdbce21e4e --- /dev/null +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/mtime-int.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | Convert mtime to int before comparing it | ||
2 | |||
3 | The st_mtime attribute (which is a float) is compared against a value | ||
4 | from the timestamp database, which was stored as an integer there. | ||
5 | |||
6 | When working on a filesystem with precise timestamps the comparision | ||
7 | will fail nearly everytime hence. | ||
8 | |||
9 | Although it might be possible to enhance the database to store the | ||
10 | fractional part too, this will complicate things more than we would | ||
11 | gain by this change. | ||
12 | |||
13 | Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> | ||
14 | |||
15 | Upstream-Status: Pending | ||
16 | |||
17 | Index: opkg-utils/opkg-make-index | ||
18 | =================================================================== | ||
19 | --- opkg-utils.orig/opkg-make-index | ||
20 | +++ opkg-utils/opkg-make-index | ||
21 | @@ -100,7 +100,7 @@ for filename in files: | ||
22 | pkg = None | ||
23 | fnameStat = os.stat(filename) | ||
24 | if old_pkg_hash.has_key(basename): | ||
25 | - if pkgsStamps.has_key(basename) and fnameStat.st_mtime == pkgsStamps[basename]: | ||
26 | + if pkgsStamps.has_key(basename) and int(fnameStat.st_mtime) == pkgsStamps[basename]: | ||
27 | if (verbose): | ||
28 | sys.stderr.write("Found %s in Packages\n" % (filename,)) | ||
29 | pkg = old_pkg_hash[basename] | ||
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb index 0db6f802f3..79cee2e4f5 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb | |||
@@ -9,10 +9,12 @@ RDEPENDS_${PN} = "python" | |||
9 | RDEPENDS_${PN}_virtclass-native = "" | 9 | RDEPENDS_${PN}_virtclass-native = "" |
10 | SRCREV = "4747" | 10 | SRCREV = "4747" |
11 | PV = "0.1.8+svnr${SRCPV}" | 11 | PV = "0.1.8+svnr${SRCPV}" |
12 | PR = "r2" | 12 | PR = "r3" |
13 | 13 | ||
14 | SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \ | 14 | SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \ |
15 | file://index-ignore-filenotfound.patch" | 15 | file://index-ignore-filenotfound.patch \ |
16 | file://mtime-int.patch \ | ||
17 | " | ||
16 | 18 | ||
17 | S = "${WORKDIR}/opkg-utils" | 19 | S = "${WORKDIR}/opkg-utils" |
18 | 20 | ||
@@ -24,3 +26,4 @@ do_install() { | |||
24 | } | 26 | } |
25 | 27 | ||
26 | BBCLASSEXTEND = "native" | 28 | BBCLASSEXTEND = "native" |
29 | TARGET_CC_ARCH += "${LDFLAGS}" | ||