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:31:58 +0100 |
| commit | 1247955a907f51aac7efd305d26856e263c11a65 (patch) | |
| tree | 53f1bc4984222d36b5cdaeeaeeec270581d56893 /meta | |
| parent | f2f72f8ff623d24fffbb1b0ad40bc08f05ff31dd (diff) | |
| download | openembedded-core-1247955a907f51aac7efd305d26856e263c11a65.tar.gz openembedded-core-1247955a907f51aac7efd305d26856e263c11a65.tar.bz2 openembedded-core-1247955a907f51aac7efd305d26856e263c11a65.zip | |
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.
Signed-off-by: Ming Liu <ming.liu@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-realpath.patch | 24 | ||||
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4+cvs.bb | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.14.bb | 1 |
3 files changed, 26 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 @@ +chroot: realpath is required before expanding _dbpath + +_usr turned out to be a relative path to support dyanmic config, but it's +being used somewhere as a indicator to locate substrings, so we must get +the real path of it in advance. + +Upstream-Status: Inapproriate (OpenEmbedded specific) + +Signed-off-by: Ming Liu <ming.liu@windriver.com> + +diff -urpN a/rpmio/rpmrpc.c b/rpmio/rpmrpc.c +--- a/rpmio/rpmrpc.c ++++ b/rpmio/rpmrpc.c +@@ -257,7 +257,9 @@ int Open(const char * path, int flags, m + /* XXX if the open(2) fails, try to strip a possible chroot(2) prefix. */ + if (fdno < 0 && errno == ENOENT) { + const char *dbpath = rpmExpand("%{?_dbpath}/", NULL); +- const char * fn = strstr(path + 1, dbpath); ++ char resolved_dbpath[PATH_MAX]; ++ realpath(dbpath, resolved_dbpath); ++ const char * fn = strstr(path + 1, resolved_dbpath); + if (fn) + fdno = open(fn, flags, mode); + dbpath = _free(dbpath); diff --git a/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb b/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb index d2dec5f3d1..a85e28fa1f 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb @@ -109,6 +109,7 @@ SRC_URI = "cvs://anonymous@rpm5.org/cvs;tag=rpm-5_4;module=rpm \ file://rpm-db5-or-db6.patch \ file://rpm-rpmpgp-fix.patch \ file://rpm-disable-Wno-override-init.patch \ + file://rpm-realpath.patch \ " # Uncomment the following line to enable platform score debugging diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb index fb8a50706f..6cd932d5e9 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.14.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.14.bb @@ -93,6 +93,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.14-0.20131024.src.rpm;e file://rpm-db5-or-db6.patch \ file://rpm-disable-Wno-override-init.patch \ file://rpmqv_cc_b_gone.patch \ + file://rpm-realpath.patch \ " # Uncomment the following line to enable platform score debugging |