bitbake: unified, added rdependency on python-crypt (md5) and python-netclient (tinde...

diff --git a/packages/bitbake/bitbake-package.inc b/packages/bitbake/bitbake-package.inc
deleted file mode 100644 (file)
index fa1e76b..0000000
--- a/packages/bitbake/bitbake-package.inc
+++ /dev/null
@@ -1 +0,0 @@
-FILES_${PN} += "${datadir}/bitbake"

diff --git a/packages/bitbake/bitbake.inc b/packages/bitbake/bitbake.inc
index 1c5c7ad..2c5f523 100644 (file)
--- a/packages/bitbake/bitbake.inc
+++ b/packages/bitbake/bitbake.inc
@@ -9,3 +9,14 @@ HOMEPAGE = "http://developer.berlios.de/projects/bitbake/"
 LICENSE = "GPL MIT"
 SECTION = "devel"
 SUMMARY = "BitBake build tool"
+RDEPENDS += "python-shell python-lang python-textutils python-pickle python-crypt python-netclient"
+
+# crypt for md5
+# netclient for tinderclient.bbclass
+
+# We don't need a toolchain...
+INHIBIT_DEFAULT_DEPS = "1"
+
+inherit distutils
+
+FILES_${PN} += "${datadir}/bitbake"

diff --git a/packages/bitbake/bitbake_1.6.2.bb b/packages/bitbake/bitbake_1.6.2.bb
index f0fdfb9..6a6fffc 100644 (file)
--- a/packages/bitbake/bitbake_1.6.2.bb
+++ b/packages/bitbake/bitbake_1.6.2.bb
@@ -1,16 +1,7 @@
 require bitbake.inc
 
-PR = "r0"
-
-# We don't need a toolchain...
-INHIBIT_DEFAULT_DEPS = "1"
+PR = "r1"
 
 SRC_URI = "http://download.berlios.de/bitbake/bitbake-${PV}.tar.gz"
 
 S = "${WORKDIR}/bitbake-${PV}"
-
-inherit distutils
-
-require bitbake-package.inc
-
-RDEPENDS += "python-shell python-lang python-textutils  python-pickle"

diff --git a/packages/bitbake/bitbake_svn.bb b/packages/bitbake/bitbake_svn.bb
index d43d03b..d16471d 100644 (file)
--- a/packages/bitbake/bitbake_svn.bb
+++ b/packages/bitbake/bitbake_svn.bb
@@ -1,16 +1,11 @@
 require bitbake.inc
 
+PV = "1.7.2+svn${SRCDATE}"
+PR = "r1"
+
 # Don't use the tip of svn by default
 DEFAULT_PREFERENCE = "-1"
 
-# We don't need a toolchain...
-INHIBIT_DEFAULT_DEPS = "1"
-
-PV = "1.7.0+svn${SRCDATE}"
 SRC_URI = "svn://svn.berlios.de/bitbake/trunk;module=bitbake"
-# SRC_URI = "svn+ssh://svn.berlios.de/bitbake/trunk;module=bitbake"
-S = "${WORKDIR}/bitbake"
 
-inherit distutils
-
-require bitbake-package.inc
+S = "${WORKDIR}/bitbake"