From patchwork Mon Oct 18 03:58:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 935 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Mon, 18 Oct 2021 14:59:02 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-yb1-f185.google.com (mail-yb1-f185.google.com [209.85.219.185]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 19ICwxMh004019 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 18 Oct 2021 14:59:00 +0200 Received: by mail-yb1-f185.google.com with SMTP id s66-20020a252c45000000b005ba35261459sf20034219ybs.7 for ; Mon, 18 Oct 2021 05:59:00 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1634561934; cv=pass; d=google.com; s=arc-20160816; b=fJv7kTRJ0FJuEHyk5DWPW81eF5MOzCtkd/FXcN0NFEOshfPwvwYPoZE4vgTBbFH5Hm vwAHVizVEYeX/ihC0UZq/vw/q9AUq+L2QSoF5TjhqVUTgb8/IeP8bn8eBlYgzp2RNrEU BoMbdEUD/ls6MuE4Gux5M/WFRDr9OcwWbF8Ymox9e5MLTuGx23gFpgTTWQ/ydzE3Z2P0 Tne3eqK8PFpIIPQ/1lhPnj4dHaNhCGH4+FasVvNALXjZ2MJv91TUD//JpNjbH0BRks35 SJQYXj4tt8J1zJ/Ns+/owjhyYF8YZSUr8F4AN7e/vXeqAxEpnxfGnDL/I25c4S1zc7wT yL0g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:ironport-sdr:ironport-sdr:sender :dkim-signature; bh=QVsFDfl8B5ucWb8t7zOrugHS2enbCKa85FARWNeDN5c=; b=k7dhHjFgbHXXbN3TgQ5VGk4KL0ahtM/rijv5uYlsfJQhxfnft1hgeXQQ+xdlWOctEc 92hSZGqm16keidY7M7WFWBWDdRwzEGtM4Za9a4w/AohiLLCUXCqX5xSM2b5OIqLMKA89 eIxV15FI/uxkjm/tudJShzzVbTpEMzNvMD08Lt7NaU577n3ag8we034FYBoJYChMSRyG WJe35Qjnxa28m4KIWXmIjSp2jhKPZLZdoDOzqnGQAleYQTzfcTDP5PC3BXcK+5gL6HKo Hgs4WRjjAUukjX5zlS0apgn8ym9ooV54/0cYMPeHVJZnaGcgeUqs7M0M59R99lLWoHXt 2elg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:ironport-sdr:ironport-sdr:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=QVsFDfl8B5ucWb8t7zOrugHS2enbCKa85FARWNeDN5c=; b=pAZuERaVZxh/8lYIg7Oa9d/MGqIAc+mCMA25OrO/e9fODcvbwEI6BC/wf5RcRLo8jw elXocAHZjWcGs0A4AlazMSsteCQmF+IqEijunGADWnb0Z5QbTU122hUuy1bg1Z9xtT2z 7uFyqp+eOCncfWqviW5PbePSrz+9TLobeK8u6rzjfEUbZ59Ek102yuKyIIdPhvN621uL Cnr4hYYciL1W7LMy2p8HGYOPk9XWUE7VpQdtOzw5zof8ri3fgafMNUKw4UYfI8GNmqvz r9j9Mkz+m2MOAdYk73WYw7XmKP5NlFDusIVaQt7gJev64P8ZGd389y298nu6maK7hq54 e7cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:ironport-sdr:ironport-sdr:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:x-spam-checked-in-group:list-post:list-help :list-archive:list-subscribe:list-unsubscribe; bh=QVsFDfl8B5ucWb8t7zOrugHS2enbCKa85FARWNeDN5c=; b=D2EBuabhhtBiQML4VZJPbKQmvZKe49dd/d3SU4WohOW228tdAff0wNGyeESfnZiIhB lOHMtAs3lm0o1j9HQ1Zcfwo3t4GFJdEbHpyOLjFHi6TEZh46RXAwd0G80gMPgbCI4z7Y AY3xk2yvzJiNgi5DRJsFYdR+wmtTyX0ZgTSTa4rWeEhNrjcS3ybQEQ41UpUz3VnqkY6L CU8NXxRre1uiWSQeOQ6CAp+la+U/viTmZ1eE4sa4kMXsdNZQydyW+FFAIBwKFphFHqdM QBv1NtZg4QdEwVFRXqxnVSoWb4TVhpK+qAer+YWHnUh9gBnPH8QJb3avxB+lzqj3wfPd uLCA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5315D0O2IVOy6fZDL7ykIzTh8hIxHrByjz1E1y0IfNq4zFswWspD vMksbI4vTWA4AQxWejtXRro= X-Google-Smtp-Source: ABdhPJzWax5eBTg2O0d2gjAng1UbEYoe79ybEHGhz8eDYWBcwmQdglbZKRzPAEBp200H50gdTBgg+Q== X-Received: by 2002:a25:b7c6:: with SMTP id u6mr28817887ybj.16.1634561934150; Mon, 18 Oct 2021 05:58:54 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a25:cb8f:: with SMTP id b137ls4539040ybg.0.gmail; Mon, 18 Oct 2021 05:58:53 -0700 (PDT) X-Received: by 2002:a25:bd04:: with SMTP id f4mr29882089ybk.372.1634561933641; Mon, 18 Oct 2021 05:58:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634561933; cv=none; d=google.com; s=arc-20160816; b=k2AEWBZrsHdb+KesFpnEWxrUs1Bt73/NgdZZtGAHbxlj0TyKNIbjTwIy2JH7Plfkjs hlmn6TWeCvblPpDAwR8st8jHTEr1QbOm3VrCkua8jAAPhsRM7thyY1KnH3prMIYAfx4O GJDNKY+JCMp/0WJouBm1f7O5tWDZaOF4I3UqXBWJFlb+QsdEIVib9/OQ2LNZMaB7FKgV RDyXiBThk521WZubqEdIiHjxN4iX30HonTzQEzbDmj4xFAEK6TYLQC/q6gf1uC7oECqm TSVUdNrbKtjRCQETgndBf/AFdqVp6DaqsIMDCSOMQ+gLXCm3O+uKWiLZ7AdrDArrKZxh jx5g== 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:ironport-sdr:ironport-sdr; bh=HNMsihc6+RZPF91/4JWZCCKgZYwOxrlsaRWtU+uSq9w=; b=dyaBhwlzqpP2jFW0YrKPDP1v1+6B5CkKSbwfQ27d5ipIC1poEdt9rVCgZSGE5ZNCsF GkPUIGomJD9bMBVLFoAWFSN6GdxzmtJu6gp75kmLJx9+D4XQFjB/uiYPjf5Nsu/vLokI 1biCGtz0Qzk60kVTfpv/qyGgGkLK/iaOxGqL0qC3fstkyZ9i+mtXTXoz/oEQH/q8GE3q yQWh/QcGIdLJ7LBVCb+HAVLnVlnsen2lqzZXnUxpa9cMtqZzBMDAoGkvbXtVzm5afgfp 554gdBIAGP8yP4cOr9HKZuyaXshH1ePw7PQ/JgY7yviZK6ibEEVq9k1zWBkP6UI5rR5Z BRrg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com. [68.232.129.153]) by gmr-mx.google.com with ESMTPS id t13si1042412ybu.2.2021.10.18.05.58.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Oct 2021 05:58:53 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) client-ip=68.232.129.153; IronPort-SDR: iHVzLCer8Ogks2DcNjMaYHnDZ3E0EIwMHfLydtPRzi27nz+bRx07wzAwCJuW3ML+xsjLI7oxg2 2VP45Hlq5ZF6HpBZITTL3G22XTy3v7yLlVqorle6PRFER8KJ2r7foFef1Evk3DTg5hlC3UaH3f D0xFE2PGA7YsL25q1zsBTA5BcP3Z3ukeeQ1TkPWdhihPN344O7rYvgWp7qaCiZntCldRNxsA9x 2eYbFe54HB1epbIU+jQSYPho0FAdl0TdD/l8GixGmWIzj7rni8RZxs6srD9xFXxXSiBEOeUVxs Jr/Lu1pT3iUwBFJHvNq9DtYd X-IronPort-AV: E=Sophos;i="5.85,382,1624348800"; d="scan'208";a="69783958" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa1.mentor.iphmx.com with ESMTP; 18 Oct 2021 04:58:53 -0800 IronPort-SDR: WfmWZwJMuFXTa4F7rANG5fx8vfkBQdAnAKkF7ruQM4+rbutLyqdSFyyUX1uogpjozkB1aF1iQV vHY5QBvvNZHtH3bMLz/e1dacHagO1uSuLQy+Fwt1/xg//ASdIAlrwhsvldliyEt/Gaew9yDZC3 a1gOWFpwZ8S0CHfzv/GoG96hLj/RIjcaL20nwxSuJdaSJFuN0SU5S/uvnOjOjX+Cq43Fak7jwd jon+tuYYYXWxcIL38xQdWNcZuPqP0Ljg64Fm1dp9T4UrJ1VuhWToajnEfBbgQv+VZFw27b1eOS Zoo= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v2] isar-bootstrap: Fix SRC_URI inclusion Date: Mon, 18 Oct 2021 18:28:32 +0530 Message-ID: <20211018125832.507603-1-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <6d165415-c3a6-49ca-b20b-e8503da0b16an@googlegroups.com> References: <6d165415-c3a6-49ca-b20b-e8503da0b16an@googlegroups.com> MIME-Version: 1.0 X-ClientProxiedBy: svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-Original-Sender: vijaikumar_kanagarajan@mentor.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX Fix commit 447b298. Include the right entries to SRC_URI. Also, handle situations where in those variables are not set. Signed-off-by: Vijai Kumar K --- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index b8af676..ab3dd66 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -59,12 +59,12 @@ python () { filename = fetcher.localpath(key) d.appendVar("THIRD_PARTY_APT_KEYFILES", " %s" % filename) - distro_apt_sources = d.getVar(d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_SOURCES", True) + distro_apt_sources = d.getVar(d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_SOURCES", True) or "" for file in distro_apt_sources.split(): d.appendVar("SRC_URI", " file://%s" % bb.parse.resolve_file(file, d)) - distro_apt_preferences = d.getVar(d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_PREFERENCES", True) - for file in distro_apt_sources.split(): + distro_apt_preferences = d.getVar(d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_PREFERENCES", True) or "" + for file in distro_apt_preferences.split(): d.appendVar("SRC_URI", " file://%s" % bb.parse.resolve_file(file, d)) }