From abd3e10a3e45f05b4f98ea6b14d3efbbe8d57d44 Mon Sep 17 00:00:00 2001 From: Graham Gower Date: Tue, 9 Nov 2010 13:42:37 +0000 Subject: distro-version, kaeilos-version: don't export METADATA_BRANCH and METADATA_REVISION Causes infinite recursion, which may look like this: NOTE: :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 Acked-by: Chris Larson Signed-off-by: Khem Raj --- recipes/distro-version/distro-version.bb | 3 --- recipes/kaeilos/kaeilos-version.bb | 3 --- 2 files changed, 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 -- cgit 1.2.3-korg