[oe-commits] Koen Kooi : sourcepkg: split per package arch to catch arch overrides as well

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: c1965f2fe85ea931f937ca773bb16082d61e0e7c
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=c1965f2fe85ea931f937ca773bb16082d61e0e7c

Author: Koen Kooi <koen at openembedded.org>
Date:   Tue Mar 16 13:31:17 2010 +0100

sourcepkg: split per package arch to catch arch overrides as well

---

 classes/sourcepkg.bbclass |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass
index 7c202af..7e73680 100644
--- a/classes/sourcepkg.bbclass
+++ b/classes/sourcepkg.bbclass
@@ -30,7 +30,7 @@ def get_src_tree(d):
 
 sourcepkg_do_create_orig_tgz(){
 
-	mkdir -p ${DEPLOY_DIR_SRC}/${PN}
+	mkdir -p ${DEPLOY_DIR_SRC}/${PN}/${PACKAGE_ARCH}
 	cd ${WORKDIR}
 	for i in ${EXCLUDE_FROM}; do
 		echo $i >> temp/exclude-from-file
@@ -39,8 +39,8 @@ sourcepkg_do_create_orig_tgz(){
 	src_tree=$(basename ${S})
 	
 	echo $src_tree
-	oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${PN}/${P}.orig.tar.gz"
-	tar cvzf ${DEPLOY_DIR_SRC}/${PN}/${P}.orig.tar.gz --exclude-from temp/exclude-from-file $src_tree
+	oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${PN}/${PACKAGE_ARCH}/${P}.orig.tar.gz"
+	tar cvzf ${DEPLOY_DIR_SRC}/${PN}/${PACKAGE_ARCH}/${P}.orig.tar.gz --exclude-from temp/exclude-from-file $src_tree
 	cp -pPR $src_tree $src_tree.orig
 }
 
@@ -93,8 +93,8 @@ sourcepkg_do_create_diff_gz(){
 		cp $i $src_tree/${DISTRO}/files
 	done
 	
-	oenote "Creating .diff.gz in ${DEPLOY_DIR_SRC}/${PN}/${P}-${PR}.diff.gz"
-	LC_ALL=C TZ=UTC0 diff --exclude-from=temp/exclude-from-file -Naur $src_tree.orig $src_tree | gzip -c > ${DEPLOY_DIR_SRC}/${PN}/${P}-${PR}.diff.gz
+	oenote "Creating .diff.gz in ${DEPLOY_DIR_SRC}/${PN}/${PACKAGE_ARCH}/${P}-${PR}.diff.gz"
+	LC_ALL=C TZ=UTC0 diff --exclude-from=temp/exclude-from-file -Naur $src_tree.orig $src_tree | gzip -c > ${DEPLOY_DIR_SRC}/${PN}/${PACKAGE_ARCH}/${P}-${PR}.diff.gz
 	rm -rf $src_tree.orig
 }