diff options
author | Ming Liu <ming.liu@windriver.com> | 2014-10-21 19:10:54 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-10-24 17:36:16 +0100 |
commit | 9f33c2858c4192ade4d80091448b1513467196d6 (patch) | |
tree | 411531eb94abcf107d6f2bd42a7e98199e7f6df2 /meta/recipes-devtools/rpm/rpm/rpm-realpath.patch | |
parent | 4c222d3a67bae265ff42b448ef4a643b0131e578 (diff) | |
download | poky-9f33c2858c4192ade4d80091448b1513467196d6.tar.gz |
rpm: realpath is required before expanding _dbpath in chroot
A regression is introduced by commit 66573093:
[ rpm: Fix rpm relocation macro usage ]
_usr turned out to be a relative path to support dyanmic config after
that, but it's being used somewhere as a indicator to locate substrings,
so we must get the real path of it in advance.
(From OE-Core rev: 1247955a907f51aac7efd305d26856e263c11a65)
Signed-off-by: Ming Liu <ming.liu@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-realpath.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-realpath.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-realpath.patch b/meta/recipes-devtools/rpm/rpm/rpm-realpath.patch new file mode 100644 index 0000000000..d2d9b09845 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm-realpath.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | chroot: realpath is required before expanding _dbpath | ||
2 | |||
3 | _usr turned out to be a relative path to support dyanmic config, but it's | ||
4 | being used somewhere as a indicator to locate substrings, so we must get | ||
5 | the real path of it in advance. | ||
6 | |||
7 | Upstream-Status: Inapproriate (OpenEmbedded specific) | ||
8 | |||
9 | Signed-off-by: Ming Liu <ming.liu@windriver.com> | ||
10 | |||
11 | diff -urpN a/rpmio/rpmrpc.c b/rpmio/rpmrpc.c | ||
12 | --- a/rpmio/rpmrpc.c | ||
13 | +++ b/rpmio/rpmrpc.c | ||
14 | @@ -257,7 +257,9 @@ int Open(const char * path, int flags, m | ||
15 | /* XXX if the open(2) fails, try to strip a possible chroot(2) prefix. */ | ||
16 | if (fdno < 0 && errno == ENOENT) { | ||
17 | const char *dbpath = rpmExpand("%{?_dbpath}/", NULL); | ||
18 | - const char * fn = strstr(path + 1, dbpath); | ||
19 | + char resolved_dbpath[PATH_MAX]; | ||
20 | + realpath(dbpath, resolved_dbpath); | ||
21 | + const char * fn = strstr(path + 1, resolved_dbpath); | ||
22 | if (fn) | ||
23 | fdno = open(fn, flags, mode); | ||
24 | dbpath = _free(dbpath); | ||