All of lore.kernel.org
 help / color / mirror / Atom feed
From: Saul Wold <sgw@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 08/12] opkg-utils: Synchronise with OE
Date: Fri, 20 May 2011 00:06:58 -0700	[thread overview]
Message-ID: <4c5701ba9746df83913c12029a08dedec29fd221.1305874831.git.sgw@linux.intel.com> (raw)
In-Reply-To: <cover.1305874831.git.sgw@linux.intel.com>
In-Reply-To: <cover.1305874831.git.sgw@linux.intel.com>

From: Khem Raj <raj.khem@gmail.com>

Import mtime-int.patch from OE commit
c81990aecae3bdf70a7c924699776b248ab7a006

Pass LDFLAGS to linker to avoid missing GNU_HASH QA errors

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../opkg-utils/opkg-utils/mtime-int.patch          |   29 ++++++++++++++++++++
 meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb |    7 +++-
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/mtime-int.patch

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 0000000..fdbce21
--- /dev/null
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils/mtime-int.patch
@@ -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]
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb
index 0db6f80..79cee2e 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"
 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}"
-- 
1.7.3.4




  parent reply	other threads:[~2011-05-20  7:10 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-20  7:06 [PATCH 00/12] 20-May-2011 Consolidated Pull Saul Wold
2011-05-20  7:06 ` [PATCH 01/12] tcmode-default: switch to gcc 4.6.0 for x86, x86-64 & arm Saul Wold
2011-05-20  7:06 ` [PATCH 02/12] modutils-cross: fix install issue Saul Wold
2011-05-20  7:06 ` [PATCH 03/12] conf: Create distro overridable IMAGE varibales Saul Wold
2011-05-20  7:06 ` [PATCH 04/12] uclibc/site_config/funcs: getloadavg is unimplemented Saul Wold
2011-05-20  7:06 ` [PATCH 05/12] nfs-utils_1.2.3.bb: Fix compile failure on uclibc Saul Wold
2011-05-20  7:06 ` [PATCH 06/12] distcc_2.18.3.bb: Fix compilation " Saul Wold
2011-05-20  7:06 ` [PATCH 07/12] opkg_svn.bb: Install rcS.d into ${D} instead of ${IMAGE_ROOTFS} Saul Wold
2011-05-20  7:06 ` Saul Wold [this message]
2011-05-20  7:06 ` [PATCH 09/12] package-index.bb: add support for deb and rpm Saul Wold
2011-05-20  7:07 ` [PATCH 10/12] ed (GPLv2): remove --disable-silent-rules Saul Wold
2011-05-20  7:07 ` [PATCH 11/12] gettext (gplv2): add virtual/gettext to PROVIDES list Saul Wold
2011-05-20  7:07 ` [PATCH 12/12] u-boot: fix LIC_FILE_CHKSUM Saul Wold
2011-05-20 11:45 ` [PATCH 00/12] 20-May-2011 Consolidated Pull Richard Purdie
2011-05-20 23:46   ` Darren Hart
2011-05-20 23:50     ` Saul Wold

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4c5701ba9746df83913c12029a08dedec29fd221.1305874831.git.sgw@linux.intel.com \
    --to=sgw@linux.intel.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.