diff options
author | Ross Burton <ross.burton@intel.com> | 2013-05-31 12:05:39 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-31 14:02:45 +0100 |
commit | 73dae11852c656adbf5a2b0e44ac4c7e0078cd8d (patch) | |
tree | 7bfe5a967d622e4fecb4cd57a84cea38bf623859 /meta/recipes-devtools/rpm/rpm_5.4.9.bb | |
parent | ea281d3b8e5f2ae21b37ea2ad4d440bf9c6427ff (diff) | |
download | poky-73dae11852c656adbf5a2b0e44ac4c7e0078cd8d.tar.gz |
rpm: remove .real hacks in argument parsing
The argument parser in RPM was patched to look for <binary>.real, but since the
wrapper now fakes the right argv[0] rpm wasn't able to parse any options.
(From OE-Core rev: a67b4cfc41819ed77ed2bc4246228e9d006a4317)
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_5.4.9.bb')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.9.bb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb index 2dbdca6e6f..25ec23e811 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb | |||
@@ -478,10 +478,6 @@ do_install_append_class-native() { | |||
478 | RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir', True), d.getVar('bindir', True))}/rpm} \ | 478 | RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir', True), d.getVar('bindir', True))}/rpm} \ |
479 | RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir', True), d.getVar('bindir', True))}/locale | 479 | RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir', True), d.getVar('bindir', True))}/locale |
480 | done | 480 | done |
481 | |||
482 | # Adjust popt macros to match... | ||
483 | cat ${D}/${libdir}/rpm/rpmpopt | sed -e "s,^\(rpm[^ ]*\)\([ ]\),\1.real\2," > ${D}/${libdir}/rpm/rpmpopt.new | ||
484 | mv ${D}/${libdir}/rpm/rpmpopt.new ${D}/${libdir}/rpm/rpmpopt | ||
485 | } | 481 | } |
486 | 482 | ||
487 | BBCLASSEXTEND = "native" | 483 | BBCLASSEXTEND = "native" |