From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6664521768264269824 X-Received: by 2002:a1c:c704:: with SMTP id x4mr1217978wmf.7.1551704892215; Mon, 04 Mar 2019 05:08:12 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:c10f:: with SMTP id w15ls1624170wmi.12.gmail; Mon, 04 Mar 2019 05:08:11 -0800 (PST) X-Google-Smtp-Source: AHgI3IaO89FcNqrQkt+pbU6szE0PYY1kS+Crk+S/dyRMoVREnCHXX4fbIqdRgy8X+JBpWJfvwW9f X-Received: by 2002:a1c:3545:: with SMTP id c66mr326811wma.2.1551704891777; Mon, 04 Mar 2019 05:08:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551704891; cv=none; d=google.com; s=arc-20160816; b=jaC1keMK3zOBPHfjelhV/7unxZWBYKNVKwj2uiMeb5v48WZK+WftlSOVeENlnGuckq qFKNcngUDkkYPuw4FOxGAZhBqf4bkQkIPzutUPc+eT51W7HAz9Tp+9hZhhQT428kAI2S bdTBTGq5N+J1a/GBXigWFAA7mlrgqpVQeKEqxomNl63WLcsWNHYjuj2/eQfv7srYx0vZ OGKxKJYT3200pZTBBBlB/ejKlCHugYl9/TkGjvxcUyJv2z9/l4fh7N26Y4XC6bPrybqQ jmivS+q6zmCPVFzFqKClcHN90daRjcEAFcYEfgXigjZ+k51yB6twE7Xt2PNJ+VHFp0aT f8BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=0qERQObM0CJD+Ons2wcp2cBv2T0v94p4HkpUSWgAn70=; b=UoP2MU+rlPxegkWuCBtWHCAhfSUZxSpgDnrolSU8hlxglnCfh3P3aGftsTSa6FYt56 BM/cl7BhATQuzrI93I2Z0skKBkBb8Joad/dklfR6cU08Qbfq29M3Nv7KN1ALObKZGihQ A5LYCEzV5SzasD+1ts+fwa5NHXVUEr8ZppVSYbYdH4jR8hJ+1pjzt9SFUhVdzOkbfS5K m/II3fZTDaEmFeG5tDbzpOCpAjZhv5y/0fubsNhSIs0WoEsTjCGf/cWLmTtx71RwVNGy hlo3/KK9goEoGogI5Wx4fnFN3z4erJgvnL9R/xszQW90YtE8BoQ/wk5ysspQCwQBn3o9 OtCA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id v189si152216wma.2.2019.03.04.05.08.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 05:08:11 -0800 (PST) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id x24D8A4d007183 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 4 Mar 2019 14:08:11 +0100 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.69.232]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x24D89Wt008505; Mon, 4 Mar 2019 14:08:10 +0100 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Harald Seiler Subject: [PATCH v4 4/6] image: Remove recursion in get_image_name Date: Mon, 4 Mar 2019 14:07:59 +0100 Message-Id: <20190304130801.20628-5-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190304130801.20628-1-claudius.heine.ext@siemens.com> References: <20190304130801.20628-1-claudius.heine.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: JF9SLy8okQ9h From: Harald Seiler The use of recursion in this function is not immediately obvious. This commit refactors the recursion into a more visible imperative code style. Signed-off-by: Harald Seiler --- meta/classes/image.bbclass | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 34d6515..a60441c 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -43,13 +43,24 @@ ROOTFS_EXTRA ?= "64" def get_image_name(d, name_link): S = d.getVar("IMAGE_ROOTFS", True) path_link = os.path.join(S, name_link) + + # If path_link does not exist, it might be a symlink + # in the target rootfs. This block attempts to resolve + # it relative to the rootfs location. + if not os.path.exists(path_link): + path_link = os.path.join( + S, + os.path.relpath( + os.path.realpath(path_link), + "/", + ), + ) + if os.path.exists(path_link): base = os.path.basename(os.path.realpath(path_link)) full = d.getVar("IMAGE_FULLNAME", True) + "." + base return [base, full] - if os.path.islink(path_link): - return get_image_name(d, os.path.relpath(os.path.realpath(path_link), - '/')) + return ["", ""] def get_rootfs_size(d): -- 2.20.1