diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2008-10-27 14:46:12 -0200 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2008-10-27 16:17:08 -0200 |
| commit | 7eaf16203ae0c7e8196fa5507ef635ca2e02f727 (patch) | |
| tree | 8d71d4142a04d73804ca33f72afcd944f862fe05 | |
| parent | 961558b51f425b7a34b67d503296f7e1b0479b34 (diff) | |
sourcepkg.bbclass: use DISTRO_PR value
| -rw-r--r-- | classes/sourcepkg.bbclass | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass index bbc9f187ec..9621b4e062 100644 --- a/classes/sourcepkg.bbclass +++ b/classes/sourcepkg.bbclass @@ -63,7 +63,7 @@ python sourcepkg_do_dumpdata() { 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}.showdata.dump",d)) + dumpfile = os.path.join(openembeddeddir, bb.data.expand("${P}-${PR}${DISTRO_PR}.showdata.dump",d)) try: os.mkdir(openembeddeddir) @@ -97,8 +97,8 @@ 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}/${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 rm -rf $src_tree.orig } @@ -108,4 +108,3 @@ 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 - |