nylon: added nylon-helpers.bbclass (helper functions for working on the svn trunk), updated preferred providers in nylon.conf.

2 files changed, 39 insertions, 0 deletions

diff --git a/classes/nylon-helpers.bbclass b/classes/nylon-helpers.bbclass
new file mode 100644
index 0000000000..1755d91d23
--- /dev/null
+++ b/classes/nylon-helpers.bbclass
@@ -0,0 +1,35 @@
+# ############################################################################
+# Helper functions for building packages from the trunk or branches. To use
+# this .bbclass simply inherit from it in your conf/local.conf.
+#
+# - get_branch() helps to construct the package name when fetching by 
+#   extracting the directory name above the "build" directory containing the
+#   oe environment and bitbake. That directory name is usually the branch in
+#   which the package is located in the svn with one exception: "unstable"
+#   is synonymous for "trunk". In the package you can then use the ${BRANCH}
+#   variable within the svn (or cvs) url for the package.
+#
+# - get_tomorrow() makes sure the latest version of a package is fetched. To
+#   use it, set the SRCDATE to ${TOMORROW}.
+# ############################################################################
+
+def get_branch():
+	import commands, re
+	build = re.sub(r'/sources$', '', commands.getoutput('pwd'))
+	build = re.sub(r'/tmp/work.*$', '', build)
+	build = re.sub(r'/packages\.4g.*$', '', build)
+	if re.search(r'/trunk/[^/]+/?$', build):
+		return 'trunk'
+	if re.search(r'/unstable$', build):
+		return 'trunk'
+	if re.search(r'/testing$', build):
+		return 'testing'
+	return re.sub(r'^.*/([^/]+/[^/]+)/[^/]+/?$', r'\1', build)
+
+# end of get_branch
+
+def get_tomorrow():
+	import time
+	return time.strftime('%Y%m%d', time.gmtime(time.time() + 3600*24))
+
+# end of get_tomorrow
diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf
index b68d82ced6..b4dde3d0e2 100644
--- a/conf/distro/nylon.conf
+++ b/conf/distro/nylon.conf
@@ -18,6 +18,8 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
+PREFERRED_PROVIDERS += " virtual/libx11:diet-x11"
+PREFERRED_PROVIDERS += " python:python-curses"
 
 TARGET_FPU = "soft"
 
@@ -33,6 +35,8 @@ PREFERRED_VERSION_binutils-cross-sdk = "2.14.90.0.7"
 PREFERRED_VERSION_binutils = "2.16"
 PREFERRED_VERSION_shorewall = "2.0.9-monolithic"
 PREFERRED_VERSION_ppp-dsl = "0.1-monolithic"
+PREFERRED_VERSION_mtd-utils = "0.0.0+cvs20041113"
+PREFERRED_VERSION_kismet = "2005-01-R1"
 
 PREFERRED_VERSION_prism54-firmware = "1.0.3.0"