xf86-video-omapfb: pandora: handle cycle/forcer events better

[openembedded.git] / classes / sourcepkg.bbclass

diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass
index bbc9f18..ce57ef0 100644 (file)
--- a/classes/sourcepkg.bbclass
+++ b/classes/sourcepkg.bbclass
@@ -1,12 +1,10 @@
-DEPLOY_DIR_SRC ?= "${DEPLOY_DIR}/source"
-EXCLUDE_FROM ?= ".pc autom4te.cache"
+DEPLOY_DIR_SRC ?= "${DEPLOY_DIR}/sources"
+EXCLUDE_FROM ?= ".pc patches autom4te.cache"
 
 # used as part of a path. make sure it's set
 DISTRO ?= "openembedded"
 
 def get_src_tree(d):
-       import bb
-       import os, os.path
 
        workdir = bb.data.getVar('WORKDIR', d, 1)
        if not workdir:
@@ -32,23 +30,23 @@ def get_src_tree(d):
 
 sourcepkg_do_create_orig_tgz(){
 
-       mkdir -p ${DEPLOY_DIR_SRC}
+       mkdir -p ${DEPLOY_DIR_SRC}/${PN}/${PACKAGE_ARCH}
        cd ${WORKDIR}
        for i in ${EXCLUDE_FROM}; do
                echo $i >> temp/exclude-from-file
        done
 
-       src_tree=${@get_src_tree(d)}
+       src_tree=$(basename ${S})
        
        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
 }
 
 sourcepkg_do_archive_bb() {
 
-       src_tree=${@get_src_tree(d)}
+       src_tree=$(basename ${S})
        dest=${WORKDIR}/$src_tree/${DISTRO}
        mkdir -p $dest
 
@@ -56,8 +54,6 @@ sourcepkg_do_archive_bb() {
 }
 
 python sourcepkg_do_dumpdata() {
-       import os
-       import os.path
 
        workdir = bb.data.getVar('WORKDIR', d, 1)
        distro = bb.data.getVar('DISTRO', d, 1)
@@ -90,22 +86,27 @@ sourcepkg_do_create_diff_gz(){
        done
 
 
-       src_tree=${@get_src_tree(d)}
+       src_tree=$(basename ${S})
 
        for i in `find . -maxdepth 1 -type f`; do
                mkdir -p $src_tree/${DISTRO}/files
                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}/${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
 }
 
 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_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_dump_data before do_configure
+addtask create_diff_gz after do_configure before do_compile