[oe-commits] Graham Gower : distro-version, kaeilos-version: don' t export METADATA_BRANCH and METADATA_REVISION

[git version control]

Module: openembedded.git
Branch: testing-next
Commit: abd3e10a3e45f05b4f98ea6b14d3efbbe8d57d44
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=abd3e10a3e45f05b4f98ea6b14d3efbbe8d57d44

Author: Graham Gower <graham.gower at gmail.com>
Date:   Tue Nov  9 13:42:37 2010 +0000

distro-version, kaeilos-version: don't export METADATA_BRANCH and METADATA_REVISION

Causes infinite recursion, which may look like this:

NOTE: <type 'exceptions.RuntimeError'>:maximum recursion depth exceeded while calling a Python object while evaluating: ${@base_get_scm_branch(d)}

Or this:

Traceback (most recent call last):
 File "/home/grg/oe2/bitbake/lib/bb/server/none.py", line 128, in idle_commands
   retval = function(self, data, False)
 File "/home/grg/oe2/bitbake/lib/bb/cooker.py", line 716, in buildTargetsIdle
   retval = rq.execute_runqueue()
 File "/home/grg/oe2/bitbake/lib/bb/runqueue.py", line 877, in execute_runqueue
   self.execute_runqueue_internal()
 File "/home/grg/oe2/bitbake/lib/bb/runqueue.py", line 992, in execute_runqueue_internal
   self.build_pipes[pipe].read()
 File "/home/grg/oe2/bitbake/lib/bb/runqueue.py", line 1227, in read
   bb.event.fire_from_worker(self.queue[:index+8], self.d)
 File "/home/grg/oe2/bitbake/lib/bb/event.py", line 137, in fire_from_worker
   event = pickle.loads(event[7:-8])
 File "/usr/lib64/python2.6/pickle.py", line 1374, in loads
   return Unpickler(file).load()
 File "/usr/lib64/python2.6/pickle.py", line 858, in load
   dispatch[key](self)
 File "/usr/lib64/python2.6/pickle.py", line 966, in load_string
   raise ValueError, "insecure string pickle"
ValueError: insecure string pickle

Signed-off-by: Graham Gower <graham.gower at gmail.com>
Acked-by: Chris Larson <chris_larson at mentor.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>

---

 recipes/distro-version/distro-version.bb |    3 ---
 recipes/kaeilos/kaeilos-version.bb       |    3 ---
 2 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/recipes/distro-version/distro-version.bb b/recipes/distro-version/distro-version.bb
index 269186f..a189ec7 100644
--- a/recipes/distro-version/distro-version.bb
+++ b/recipes/distro-version/distro-version.bb
@@ -6,9 +6,6 @@ INHIBIT_DEFAULT_DEPS = "1"
 PACKAGES = "${PN}"
 PACKAGE_ARCH = "all"
 
-export METADATA_REVISION
-export METADATA_BRANCH
-
 do_install() {
 	mkdir -p ${D}${sysconfdir}
 	echo "${DISTRO_NAME} ${DISTRO_VERSION}" > ${D}${sysconfdir}/${DISTRO}-version
diff --git a/recipes/kaeilos/kaeilos-version.bb b/recipes/kaeilos/kaeilos-version.bb
index 4600c41..7d226e6 100644
--- a/recipes/kaeilos/kaeilos-version.bb
+++ b/recipes/kaeilos/kaeilos-version.bb
@@ -7,9 +7,6 @@ PE = "1"
 PACKAGES = "${PN}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-export METADATA_REVISION
-export METADATA_BRANCH
-
 do_install() {
 	mkdir -p ${D}${sysconfdir}
 	echo "KaeilOS ${DISTRO_VERSION}" > ${D}${sysconfdir}/kaeilos-version