From 9b67465cea384186375d9a31ad498176f7d59de6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 15 Mar 2010 16:07:07 +0100 Subject: sourcepkg.bbclass: put files in ${PN} subdir to avoid cluttering up the dir and generate diff *after* configure to pick up e.g. sed magic as well --- classes/sourcepkg.bbclass | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'classes/sourcepkg.bbclass') diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass index 5aacf92d10..e11f72b6dd 100644 --- a/classes/sourcepkg.bbclass +++ b/classes/sourcepkg.bbclass @@ -30,7 +30,7 @@ def get_src_tree(d): sourcepkg_do_create_orig_tgz(){ - mkdir -p ${DEPLOY_DIR_SRC} + mkdir -p ${DEPLOY_DIR_SRC}/${PN} cd ${WORKDIR} for i in ${EXCLUDE_FROM}; do echo $i >> temp/exclude-from-file @@ -39,8 +39,8 @@ sourcepkg_do_create_orig_tgz(){ src_tree=${@get_src_tree(d)} 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 } @@ -93,20 +93,20 @@ 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}/${PN}/${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}/${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 -- cgit v1.2.3 From 0b31947db8cc73fb23eecd3a1abaa3b4d465df9a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 15 Mar 2010 16:13:31 +0100 Subject: sourcepkg.bbclass: OE's quilt now puts patches in patches/ instead of .pc/, so add that to the blacklist as well --- classes/sourcepkg.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/sourcepkg.bbclass') diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass index e11f72b6dd..65b1de5659 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" -- cgit v1.2.3 From 9bcb1b1bb571de4fa3cdfcfa2e3ba667b1ddfd04 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 15 Mar 2010 16:24:33 +0100 Subject: sourcepkg: replace python with shell to avoid problems with packaged-staging --- classes/sourcepkg.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'classes/sourcepkg.bbclass') diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass index 65b1de5659..7c202af4c9 100644 --- a/classes/sourcepkg.bbclass +++ b/classes/sourcepkg.bbclass @@ -36,7 +36,7 @@ sourcepkg_do_create_orig_tgz(){ 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}/${PN}/${P}.orig.tar.gz" @@ -46,7 +46,7 @@ sourcepkg_do_create_orig_tgz(){ sourcepkg_do_archive_bb() { - src_tree=${@get_src_tree(d)} + src_tree=$(basename ${S}) dest=${WORKDIR}/$src_tree/${DISTRO} mkdir -p $dest @@ -86,7 +86,7 @@ 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 -- cgit v1.2.3 From c1965f2fe85ea931f937ca773bb16082d61e0e7c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 16 Mar 2010 13:31:17 +0100 Subject: sourcepkg: split per package arch to catch arch overrides as well --- classes/sourcepkg.bbclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'classes/sourcepkg.bbclass') diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass index 7c202af4c9..7e73680f33 100644 --- a/classes/sourcepkg.bbclass +++ b/classes/sourcepkg.bbclass @@ -30,7 +30,7 @@ def get_src_tree(d): sourcepkg_do_create_orig_tgz(){ - mkdir -p ${DEPLOY_DIR_SRC}/${PN} + mkdir -p ${DEPLOY_DIR_SRC}/${PN}/${PACKAGE_ARCH} cd ${WORKDIR} for i in ${EXCLUDE_FROM}; do echo $i >> temp/exclude-from-file @@ -39,8 +39,8 @@ sourcepkg_do_create_orig_tgz(){ src_tree=$(basename ${S}) echo $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 + oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${PN}/${PACKAGE_ARCH}/${P}.orig.tar.gz" + tar cvzf ${DEPLOY_DIR_SRC}/${PN}/${PACKAGE_ARCH}/${P}.orig.tar.gz --exclude-from temp/exclude-from-file $src_tree cp -pPR $src_tree $src_tree.orig } @@ -93,8 +93,8 @@ sourcepkg_do_create_diff_gz(){ cp $i $src_tree/${DISTRO}/files done - oenote "Creating .diff.gz in ${DEPLOY_DIR_SRC}/${PN}/${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}/${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 } -- cgit v1.2.3 From 5a70033fdb4ff5370a5d2c5731a0e229497b8081 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 17 Mar 2010 10:03:18 +0100 Subject: sourcepkg: save lots of space by only making the diff arch specific --- classes/sourcepkg.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'classes/sourcepkg.bbclass') diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass index 7e73680f33..ce57ef0e0b 100644 --- a/classes/sourcepkg.bbclass +++ b/classes/sourcepkg.bbclass @@ -39,8 +39,8 @@ sourcepkg_do_create_orig_tgz(){ src_tree=$(basename ${S}) echo $src_tree - oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${PN}/${PACKAGE_ARCH}/${P}.orig.tar.gz" - tar cvzf ${DEPLOY_DIR_SRC}/${PN}/${PACKAGE_ARCH}/${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 } -- cgit v1.2.3