diff options
| author | Sergey Lapin <slapin@ossfans.org> | 2010-03-22 18:13:56 +0300 |
|---|---|---|
| committer | Sergey Lapin <slapin@ossfans.org> | 2010-03-22 18:13:56 +0300 |
| commit | 3937c88166a493900a694ea8fe53b860f4099d83 (patch) | |
| tree | 57597245b6efd4cf27c1f4c9ff21c0515e530c15 /classes/sourcepkg.bbclass | |
| parent | df2ace6d59e22b42e50bcf4e8a9c92b580602c2e (diff) | |
| parent | 3510d2ed15a4b477aa7af802a839e11a87b981ed (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'classes/sourcepkg.bbclass')
| -rw-r--r-- | classes/sourcepkg.bbclass | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass index 5aacf92d10..ce57ef0e0b 100644 --- a/classes/sourcepkg.bbclass +++ b/classes/sourcepkg.bbclass @@ -1,5 +1,5 @@ DEPLOY_DIR_SRC ?= "${DEPLOY_DIR}/sources" -EXCLUDE_FROM ?= ".pc autom4te.cache" +EXCLUDE_FROM ?= ".pc patches autom4te.cache" # used as part of a path. make sure it's set DISTRO ?= "openembedded" @@ -30,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 @@ -86,27 +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_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 |