diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2016-02-23 11:28:21 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-09 17:00:27 +0000 |
commit | 007c284cb83cf5d98f3e4f605244ca6f1d46caea (patch) | |
tree | 32efe1a38e908bdc64ac59cad5f7b5e6b2d99ecf /meta/recipes-devtools/rpm/rpm/rpm-payload-use-hashed-inode.patch | |
parent | a27ca6da59e6939a5bbab641236f7f792c03694f (diff) | |
download | poky-007c284cb83cf5d98f3e4f605244ca6f1d46caea.tar.gz |
rpm: Uprev to rpm-5.4.16 (pre) and rpm-5.4+cvs to current CVS head
meta/lib/oe/package_manager.py was also updated. This ensures that any
diagnostic messages are ignored from the output of rpmresolve.
The patches have been split into bug fixes (things that belong upstream)
and local changes that are OE specific.
The following patches are obsolete and have been removed:
rpm-remove-sykcparse-decl.patch
fstack-protector-configure-check.patch
rpm-disable-Wno-override-init.patch
rpm-lua-fix-print.patch
rpm-rpmpgp-fix.patch
verify-fix-broken-logic-for-ghost-avoidance-Mark-Hat.patch
(From OE-Core rev: ee97e53fcceabc6ef4ddc68f38c5fa0e05c5d9a8)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-payload-use-hashed-inode.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-payload-use-hashed-inode.patch | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-payload-use-hashed-inode.patch b/meta/recipes-devtools/rpm/rpm/rpm-payload-use-hashed-inode.patch index 9cd02a0f92..47470d23a0 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-payload-use-hashed-inode.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-payload-use-hashed-inode.patch | |||
@@ -124,23 +124,3 @@ Index: rpm-5.4.14/build/files.c | |||
124 | } | 124 | } |
125 | 125 | ||
126 | ui32 = fl->totalFileSize; | 126 | ui32 = fl->totalFileSize; |
127 | Index: rpm-5.4.14/lib/fsm.c | ||
128 | =================================================================== | ||
129 | --- rpm-5.4.14.orig/lib/fsm.c | ||
130 | +++ rpm-5.4.14/lib/fsm.c | ||
131 | @@ -904,6 +904,7 @@ int fsmMapAttrs(IOSM_t fsm) | ||
132 | |||
133 | if (fi && i >= 0 && i < (int) fi->fc) { | ||
134 | mode_t perms = (S_ISDIR(st->st_mode) ? fi->dperms : fi->fperms); | ||
135 | + ino_t finalInode = (fi->finodes ? (ino_t)fi->finodes[i] : 0); | ||
136 | mode_t finalMode = (fi->fmodes ? (mode_t)fi->fmodes[i] : perms); | ||
137 | dev_t finalRdev = (dev_t)(fi->frdevs ? fi->frdevs[i] : 0); | ||
138 | rpmuint32_t finalMtime = (fi->fmtimes ? fi->fmtimes[i] : 0); | ||
139 | @@ -943,6 +944,7 @@ int fsmMapAttrs(IOSM_t fsm) | ||
140 | if ((S_ISCHR(st->st_mode) || S_ISBLK(st->st_mode)) | ||
141 | && st->st_nlink == 0) | ||
142 | st->st_nlink = 1; | ||
143 | + st->st_ino = finalInode; | ||
144 | st->st_rdev = finalRdev; | ||
145 | st->st_mtime = finalMtime; | ||
146 | } | ||