[oe-commits] org.oe.dev dtn 2.5.0 use syntax compatible w/ bitbake 1.8.8 for now

[mickeyl commit]

dtn 2.5.0 use syntax compatible w/ bitbake 1.8.8 for now

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: e2b3f5048629aad7c0d511b69bb0752d7b1a70cc
ViewMTN: http://monotone.openembedded.org/revision/info/e2b3f5048629aad7c0d511b69bb0752d7b1a70cc
Files:
1
packages/dtnrg/dtn_2.5.0.bb
Diffs:

#
# mt diff -r9d3729dac5d6623cd0b583777f2a35f6003a4446 -re2b3f5048629aad7c0d511b69bb0752d7b1a70cc
#
# 
# 
# patch "packages/dtnrg/dtn_2.5.0.bb"
#  from [987af483064b66222040dae87a47b35f9a675f6f]
#    to [9a0f05f06c0e6d83eecd598242754836134e6425]
# 
============================================================
--- packages/dtnrg/dtn_2.5.0.bb	987af483064b66222040dae87a47b35f9a675f6f
+++ packages/dtnrg/dtn_2.5.0.bb	9a0f05f06c0e6d83eecd598242754836134e6425
@@ -1,9 +1,10 @@ SRC_URI = "http://www.dtnrg.org/docs/cod
 DESCRIPTION = "Delay Tolerant Networking Package"
 HOMEPAGE = "http://www.dtnrg.org/wiki"
 SECTION = "libs"
 DEPENDS = "db openssl python-native xerces-c"
 LICENSE = "Apache"
 SRC_URI = "http://www.dtnrg.org/docs/code/dtn_${PV}.tgz"
+PR = "r1"
 
 inherit autotools
 
@@ -27,7 +28,7 @@ EXTRA_OECONF = "\
   --with-openssl=${STAGING_DIR} \
 "
 
-def python_dir(d):
+def dtn_python_dir(d):
         import os, bb
         staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 )
         if os.path.exists( "%s/python2.5" % staging_incdir ): return "python2.5"
@@ -35,11 +36,15 @@ def python_dir(d):
         if os.path.exists( "%s/python2.3" % staging_incdir ): return "python2.3"
         raise "No Python in STAGING_INCDIR. Forgot to build python-native ?"
 
-PYTHON_DIR = "${@python_dir(d)}"
+PYTHON_DIR = "${@dtn_python_dir(d)}"
 
-export BUILD_SYS
-export HOST_SYS
+# use this syntax once everyone has at least bitbake 1.8.9
+#export BUILD_SYS
+#export HOST_SYS
 
+export BUILD_SYS:="${BUILD_SYS}"
+export HOST_SYS:="${HOST_SYS}"
+
 do_configure_prepend() {
 	for i in aclocal/*.ac oasys/aclocal/*.ac; do
 		install -m 0644 $i ${STAGING_DATADIR}/aclocal/`basename $i`.m4
@@ -54,7 +59,7 @@ DESCRIPTION_python-dtn = "Python binding
 
 PACKAGES += "python-dtn"
 DESCRIPTION_python-dtn = "Python bindings to the DTN API"
-PR_python-dtn = "ml1"
+PR_python-dtn = "ml2"
 FILES_python-dtn = "${libdir}/${PYTHON_DIR}"
 RDEPENDS_python-dtn = "python-core"
 FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug"