diff options
| author | Khem Raj <raj.khem@gmail.com> | 2008-12-10 12:08:42 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2008-12-10 12:08:42 -0800 |
| commit | c83835dca4b2a8f8267066037c86a71474f278c2 (patch) | |
| tree | b8645ff1fa623a7b8ce5496a62c2f2a01fd87887 /classes | |
| parent | fca5cadc1e2012f01afcdd67d9482a4c52aa52d1 (diff) | |
| parent | 1a184ff3d7b13923c4b7cd94866307ac8f399bed (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/distutils-base.bbclass | 5 | ||||
| -rw-r--r-- | classes/sourcepkg.bbclass | 14 |
2 files changed, 12 insertions, 7 deletions
diff --git a/classes/distutils-base.bbclass b/classes/distutils-base.bbclass index 70155619b3..a08414aadf 100644 --- a/classes/distutils-base.bbclass +++ b/classes/distutils-base.bbclass @@ -8,9 +8,8 @@ export STAGING_LIBDIR def python_dir(d): import os, bb staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 ) - if os.path.exists( "%s/python2.5" % staging_incdir ): return "python2.5" - if os.path.exists( "%s/python2.4" % staging_incdir ): return "python2.4" - if os.path.exists( "%s/python2.3" % staging_incdir ): return "python2.3" + for majmin in "2.6 2.5 2.4 2.3".split(): + if os.path.exists( "%s/python%s" % ( staging_incdir, majmin ) ): return "python%s" % majmin raise "No Python in STAGING_INCDIR. Forgot to build python-native ?" PYTHON_DIR = "${@python_dir(d)}" diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass index 045b4ce629..200ff8c228 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}${DISTRO_PR}.showdata.dump",d)) + dumpfile = os.path.join(openembeddeddir, bb.data.expand("${P}-${PR}.showdata.dump",d)) try: os.mkdir(openembeddeddir) @@ -97,14 +97,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 + |