From patchwork Thu Sep 24 07:49:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 88 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp466951ooj; Thu, 24 Sep 2020 08:49:55 -0700 (PDT) X-Received: by 2002:a2e:141c:: with SMTP id u28mr161753ljd.72.1600962595087; Thu, 24 Sep 2020 08:49:55 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1600962595; cv=pass; d=google.com; s=arc-20160816; b=NCmjBdWxRnbQ8+cC8KnpFLOFqbyc4fIgweXq79C/XVTyyudW/ZIb3yUNCU87cNFVXd A8inVd+Z4d2JJLRswq/HBatU2fa8RUAqmFg8M7Qw8ndNLYsO1d8FzkY4f5CTMSxyQTfO PDX8s+IC5Psh1/02v2g6Ttf5d7GA5mx+IizBR2/DguioCLKMrr6L+bG/abixum5VUEVu DPcx1yYsUmWVmyDQiQdJdNXvZ8N5PJdfIaRO0mAgOHnGZD1wYs0jd1yOLR1V0WC3vIS1 q/rRu7Ybcwqfu1tMRzrtJAwASvNDrqQYTiO6FAE6+n41ntUBJnNd1sy/ikMNhIKIrQ37 Rl+A== ARC-Message-Signature: i=3; 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:to:from:sender:dkim-signature; bh=vyWoDS76dw8idoxSgMKwhvDuPMVO8532pT7sPr1yaAs=; b=W1HakPmP81F30FVlSQhY0b0HJnJ6sDQEND+8jlLIBMs1Flt4fjqL60wixuTN+0Fwfc 740PsK4w4FRMtGR4LEWOxR92o8j8R2LiBxmpsE8sZCrS23tGCuZ2I44aupWhBcwRC1+F +UDaa09eCNW7MsdoZ0ejHnZ2Wx/ADKw7taW+tqp3Odb/xEokSeFFw3EOy7rWJLa9UV8k lkpO64mlDQRPt35ViS95E+Y1GImnOo49VX9Rp7NRW0M/K0UhciCG+T37ySGPTR40YLAL tM4RDSlLauwREDuJ5ByTaU3fN4Pj9UjVLthJMbrBcbMsF4pNnNQNAWtGnGQboRh1eEhs TmXg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=RpbyzQcX; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbiuawp5qkgqeto2nivi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBIUAWP5QKGQETO2NIVI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id y140sor522543lff.92.2020.09.24.08.49.54 (Google Transport Security); Thu, 24 Sep 2020 08:49:55 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbiuawp5qkgqeto2nivi@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=RpbyzQcX; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbiuawp5qkgqeto2nivi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBIUAWP5QKGQETO2NIVI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1600962594; cv=pass; d=google.com; s=arc-20160816; b=tTgILhXCZmiiKLpnWpI6W0D2PQNfwgAtMPwOu++vC+VDa2/24CEpmz4hfr2ShISu6z 1BqaaJVH0si1CenEvEMZKUyvPKZsTF40qZDUwaA/o7ImGuFjdp6KIHE7slZCyZ+5ka4U a6145mhYTGWDvn7PqhrBz9Jdio+flJA8oVGwhHmdaj2KjQlwCPzHSylwjGPnXmKUzpto UFfN6h8KImE53+ZFBWDoU0T75yXI8k2mQ7SCWW2rWeWohkolqYwulOUM2bURiUIXPERp AZgrVLvzI5wMJHCLVFIsz6oOp5Jri78EBgAMGvoKF4oO9a24AXbvznSSwN7nY4Bt2xKS uRTw== 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:to:from:sender:dkim-signature; bh=vyWoDS76dw8idoxSgMKwhvDuPMVO8532pT7sPr1yaAs=; b=BKvJd++r6ie5OCvZvGxvlhHD7d0UEGysmCo5A1lv8jciIE+OSdbaUDIRquipVrBItj B46f3VzXUm9wdSX1qFPbSLdouHnDOsYYcXwfaWi6YiGRxxMzfVfy5LYfwMBAOfPGTZW/ DlVd6bbYU/lt61kWusVARSGMrw4e+41BopmYyPPG0g944vr9Pmfz4OcZvEviXiU3HmyS eA8F0W593dI8dEbyXM+ptosGNnt8yrmyQDtwwawE9TmgOCczcjQ/lPqbxNjnOg2RJ8Zi xsIgbLYtRN0skE0XMDxelUMwFP1VUObOkzXyFTTBOEHvi+0zC5K3McUUu62esStBD5uC u7QQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to: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=vyWoDS76dw8idoxSgMKwhvDuPMVO8532pT7sPr1yaAs=; b=RpbyzQcXDhWnve1fbrZytnN4bp9to0PjV461xxEsKpp7B+7mmfGUhs3bnMWLOt4UBB k9w1DKerqvXMH2hTVZK341WvSFJh8Dyj8oSP4bYZzBzDX9s7vuzXmKOSn06Mo2tat1Us XAIsUPOlsmx4iPNtXzw/bfvVIYjX7q3nX3gWPA/Vyhcxi/OPJdLsZic8V6DzsC8tGeqH uCp49w85bFT6b7bCVlz2ni1/rc9HpvURZJNO8mVBXbv4tc+Peygt5SBpm3lwDLtIzfrq dm5iQbpj/CzdhzASHOim4Prz8eLNPb840JyaOkUQ7ZMLr62K6SXxlr3Rzwy9bDrvmzbl NQfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to: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=vyWoDS76dw8idoxSgMKwhvDuPMVO8532pT7sPr1yaAs=; b=oU61pD6NpIf/4gFGZnRgpBEj44rq7NjjzDEVuZiqnqREne1w0IMVONSYD2AGkxuZFV Ew5skkGFsegGuKg2h9C3PN7lfJg4YmqVOtJI7WujBK74F5yIjQnxHZNpAB2OnGDKTYo5 +2Yd5FDiQc+uWs1dM2vafb5NdT9Erm+MPb8lLqT6eAXBsS0YOLF5+tcU7wh6P2N2lMWX g3wgBX19QVEADGvvLI0giZJ5wCW5orgwly3+q2WSMY59m7Yyljb+d4UKPcM9Y2s655ys Ga1g/qf7zcQMAadCx4w0wTrQJp/uqCqSlkQMjWoVMLipz4ozZQrWqIh7NpZ1DxEZ1XP6 pnxg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530aS+kCmsTcOX79GGAS8q+mLC1qaq2HVMhWuVguwthbctLy9J+Y SKu4kG1RBlNOtYLPx8wq+rs= X-Google-Smtp-Source: ABdhPJwqi/YblWNFEtgv/4c5ZfhnmT7WYUSZm++N8GiuwnbcEtxDUhWkJfnT+8Tbp/BumB8g0sIKXw== X-Received: by 2002:a05:6512:36cd:: with SMTP id e13mr25353lfs.165.1600962594728; Thu, 24 Sep 2020 08:49:54 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:c7c8:: with SMTP id x191ls323318lff.0.gmail; Thu, 24 Sep 2020 08:49:53 -0700 (PDT) X-Received: by 2002:a05:6512:31c4:: with SMTP id j4mr18366lfe.323.1600962593456; Thu, 24 Sep 2020 08:49:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600962593; cv=none; d=google.com; s=arc-20160816; b=A/78y6p/LIlwE9zU5N8P2C5wHpI+96CrpLDxcUFK7CWqErLEsH9Gz1VhhOiyqcJSkf vA3dJcfblG6pOfY1+nsPoSmAQR43/ivxcao/tqYNxOknESIbaZ510MBQ9sJJPkoXV544 9xB2AzUclCa7A5w+Jg0vvjQK8pClXk3Jo3h7Ry5TYSArkECE1B/S4Ssup0w9E1LGvWCT w40UEDAkHLlrDNCZAwd1Hyi4mnFsp44pVgbeYP3p6UteKRSe/NlFv9gD4vHwjSfL20td bFfNwKsQKqH2DLFiawuXu/NYaVbZeV+BWXkYvT1wh0mQa7a5yes1MOWdZ7+3pXkRk/ZY fcew== 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=yrTnXZiotmpVm2xN+wULEQEnH/qVK43RpBQ0NgLnQt4=; b=pmdu9mBBOIALAPZUI4bZpnHTAAyOh16077sdK9/cYv1+AS+Hl8LdUeTkv4k/izmVyZ QHdE9j3NEbdKPHxPhVvKpKpSdgq4UOS7Zr4aLjcKGnwbpYjRi72Syq9ntofhwnibkh+m 0eP4jyDlqdSILbbkIFS+QlrJSev6a0syBV+TauzWaiuC0e+xf6VsRZIRnLjhQYFc6hqc DoV4mmMis5xYY1dvfI5iENzPxvf0NkehRPFQodMmi5VoYXTmAL/xg/ZQo3pCfahArqGg ecM1fjEFlDHgQOeO9YtgMgQ/ZWwX4EcbicBEB+L56tA85MNdy0I5rB6r57ahHJslqtz7 Eqjg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id f23si49629ljg.8.2020.09.24.08.49.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Sep 2020 08:49:53 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; 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 08OFnq2c010712 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 24 Sep 2020 17:49:52 +0200 Received: from md1f2u6c.ad001.siemens.net ([167.87.1.32]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 08OFnpBK012465 for ; Thu, 24 Sep 2020 17:49:52 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH 3/5] Fix dependencies on isar-apt Date: Thu, 24 Sep 2020 17:49:49 +0200 Message-Id: <04cdeb071467cd53d984a619b4a835d7a3aa2597.1600962590.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.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 X-GMAIL-THRID: =?utf-8?q?1678730954301969694?= X-GMAIL-MSGID: =?utf-8?q?1678730954301969694?= From: Jan Kiszka Currently, we fail if only running isar-bootstrap and no other task that needs isar-apt. That's because of deb_dl_dir_export expecting the repos already being available (even if empty). Fix by letting the isar-bootstrap task depend also on isar-apt:do_cache_config. Drop redundant dependencies, also for base-apt. Signed-off-by: Jan Kiszka --- meta/classes/dpkg-base.bbclass | 1 - meta/classes/rootfs.bbclass | 2 +- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 08880d7d..7e12ab0a 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -180,7 +180,6 @@ do_deploy_deb() { addtask deploy_deb after do_dpkg_build before do_build do_deploy_deb[lockfiles] = "${REPO_ISAR_DIR}/isar.lock" -do_deploy_deb[depends] = "isar-apt:do_cache_config" do_deploy_deb[dirs] = "${S}" python do_devshell() { diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index afec1cbc..00254ef5 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -151,7 +151,7 @@ rootfs_install_pkgs_install() { do_rootfs_install[root_cleandirs] = "${ROOTFSDIR}" do_rootfs_install[vardeps] += "${ROOTFS_CONFIGURE_COMMAND} ${ROOTFS_INSTALL_COMMAND}" -do_rootfs_install[depends] = "isar-bootstrap-${@'target' if d.getVar('ROOTFS_ARCH') == d.getVar('DISTRO_ARCH') else 'host'}:do_build isar-apt:do_cache_config base-apt:do_cache" +do_rootfs_install[depends] = "isar-bootstrap-${@'target' if d.getVar('ROOTFS_ARCH') == d.getVar('DISTRO_ARCH') else 'host'}:do_build" do_rootfs_install[deptask] = "do_deploy_deb" python do_rootfs_install() { configure_cmds = (d.getVar("ROOTFS_CONFIGURE_COMMAND", True) or "").split() diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 1c5dba74..b7dc1ab7 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -224,7 +224,7 @@ def get_host_release(): do_bootstrap[vardeps] += "DISTRO_APT_PREMIRRORS ISAR_ENABLE_COMPAT_ARCH" do_bootstrap[dirs] = "${DEPLOY_DIR_BOOTSTRAP}" -do_bootstrap[depends] = "base-apt:do_cache" +do_bootstrap[depends] = "base-apt:do_cache isar-apt:do_cache_config" isar_bootstrap() { IS_HOST=""