rpm: remove .real hacks in argument parsing

PATCH New Ross Burton 1 participant 1 message May 31, 2013

Share & tools

Ross Burton

author

2013-05-31 11:22 UTC #0 lore raw

PATCH v2 1/1 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.

[YOCTO #4581]

Signed-off-by Ross Burton <[email protected]>

---
 meta/recipes-devtools/rpm/rpm_5.4.9.bb |    4 ----
 1 file changed, 4 deletions(-)

meta/recipes-devtools/rpm/rpm_5.4.9.bb +0 -4

index 2dbdca6..25ec23e 100644
@@ -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"

Signature · 1 line

1.7.10.4