aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGraham Gower <graham.gower@gmail.com>2010-11-09 13:42:37 +0000
committerKhem Raj <raj.khem@gmail.com>2010-11-09 16:41:16 -0800
commitabd3e10a3e45f05b4f98ea6b14d3efbbe8d57d44 (patch)
tree441ebba406498bf5b6cbde0a2d1fe55aac71100f
parent5e04a4802c6225afca3d52ad00ef79b8d1ef1915 (diff)
downloadopenembedded-abd3e10a3e45f05b4f98ea6b14d3efbbe8d57d44.tar.gz
openembedded-abd3e10a3e45f05b4f98ea6b14d3efbbe8d57d44.tar.bz2
openembedded-abd3e10a3e45f05b4f98ea6b14d3efbbe8d57d44.zip
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@gmail.com> Acked-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--recipes/distro-version/distro-version.bb3
-rw-r--r--recipes/kaeilos/kaeilos-version.bb3
2 files changed, 0 insertions, 6 deletions
diff --git a/recipes/distro-version/distro-version.bb b/recipes/distro-version/distro-version.bb
index 269186f590..a189ec7979 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 4600c41d4e..7d226e6700 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