[oe-commits] Koen Kooi : sourcepkg.bbclass: put files in ${PN} subdir to avoid cluttering up the dir and generate diff *after* configure to pick up e .g. sed magic as well

[git version control]

Module: openembedded.git
Branch: shr/unstable
Commit: 9b67465cea384186375d9a31ad498176f7d59de6
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=9b67465cea384186375d9a31ad498176f7d59de6

Author: Koen Kooi <koen at openembedded.org>
Date:   Mon Mar 15 16:07:07 2010 +0100

sourcepkg.bbclass: put files in ${PN} subdir to avoid cluttering up the dir and generate diff *after* configure to pick up e.g. sed magic as well

---

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

diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass
index 5aacf92..e11f72b 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}
+	mkdir -p ${DEPLOY_DIR_SRC}/${PN}
 	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=${@get_src_tree(d)}
 	
 	echo $src_tree
-	oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz"
-	tar cvzf ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz --exclude-from temp/exclude-from-file $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
 	cp -pPR $src_tree $src_tree.orig
 }
 
@@ -93,20 +93,20 @@ sourcepkg_do_create_diff_gz(){
 		cp $i $src_tree/${DISTRO}/files
 	done
 	
-	oenote "Creating .diff.gz in ${DEPLOY_DIR_SRC}/${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}/${P}-${PR}.diff.gz
+	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
 	rm -rf $src_tree.orig
 }
 
 EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz
 
 do_create_orig_tgz[deptask] = "do_unpack"
-do_create_diff_gz[deptask] = "do_patch"
+do_create_diff_gz[deptask] = "do_configure"
 do_archive_bb[deptask] = "do_patch"
 do_dumpdata[deptask] = "do_unpack"
 
 addtask create_orig_tgz after do_unpack before do_patch
 addtask archive_bb after do_patch before do_dumpdata
 addtask dumpdata after do_archive_bb before do_create_diff_gz
-addtask create_diff_gz after do_dumpdata before do_configure
+addtask create_diff_gz after do_configure before do_compile