From: Matthias Hentges <oe@hentges.net>
Date: Thu, 1 Mar 2007 03:22:17 +0000 (+0000)
Subject: rootfs_ipk.bbclass: Work around PATH'ing problems in other image-related bbclasses... 
X-Git-Tag: Release-2010-05/1~9133^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=716006a3dc9d250baf3e80a235300367daa2f949;p=openembedded.git

rootfs_ipk.bbclass: Work around PATH'ing problems in other image-related bbclasses and / or .bb's
---

diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index eeb2f3f4c4..c7b0b6cc1c 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -41,6 +41,7 @@ rootfs_create_combined_feed() {
 	# Set DEPLOY_ENABLE_OEFEED=2 to rebuild Packages with ipkg-make-index (very slow)
 	# Set DEPLOY_ENABLE_OEFEED=1 to use the Packages files from ipk/ARCH/ (fast)
 
+	OLD_PWD="$PWD"
 	mkdir -p "${DEPLOY_DIR}/oe-feed"	
 	cd "${DEPLOY_DIR}/oe-feed" || exit 1
 
@@ -74,6 +75,9 @@ rootfs_create_combined_feed() {
 		touch ${DEPLOY_DIR}/oe-feed/Packages
 		ipkg-make-index -r ${DEPLOY_DIR}/oe-feed/Packages -p ${DEPLOY_DIR}/oe-feed/Packages -l ${DEPLOY_DIR}/oe-feed/Packages.filelist -m ${DEPLOY_DIR}/oe-feed/
 	fi
+	
+	# Some *-image.bb's are kinda touchy-feely about a changing $PWD 
+	cd "$OLD_PWD"
 }
 
 fakeroot rootfs_ipk_do_rootfs () {