From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6690944878080163840 X-Received: by 2002:adf:c149:: with SMTP id w9mr14361732wre.40.1557915118638; Wed, 15 May 2019 03:11:58 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:f20e:: with SMTP id s14ls634980wmc.4.canary-gmail; Wed, 15 May 2019 03:11:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqxP7+j5Kxbswal1U0uWx03767g3QJRdR2IHdPBK49Xwftk0KUaoVDIvAbQVtP9ZdoKM06c8 X-Received: by 2002:a1c:7a12:: with SMTP id v18mr7170358wmc.69.1557915118195; Wed, 15 May 2019 03:11:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557915118; cv=none; d=google.com; s=arc-20160816; b=s2fxOoYYmNKT3M4B3HgbZtUXLSiktDvNw/XNxgQ7f/wZY87UgU7A50R7HRbcuPFYqw U2pgVNl3xmIWw9Jb6BrTbWXTEA6JaG1gn0hidZ8Y1pancrqYqaLd4r/uFE86u7pEGtn+ FlHP0sAKa9V3CiQwl2ZA3vF9gzcDMxj9CDP0s0X/cXupW1agJxmpNjSPlES961XFaFwZ RyvAUyjzvJQalIWvh4o/GuGI3/qpSvDBC86eIxZ11E3J2ykZvqlIAtNZ12031fTwy38t 8DTdLLuYXKTWIvj864VuVNfSHbZBMUMsAJdtVTnDSvFi1589yHSxxIt5DVF4o/TTWBX2 D5AQ== 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=XL7EXtuFSs9BayS9wTeVa8ZL3aO2IhQ+rPuFHTq63No=; b=ZuYik0YBbMs8qrry9l46PE5dslqT2E3L/nJc8ALbTFxQ2latUZdN4esvaSmhrqWKQe aDND2JxP+spYxTID4dZrseD0ngnLls98k3Sivei+fradvVzvPhiX/y8L7+ooZpE55jqj FaqwtWCKkDjxJ7SxPLmUfGJuPDu9mrvEJisBNXHdEf4r3pwcNnl6G2uAwTOIg+Pm1v8M 1BI1WT9jH6qc11/K6CV7ULrQ0ojXvOgTZ8DeFyj5tA6JxSNV9HNfvx6w20RN7NsklUwn TiMHdkmgfadnLpeTNcvLNaeEVSk1/LfU+YbwsSUzTnyjygmYZCRYY0BrK7z5r8sZ/3SJ UP4A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id x18si133636wmh.2.2019.05.15.03.11.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 May 2019 03:11:58 -0700 (PDT) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id x4FABvwd009013 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 15 May 2019 12:11:57 +0200 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.69.232]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x4FABv7M022198; Wed, 15 May 2019 12:11:57 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine , "Maxim Yu . Osipov" Subject: [PATCH v6 3/9] move 'HOST_DISTRO_APT_SOURCES' from bootstrap-helper to isar-bootstrap Date: Wed, 15 May 2019 12:11:43 +0200 Message-Id: <20190515101149.22187-4-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190515101149.22187-1-claudius.heine.ext@siemens.com> References: <20190515101149.22187-1-claudius.heine.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: OHa2vnMj/PxR From: Claudius Heine This variable is only used in 'isar-bootstrap-host.bb' and mentioned in 'isar-bootstrap.inc'. So it does not make sense to have it available anywhere else. Signed-off-by: Claudius Heine [Maxim: rebased] Signed-off-by: Maxim Yu. Osipov --- meta/classes/isar-bootstrap-helper.bbclass | 2 -- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/classes/isar-bootstrap-helper.bbclass b/meta/classes/isar-bootstrap-helper.bbclass index 59c447b..0d77929 100644 --- a/meta/classes/isar-bootstrap-helper.bbclass +++ b/meta/classes/isar-bootstrap-helper.bbclass @@ -7,8 +7,6 @@ IMAGE_TRANSIENT_PACKAGES ??= "" -HOST_DISTRO_APT_SOURCES += "conf/distro/${HOST_DISTRO}.list" - def reverse_bb_array(d, varname): array = d.getVar(varname, True) if array is None: diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 09aed83..b740c57 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -28,6 +28,7 @@ DEPLOY_ISAR_BOOTSTRAP ?= "" DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales" DISTRO_BOOTSTRAP_BASE_PACKAGES_append_gnupg = ",gnupg2" DISTRO_BOOTSTRAP_BASE_PACKAGES_append_https-support = ",apt-transport-https,ca-certificates" +HOST_DISTRO_APT_SOURCES += "conf/distro/${HOST_DISTRO}.list" DISTRO_APT_PREMIRRORS ?= "${@ "http://ftp\.(\S+\.)?debian.org file:///${REPO_BASE_DIR} \n" if bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')) else "" }" -- 2.20.1