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

diff --git a/classes/pkg_distribute.bbclass b/classes/pkg_distribute.bbclass
index e69de29..81978e3 100644 (file)
--- 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 63c9a2d..c378c02 100644 (file)
--- 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 bca72ae..aef674b 100644 (file)
--- 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}"