diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2015-09-15 22:41:29 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2015-09-15 22:41:29 +0300 |
commit | 21f9b84b4b729fbd7acbd465e7a3f726e4d20f91 (patch) | |
tree | eb2d091d427ca0813b445509d59cc8e27e8ad25f /yocto-poky/meta/recipes-devtools/rpm/rpm-4.11.2/remove-dir-check.patch | |
parent | 101cef31e2bf54c678501155cd2106251acbd076 (diff) | |
parent | c124f4f2e04dca16a428a76c89677328bc7bf908 (diff) | |
download | openbmc-21f9b84b4b729fbd7acbd465e7a3f726e4d20f91.tar.xz |
Merge commit 'c124f4f2e04dca16a428a76c89677328bc7bf908' as 'yocto-poky'
Diffstat (limited to 'yocto-poky/meta/recipes-devtools/rpm/rpm-4.11.2/remove-dir-check.patch')
-rw-r--r-- | yocto-poky/meta/recipes-devtools/rpm/rpm-4.11.2/remove-dir-check.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/yocto-poky/meta/recipes-devtools/rpm/rpm-4.11.2/remove-dir-check.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm-4.11.2/remove-dir-check.patch new file mode 100644 index 000000000..f1ecab7b0 --- /dev/null +++ b/yocto-poky/meta/recipes-devtools/rpm/rpm-4.11.2/remove-dir-check.patch @@ -0,0 +1,23 @@ +Upstream-Status: Pending + +Signed-off-by: Saul Wold <sgw@linux.intel.com> +Signed-off-by: Ronan Le Martret <ronan.lemartret@open.eurogiciel.org> + + +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); |