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>
This commit is contained in:
Khem Raj
2011-05-19 13:56:00 -07:00
committed by Richard Purdie
parent 9fbd9b93ae
commit 7576968a0e
2 changed files with 34 additions and 2 deletions

View File

@@ -0,0 +1,29 @@
Convert mtime to int before comparing it
The st_mtime attribute (which is a float) is compared against a value
from the timestamp database, which was stored as an integer there.
When working on a filesystem with precise timestamps the comparision
will fail nearly everytime hence.
Although it might be possible to enhance the database to store the
fractional part too, this will complicate things more than we would
gain by this change.
Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Upstream-Status: Pending
Index: opkg-utils/opkg-make-index
===================================================================
--- opkg-utils.orig/opkg-make-index
+++ opkg-utils/opkg-make-index
@@ -100,7 +100,7 @@ for filename in files:
pkg = None
fnameStat = os.stat(filename)
if old_pkg_hash.has_key(basename):
- if pkgsStamps.has_key(basename) and fnameStat.st_mtime == pkgsStamps[basename]:
+ if pkgsStamps.has_key(basename) and int(fnameStat.st_mtime) == pkgsStamps[basename]:
if (verbose):
sys.stderr.write("Found %s in Packages\n" % (filename,))
pkg = old_pkg_hash[basename]

View File

@@ -9,10 +9,12 @@ RDEPENDS_${PN} = "python"
RDEPENDS_${PN}_virtclass-native = ""
SRCREV = "4747"
PV = "0.1.8+svnr${SRCPV}"
PR = "r2"
PR = "r3"
SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \
file://index-ignore-filenotfound.patch"
file://index-ignore-filenotfound.patch \
file://mtime-int.patch \
"
S = "${WORKDIR}/opkg-utils"
@@ -24,3 +26,4 @@ do_install() {
}
BBCLASSEXTEND = "native"
TARGET_CC_ARCH += "${LDFLAGS}"