From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6635926855683670016 X-Received: by 2002:a17:906:698c:: with SMTP id i12-v6mr1745137ejr.10.1545047123735; Mon, 17 Dec 2018 03:45:23 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:9507:: with SMTP id u7-v6ls2444435ejx.4.gmail; Mon, 17 Dec 2018 03:45:23 -0800 (PST) X-Google-Smtp-Source: AFSGD/XHNzVyM55hyJzHx4fa+MA3oRu0jVBqzjduPYVYVBaQD0lm3KDJw7MHieY+/gLlPHUVimyO X-Received: by 2002:a17:906:46c2:: with SMTP id k2-v6mr1739016ejs.7.1545047123364; Mon, 17 Dec 2018 03:45:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545047123; cv=none; d=google.com; s=arc-20160816; b=D++3AMmRtTqpshyqHrlzAOtTgXR/YtygoFttFsCi9YZj4nuHnc1zSlleAyGnv+0faP Txu+NuGoI6GNQ/2fv2BdQH5JplcbZdaayS2Tv8Wj2ewcDn27nEaH1/Wdh82VJ+vieBzC gzNNSUpS2SpxyiLw10rsOehRTOsqukQ7HpcNFUE2FRHYTe1394TGha43EmJvCa+1gvzg D2Zrt9TJfeMzEfJV70/hLPwgRt2sRs4STRK7/Ly/a5MFbjJt+xfkbQn/oBEodXDJP7rK QP+P8+PthXTwMT+duDX3yk5Jp+fBUDnZmTnHk+tQF+VRflbI9QJef8SyJr4l0fo/k20C a7MA== 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:dkim-signature; bh=6CoQ71m5CePTf/hkVTH5FM97BhBHlVdQJWMOB7dywuk=; b=z/jL/nLEiXEExvA6n8LMd4iB9xfrYO4G1H6OQeDaa157zJU7aFfPQ64wOCRgCT0SDj QOcfKL0vIabqgMKnpolPvuW/jVqhWC+ZpodPXAJE98RBKn6Joay8KbNtvfa+G8xpDQOy BXQgHSXc8D7T+sy9aPHI6q8qyU68mKzGR0odxvSDrRBcmolS2IOAWkjaKyV/tVTaYSAS yeJdVObPOndYdWd3gXbhFRD3kdtst+H57opPdCE15hsZUXNSv/u4Hzp4Q4WwxdMFO1cx oUjyKY+nDvF9+2K33nlOOJpHiFo9tH21Eqg10CjUo6Idivx6i46ESCkLowyIbXCJSTtY fHAA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=NIOVjuCI; spf=pass (google.com: domain of tlghosgor@gmail.com designates 2a00:1450:4864:20::431 as permitted sender) smtp.mailfrom=tlghosgor@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com. [2a00:1450:4864:20::431]) by gmr-mx.google.com with ESMTPS id d10-v6si610462ejx.0.2018.12.17.03.45.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Dec 2018 03:45:23 -0800 (PST) Received-SPF: pass (google.com: domain of tlghosgor@gmail.com designates 2a00:1450:4864:20::431 as permitted sender) client-ip=2a00:1450:4864:20::431; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=NIOVjuCI; spf=pass (google.com: domain of tlghosgor@gmail.com designates 2a00:1450:4864:20::431 as permitted sender) smtp.mailfrom=tlghosgor@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-wr1-x431.google.com with SMTP id 96so11952669wrb.2 for ; Mon, 17 Dec 2018 03:45:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=6CoQ71m5CePTf/hkVTH5FM97BhBHlVdQJWMOB7dywuk=; b=NIOVjuCIEpC+KKotqL2C1+Ltafhb4GqjIokWryNog2SvcWEPV7envj0zZiV97lbMtU ThkjTCKt+j1DDqNSGpROCnVTfYQ5a3iOM5wGjnglFiiSr7WFspk2EeE+hiQSn+OfsBc0 vrosUnTw70rZWZ2du+P87/qIeIiL7vpAQLZXOLh/z2CUnIQ2MZgXDYOwTA6VIXFQ+02r o8LMhbDEkwzgeFe1U/fYkacw0kQ5vHFcpGjjoldOVE15Fq/Fo6AIv/atfX1JsKRwz4yx Z0X52NkMKS0t7Q+M5X0qxisxFs8jv+ZxTYFaJ1z8ZKaDNA3pOWQiAnvAH+2uRW385Fz4 frkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6CoQ71m5CePTf/hkVTH5FM97BhBHlVdQJWMOB7dywuk=; b=o9jAOsfWW4gQIKORFbOuxuwmcl+BroCuBRvtLNXziIy29WJ1XSo3n+neNTmP9FiZX5 Av2RO917/RjTAxIv9Vi19txhnd9PKW+AijGLneKDzHxtb0jU4EGgh5zNwbZDz02zuXCq D3zPnBkpieNyObllBnIwGHVn1/1H0qkWS/ml+2MplB7dJCRVZfRjauM75QUiyUN03NkH fNUjJBPpy9oKS2TNPCyTiAxn17mEEtZzYMcEfPAChhCTTCQAJNdc0iQtzxVlHUb7eRDO yabYzMh68SJBvL12mJq1UW6MgyCiJ1XX1Hjiwsp37zIX+4YZQEsJfOkAougkzlR7TAX+ 5X7g== X-Gm-Message-State: AA+aEWZ8a7InmT/5K+9TIqA2jG/cvYVZZOQkuJcWw5oF2J6hX97qfsb3 y1ed2RCfCfFWSGBtp+46YuQOoy6g8mmJaA== X-Received: by 2002:adf:91c3:: with SMTP id 61mr9939148wri.324.1545047122739; Mon, 17 Dec 2018 03:45:22 -0800 (PST) Return-Path: Received: from localhost ([165.225.72.104]) by smtp.gmail.com with ESMTPSA id h127sm12272842wmd.31.2018.12.17.03.45.21 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 Dec 2018 03:45:22 -0800 (PST) From: "Hosgor, Tolga (CT RDA DS EU TR MTS)" X-Google-Original-From: "Hosgor, Tolga (CT RDA DS EU TR MTS)" To: isar-users@googlegroups.com Subject: [PATCH v2 2/2] isar-bootstrap: simplified distro source functions Date: Mon, 17 Dec 2018 14:45:18 +0300 Message-Id: <20181217114518.17995-3-tolga.hosgor@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181217114518.17995-1-tolga.hosgor@siemens.com> References: <20181217114518.17995-1-tolga.hosgor@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: l8Ew0BIteHl7 - distro sources are created with a generator - debian-buster.list begins with a 'deb-src' to test the parser works correctly Signed-off-by: Hosgor, Tolga (CT RDA DS EU TR MTS) --- meta-isar/conf/distro/debian-buster.list | 1 + .../isar-bootstrap/isar-bootstrap.inc | 22 ++++++++----------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/meta-isar/conf/distro/debian-buster.list b/meta-isar/conf/distro/debian-buster.list index 92d20e1..7828671 100644 --- a/meta-isar/conf/distro/debian-buster.list +++ b/meta-isar/conf/distro/debian-buster.list @@ -1,3 +1,4 @@ +deb-src http://ftp.de.debian.org/debian buster main contrib non-free deb http://ftp.de.debian.org/debian buster main contrib non-free deb https://debian.inf.tu-dresden.de/debian buster main contrib non-free deb http://ftp.de.debian.org/debian buster-updates main contrib non-free diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index d868bb6..6dc1888 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -117,7 +117,7 @@ def get_aptsources_list(d, is_host=False): apt_sources_list = (d.getVar("DISTRO_APT_SOURCES", True) or "").split() return apt_sources_list -def get_distro_primary_source_entry(d, is_host=False): +def generate_distro_sources(d, is_host=False): apt_sources_list = get_aptsources_list(d, is_host) for entry in apt_sources_list: entry_real = bb.parse.resolve_file(entry, d) @@ -126,21 +126,17 @@ def get_distro_primary_source_entry(d, is_host=False): parsed = parse_aptsources_list_line(line) if parsed: parsed = get_apt_source_mirror(d, parsed) - if parsed[0] == "deb": - return parsed[2:] + yield parsed + +def get_distro_primary_source_entry(d, is_host=False): + apt_sources_list = get_aptsources_list(d, is_host) + for source in generate_distro_sources(d, is_host): + if source[0] == "deb": + return source[2:] return ["", "", ""] def get_distro_have_https_source(d, is_host=False): - for entry in get_aptsources_list(d, is_host): - entry_real = bb.parse.resolve_file(entry, d) - with open(entry_real, "r") as in_fd: - for line in in_fd: - parsed = parse_aptsources_list_line(line) - if parsed: - parsed = get_apt_source_mirror(d, parsed) - if parsed[2].startswith("https://"): - return True - return False + return any(source[2].startswith("https://") for source in generate_distro_sources(d, is_host)) def get_distro_needs_https_support(d, is_host=False): if get_distro_have_https_source(d, is_host): -- 2.19.2