[oe-commits] Richard Purdie : rpm: Fix case where ${B} != ${S}

git at git.openembedded.org git at git.openembedded.org
Mon Mar 18 13:17:28 UTC 2013


Module: openembedded-core.git
Branch: master-next
Commit: 3bc4d1ce04dab55f114b82317115b42883d91db7
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=3bc4d1ce04dab55f114b82317115b42883d91db7

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Mon Mar 18 01:36:35 2013 +0000

rpm: Fix case where ${B} != ${S}

Fix out of tree builds by removing assumptions about cwd and using
full paths to files in ${S}.

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-devtools/rpm/rpm_5.4.9.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
index cdfb5ff..6286771 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
@@ -358,13 +358,13 @@ FILES_${PN}-staticdev = " \
 
 do_configure() {
 	# Disable tests!
-	echo "all:" > tests/Makefile.am
+	echo "all:" > ${S}/tests/Makefile.am
 
-	./autogen.sh
+	${S}/autogen.sh
 
 	# NASTY hack to make sure configure files the right pkg-config file...
 	sed -e 's/pkg-config --exists uuid/pkg-config --exists ossp-uuid/g' \
-	    -e 's/pkg-config uuid/pkg-config ossp-uuid/g' -i configure
+	    -e 's/pkg-config uuid/pkg-config ossp-uuid/g' -i ${S}/configure
 
 	export varprefix=${localstatedir}
 	oe_runconf





More information about the Openembedded-commits mailing list