aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Randolf <br1@subnet.at>2004-12-20 18:51:21 +0000
committerBruno Randolf <br1@subnet.at>2004-12-20 18:51:21 +0000
commit0d266125a7b21f393afdd9dfb8375ede7671dbe4 (patch)
tree2a988dd32894d4fef05fa6dd173ab6f8b7a0687e
parent8030efaa44d23deb74e1b475d477d64ba982c3ba (diff)
downloadopenembedded-0d266125a7b21f393afdd9dfb8375ede7671dbe4.tar.gz
Merge http://oe-devel@oe-devel.bkbits.net/openembedded
into null.(none):/data/mtx/oe/openembedded 2004/12/20 19:50:50+01:00 (none)!br1 add cvsdate to nylon scripts & co 2004/12/20 19:49:59+01:00 (none)!br1 pkg_distribute: exclude SCCS directories BKrev: 41c71f29ho5gzr6iqCq8yVYs6u8s9Q
-rw-r--r--classes/pkg_distribute.bbclass29
-rw-r--r--packages/nylon/nylon-scripts_cvs.bb2
-rw-r--r--packages/nylon/nylon-statistics.bb1
3 files changed, 31 insertions, 1 deletions
diff --git a/classes/pkg_distribute.bbclass b/classes/pkg_distribute.bbclass
index e69de29bb2..81978e3e3b 100644
--- a/classes/pkg_distribute.bbclass
+++ b/classes/pkg_distribute.bbclass
@@ -0,0 +1,29 @@
+PKG_DISTRIBUTECOMMAND[func] = "1"
+python do_distribute_packages () {
+ cmd = bb.data.getVar('PKG_DISTRIBUTECOMMAND', d, 1)
+ if not cmd:
+ raise bb.build.FuncFailed("Unable to distribute packages, PKG_DISTRIBUTECOMMAND not defined")
+ bb.build.exec_func('PKG_DISTRIBUTECOMMAND', d)
+}
+
+addtask distribute_packages before do_build after do_fetch
+
+PKG_DIST_LOCAL ?= "symlink"
+PKG_DISTRIBUTEDIR ?= "${DEPLOY_DIR}/packages"
+
+PKG_DISTRIBUTECOMMAND () {
+ p=`dirname ${FILE}`
+ d=`basename $p`
+ mkdir -p ${PKG_DISTRIBUTEDIR}
+ case "${PKG_DIST_LOCAL}" in
+ copy)
+ # use this weird tar command to copy because we want to
+ # exclude the BitKeeper directories
+ test -e ${PKG_DISTRIBUTEDIR}/${d} || mkdir ${PKG_DISTRIBUTEDIR}/${d};
+ (cd ${p}; tar -c --exclude SCCS -f - . ) | tar -C ${PKG_DISTRIBUTEDIR}/${d} -xpf -
+ ;;
+ symlink)
+ ln -sf $p ${PKG_DISTRIBUTEDIR}/
+ ;;
+ esac
+}
diff --git a/packages/nylon/nylon-scripts_cvs.bb b/packages/nylon/nylon-scripts_cvs.bb
index 63c9a2dfe8..c378c02dff 100644
--- a/packages/nylon/nylon-scripts_cvs.bb
+++ b/packages/nylon/nylon-scripts_cvs.bb
@@ -5,7 +5,7 @@ SECTION = "base"
PRIORITY = "optional"
MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
LICENSE = "GPLv2"
-PR = "r1"
+PV = "cvs${CVSDATE}"
SRC_URI = "svn://meshcube.org/svn/scripts;module=${PN};proto=http"
S = "${WORKDIR}/${PN}"
diff --git a/packages/nylon/nylon-statistics.bb b/packages/nylon/nylon-statistics.bb
index bca72ae75b..aef674b6b2 100644
--- a/packages/nylon/nylon-statistics.bb
+++ b/packages/nylon/nylon-statistics.bb
@@ -4,6 +4,7 @@ SECTION = "base"
PRIORITY = "optional"
MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
LICENSE = "GPLv2"
+PV = "cvs${CVSDATE}"
SRC_URI = "svn://meshcube.org/svn/application;module=${PN};proto=http"
S = "${WORKDIR}/${PN}"