diff options
author | Saul Wold <sgw@linux.intel.com> | 2014-09-30 10:16:54 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-30 21:36:13 +0100 |
commit | 58d9c4e4babbefecc187be2d7f1b812b76d6efc9 (patch) | |
tree | 4f6ee75962b5c79fa754730f3e6847751fabc42a /meta/recipes-devtools/rpm/rpm-4.11.2/remove-dir-check.patch | |
parent | 6be3386e78ec8aac1fd1631047ddf967f4843f3d (diff) | |
download | poky-58d9c4e4babbefecc187be2d7f1b812b76d6efc9.tar.gz |
rpm: add version 4.11.2
add patch to remove db3 from configure.ac
add inherit pkgconfig
(From OE-Core rev: 9a17f938e738a16a1ef9a00be6a8317d71f92573)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm-4.11.2/remove-dir-check.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm-4.11.2/remove-dir-check.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm-4.11.2/remove-dir-check.patch b/meta/recipes-devtools/rpm/rpm-4.11.2/remove-dir-check.patch new file mode 100644 index 0000000000..f1ecab7b0e --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm-4.11.2/remove-dir-check.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
4 | Signed-off-by: Ronan Le Martret <ronan.lemartret@open.eurogiciel.org> | ||
5 | |||
6 | |||
7 | Index: rpm-4.11.2/build/files.c | ||
8 | =================================================================== | ||
9 | --- rpm-4.11.2.orig/build/files.c | ||
10 | +++ rpm-4.11.2/build/files.c | ||
11 | @@ -1321,12 +1321,6 @@ static rpmRC addFile(FileList fl, const | ||
12 | } | ||
13 | } | ||
14 | |||
15 | - /* Error out when a non-directory is specified as one in spec */ | ||
16 | - if (fl->cur.isDir && (statp == &statbuf) && !S_ISDIR(statp->st_mode)) { | ||
17 | - rpmlog(RPMLOG_ERR, _("Not a directory: %s\n"), diskPath); | ||
18 | - goto exit; | ||
19 | - } | ||
20 | - | ||
21 | /* Don't recurse into explicit %dir, don't double-recurse from fts */ | ||
22 | if ((fl->cur.isDir != 1) && (statp == &statbuf) && S_ISDIR(statp->st_mode)) { | ||
23 | return recurseDir(fl, diskPath); | ||