From 345a2dd01c07750509ca2dcc5851cfd912bbace8 Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Thu, 29 Mar 2012 20:01:08 +0800 Subject: Hob: Fix adding duplicated meta-hob layer While adding meta-hob layer, we need to detect whether it already exists in current layers. (Bitbake rev: b195823d19bcb71bd5eef19acfe22b2dd670d90a) Signed-off-by: Dongxiao Xu Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'bitbake/lib/bb/ui/crumbs/hobeventhandler.py') diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py index f189553267..1cbb0274c6 100644 --- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py +++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py @@ -383,7 +383,9 @@ class HobHandler(gobject.GObject): params = {} params["core_base"] = self.server.runCommand(["getVariable", "COREBASE"]) or "" hob_layer = params["core_base"] + "/meta-hob" - params["layer"] = (self.server.runCommand(["getVariable", "BBLAYERS"]) or "") + " " + hob_layer + params["layer"] = self.server.runCommand(["getVariable", "BBLAYERS"]) or "" + if hob_layer not in params["layer"].split(): + params["layer"] += (" " + hob_layer) params["dldir"] = self.server.runCommand(["getVariable", "DL_DIR"]) or "" params["machine"] = self.server.runCommand(["getVariable", "MACHINE"]) or "" params["distro"] = self.server.runCommand(["getVariable", "DISTRO"]) or "defaultsetup" -- cgit v1.2.3-54-g00ecf