From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6690944878080163840 X-Received: by 2002:a50:fb19:: with SMTP id d25mr38095436edq.61.1557857004916; Tue, 14 May 2019 11:03:24 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:e689:: with SMTP id z9ls5429166edm.7.gmail; Tue, 14 May 2019 11:03:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqwQ5qHKWVBvLrTjsfj/4UCqQYyG/ZCEOvvmIOD/5cucg52r2/kr1XVPGewh6rsmgcLPpdk9 X-Received: by 2002:a50:8e1e:: with SMTP id 30mr38290420edw.283.1557857004142; Tue, 14 May 2019 11:03:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557857004; cv=none; d=google.com; s=arc-20160816; b=UIax4sYoGs6VQzxgJaZvQa46dznMXY5YpHXyBMJjV+iYYBp0P1Rw1dxX+xOTePkrJl xy/7HEvaO9Ze4hm0xLN215Lx9nGsw7RXD5beUH+goC+NjibupnEC2+MAaiYBckdgxjuy qUbfWrDS8dXRFlsB9iKCA8uKM5+8Dhcw4o2rr4GWVYZFsdtOpps2n7YO6X0uVXo/1uES rCZTMuClumcfpPu7Ut411HPYcSfCRJEJuqtPFJ3xW56ncNmJKRRsNjXUUDHCuEqC/WCj K/lNi1G81ynuortCBLq1aCS+TbHU+WzhfrbsIKuzxOe9+/cqxgnDb2coh1i6XdY/O1Gv fzGw== 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:to:from; bh=wwh5EcYE3j6gReTvAeM5q+6q6WStaGdnRKhmlT9l/uA=; b=uf9lJ8dPMCbNygLI1vp75Tsc7s5NDuWwus5F31es/pyQz0kskiGfEz5vFt36Qqd4QP 0iPxGyhSqCyC4i0Mv0Q5ieQR/0HXqaihbxIC1/jeRORLGVI7CeffDqWeCeuZZdiTCFr6 W+PNDQy9fLCfbrqwuVwgUvhYLszUylvlspnz21FjyFaUsyvH5G5JBTUlKF7ZHEVLXq7K A/UivmcQgHku32BHx2xQSh6QO6AhTK55J9doDOSvPseoTbCk8LITG8Yq/ohie9mw3vMY zdhU4KiRvtfa6ty9Okh4jlVKJx3KzlL2P43fnUdn2NMOz5WgqnuIsd92auFK84Im6Vr6 GRiA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id z45si4909648edc.3.2019.05.14.11.03.24 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 May 2019 11:03:24 -0700 (PDT) Received-SPF: pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from azat.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id x4EI31w7001363 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 14 May 2019 20:03:23 +0200 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH v5 3/9] move 'HOST_DISTRO_APT_SOURCES' from bootstrap-helper to isar-bootstrap Date: Tue, 14 May 2019 20:02:54 +0200 Message-Id: <20190514180300.27164-4-mosipov@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190514180300.27164-1-mosipov@ilbers.de> References: <20190514180300.27164-1-mosipov@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: zF5plXpQei4U 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.11.0