From 58d9c4e4babbefecc187be2d7f1b812b76d6efc9 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 30 Sep 2014 10:16:54 -0700 Subject: 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 Signed-off-by: Richard Purdie --- .../rpm/rpm-4.11.2/remove-dir-check.patch | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 meta/recipes-devtools/rpm/rpm-4.11.2/remove-dir-check.patch (limited to 'meta/recipes-devtools/rpm/rpm-4.11.2/remove-dir-check.patch') 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 @@ +Upstream-Status: Pending + +Signed-off-by: Saul Wold +Signed-off-by: Ronan Le Martret + + +Index: rpm-4.11.2/build/files.c +=================================================================== +--- rpm-4.11.2.orig/build/files.c ++++ rpm-4.11.2/build/files.c +@@ -1321,12 +1321,6 @@ static rpmRC addFile(FileList fl, const + } + } + +- /* Error out when a non-directory is specified as one in spec */ +- if (fl->cur.isDir && (statp == &statbuf) && !S_ISDIR(statp->st_mode)) { +- rpmlog(RPMLOG_ERR, _("Not a directory: %s\n"), diskPath); +- goto exit; +- } +- + /* Don't recurse into explicit %dir, don't double-recurse from fts */ + if ((fl->cur.isDir != 1) && (statp == &statbuf) && S_ISDIR(statp->st_mode)) { + return recurseDir(fl, diskPath); -- cgit v1.2.3-54-g00ecf