From 6bb0e35b6e3f7b1e6370d1f81168b2e157b8a897 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 31 May 2013 12:05:39 +0100 Subject: [PATCH] rpm: remove .real hacks in argument parsing The argument parser in RPM was patched to look for .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 Signed-off-by: Richard Purdie --- meta/recipes-devtools/rpm/rpm_5.4.9.bb | 4 ---- 1 file changed, 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 2dbdca6..25ec23e 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() { RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir', True), d.getVar('bindir', True))}/rpm} \ RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir', True), d.getVar('bindir', True))}/locale done - - # Adjust popt macros to match... - cat ${D}/${libdir}/rpm/rpmpopt | sed -e "s,^\(rpm[^ ]*\)\([ ]\),\1.real\2," > ${D}/${libdir}/rpm/rpmpopt.new - mv ${D}/${libdir}/rpm/rpmpopt.new ${D}/${libdir}/rpm/rpmpopt } BBCLASSEXTEND = "native" -- 2.7.4