change feature [ remote-keyborad -> enable-rc-kbd ]

[vuplus_openembedded] / classes / sourcepkg.bbclass

diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass
index 9621b4e..5aacf92 100644 (file)
--- a/classes/sourcepkg.bbclass
+++ b/classes/sourcepkg.bbclass
@@ -1,12 +1,10 @@
-DEPLOY_DIR_SRC ?= "${DEPLOY_DIR}/source"
+DEPLOY_DIR_SRC ?= "${DEPLOY_DIR}/sources"
 EXCLUDE_FROM ?= ".pc 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:
@@ -56,14 +54,12 @@ 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)
        s_tree = get_src_tree(d)
        openembeddeddir = os.path.join(workdir, s_tree, distro)
-       dumpfile = os.path.join(openembeddeddir, bb.data.expand("${P}-${PR}${DISTRO_PR}.showdata.dump",d))
+       dumpfile = os.path.join(openembeddeddir, bb.data.expand("${P}-${PR}.showdata.dump",d))
        
        try:
                os.mkdir(openembeddeddir)
@@ -97,14 +93,20 @@ sourcepkg_do_create_diff_gz(){
                cp $i $src_tree/${DISTRO}/files
        done
        
-       oenote "Creating .diff.gz in ${DEPLOY_DIR_SRC}/${P}-${PR}${DISTRO_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}${DISTRO_PR}.diff.gz
+       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
        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_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_dumpdata before do_configure
+