diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-03 17:18:25 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-07 00:11:39 +0000 |
commit | d8efd2e3072264642fd80dadef9dfe54cf566cac (patch) | |
tree | 92c57298c364b95957683b1bebcb5b9e9ae09a84 /meta/recipes-support | |
parent | ce5a9df3c46cdaee3f414c56ac982d25f6f00f53 (diff) | |
download | poky-d8efd2e3072264642fd80dadef9dfe54cf566cac.tar.gz |
createrepo: Fix stat floating timestamps
When reading the mtime from disk, the system can get a floating point
value. Convert this to an int for comparision purposes, else some
packages always get reindexed as the value in the index is an int.
(From OE-Core rev: cc01ffeee757738c169f8970fd89bf0933e93532)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/createrepo/createrepo/fixstat.patch | 19 | ||||
-rw-r--r-- | meta/recipes-support/createrepo/createrepo_0.4.11.bb | 1 |
2 files changed, 20 insertions, 0 deletions
diff --git a/meta/recipes-support/createrepo/createrepo/fixstat.patch b/meta/recipes-support/createrepo/createrepo/fixstat.patch new file mode 100644 index 0000000000..d34eb56a8e --- /dev/null +++ b/meta/recipes-support/createrepo/createrepo/fixstat.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | When reading the mtime from disk, the system can get a floating point | ||
2 | value. Convert this to an int for comparision purposes, else some | ||
3 | packages always get reindexed as the value in the index is an int. | ||
4 | RP 2016/3/2 | ||
5 | Upstream-Status: Pending | ||
6 | |||
7 | Index: createrepo-0.4.11/readMetadata.py | ||
8 | =================================================================== | ||
9 | --- createrepo-0.4.11.orig/readMetadata.py | ||
10 | +++ createrepo-0.4.11/readMetadata.py | ||
11 | @@ -126,7 +126,7 @@ class MetadataIndex(object): | ||
12 | if self.opts.get('verbose'): | ||
13 | print _("Size (%i -> %i) changed for file %s") % (size,st.st_size,filepath) | ||
14 | return | ||
15 | - if st.st_mtime != mtime: | ||
16 | + if int(st.st_mtime) != mtime: | ||
17 | if self.opts.get('verbose'): | ||
18 | print _("Modification time changed for %s") % filepath | ||
19 | return | ||
diff --git a/meta/recipes-support/createrepo/createrepo_0.4.11.bb b/meta/recipes-support/createrepo/createrepo_0.4.11.bb index 5f9ecf65f3..2a3231b3a4 100644 --- a/meta/recipes-support/createrepo/createrepo_0.4.11.bb +++ b/meta/recipes-support/createrepo/createrepo_0.4.11.bb | |||
@@ -19,6 +19,7 @@ SRC_URI = "http://createrepo.baseurl.org/download/${BP}.tar.gz \ | |||
19 | file://createrepo-dbpath.patch \ | 19 | file://createrepo-dbpath.patch \ |
20 | file://dumpMetadata-disable-signature-validation.patch \ | 20 | file://dumpMetadata-disable-signature-validation.patch \ |
21 | file://rpm-createsolvedb.py \ | 21 | file://rpm-createsolvedb.py \ |
22 | file://fixstat.patch \ | ||
22 | " | 23 | " |
23 | 24 | ||
24 | SRC_URI[md5sum] = "3e9ccf4abcffe3f49af078c83611eda2" | 25 | SRC_URI[md5sum] = "3e9ccf4abcffe3f49af078c83611eda2" |