From patchwork Wed Oct 7 05:01:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 120 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp441870ooj; Wed, 7 Oct 2020 07:01:36 -0700 (PDT) X-Received: by 2002:adf:ff88:: with SMTP id j8mr3609815wrr.69.1602079296036; Wed, 07 Oct 2020 07:01:36 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1602079296; cv=pass; d=google.com; s=arc-20160816; b=k/9rjpkxzQWDoFl+onE780ZqhjCqZQzZ/1QPBRpi9bMAtPxKnUSXkxHrRtzIcj17Ba tSuCcTjfgVIqBpWXaVEkYYbYVLgENSc7zxKcZ4WY7/foy8E4lK8iaUX/DnuQNje6SZ8P E5PjwuwQLldUuXX14cFkXftqIU0K7A7s9EWyyIVBB6jWC3Z43Wh1v8hz+hGbBMh2zZrU 7gS/LBwQxokxAGo030ZCPmtGrOmHD9ZZfsdSCqFbo2edVRz4xTDkUNXddZpF9FqMoQFu +G0VotO8q1I7cFFwyOmTILcYyQzJp7qQUyp4RacX5JV50GAxht1ME8D9UUI5KCR0OnR0 mfSw== 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=fNOfCVfWdoPxrm6pUzH6TbNG0LOZps4ShPWRZeKJsrw=; b=qGJXTlN4PE8Ar3DqldWndCVg2z9NlX4fHCfkqDYELvFiRRVvA1DQkZG1COfl8je9Dv jSkZqY7ZdCkhH30qo+7cJhAsSfMOEmFGarN4Ug5m5eL6eI2RDpn21e2XmW6XPo376lbV rGKnG1MrmByJa33bCtCFGI3rJYM0e2/S/JL+cYS1C2cYuy4LbdMMP4xnpG7P1UYhS+yT znmRytDDCGTk+JJB1SN2y8df1DDlh3Ob70bbxKl+AUwM+5ChkJNXBR3nQ7K88YluJ8MU a19zMS2lwVsT/Z387aNGJLAUk+U33BFW2S/A05J2BHTZO/NadX0LxXWoaArkZygIx5kO z22g== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=GHG1vp7s; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbp4u675qkgqe7nrxxdq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBP4U675QKGQE7NRXXDQ@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 f81sor1427299wme.10.2020.10.07.07.01.35 (Google Transport Security); Wed, 07 Oct 2020 07:01:36 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbp4u675qkgqe7nrxxdq@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=GHG1vp7s; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbp4u675qkgqe7nrxxdq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBP4U675QKGQE7NRXXDQ@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1602079295; cv=pass; d=google.com; s=arc-20160816; b=zZNVuz6zbgzxadb4F06GpMYhjXgUB/XDxHVHn8ARHcffYR5xpF8PZwrz6nN0rgRjj7 fqGXWSHgJwFAVVMQm1+ZHhiVn3iyGR+7OSGxrwUEhMKaMVijw8jT6VaYLUYIDFbjaLIM PwHZ+w1N48ZZl7tcul3dlaRvDbiAZJT9tQNHiflrSPRS651sQvfPBr4UWfmCMJDHhQTR lOaQyAzCIyi5YL4l/mYJGyLfVE7JCwFo4PnAOiTTR28qgbC2DIgCYzQDzqe/215vcvGI 7W+Tc8Sw7dO7UIPtD4N9QzNl7IsFwvoMLyfjTqTdHAqu7MFhN73rMhLoWUazfm32W3jp 5+9A== 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=fNOfCVfWdoPxrm6pUzH6TbNG0LOZps4ShPWRZeKJsrw=; b=CXr8hXyP29nyood4YqZvaaUN7tmr8zp3CGG0duDyPdI5im8hRvU8pCBgvg8RweA/zH jaJ5MDJzszhRQOl3X7NppuGN5DKcUUnp9UxuBBVnoxQk13nKCkby6+URsUJiJfjmF+fl scGK7yVnZgkB7drbKWs/uo0x+uXZe1mWPDgPzLJ57bUapGdCAulxdFiSw1CJCx4/v0UP Y95a9cu9FNojC/o7TMeHTYix2saDD33DcHf1+vUZ8aoC1F6rnkqSoulJ9rrWGpnvQZCp uPOrC4QlINGDs3r2MBND8OxY054s5YiFQ+XHThowTrHPBTHeCjdVxT/naINt0MzhVhdY QVZA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 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=fNOfCVfWdoPxrm6pUzH6TbNG0LOZps4ShPWRZeKJsrw=; b=GHG1vp7s2m0TkTnPLCr/L2oUL5Bkg/3uvLUjR9BFhXdaQEVi0cmlX5VZLex8pPq5S8 l2umLw9Ao5w8y6rjFB0pjQ4Cl7g2qjiyEOgIvsRxFc44TcULv09SoPcNc0MHngESRAwS Rd4sMyEakcsFT3vhqpOpLRl7BV88eG47tz7WhsY1xYY/5PFyJ+hGd23TThX8I84yetKH 8Uevwtk/tcenZBHDgs+BgPSeNEpzTOCUcqFxs/nhi7U8yzRGbzIORsELIUWZ9yA/U2zw KJUJaqsZNCyW4QB/TtAFzJ8syBn4DiAU+iTeJ7JGNrODHNqnGAD65/QxAHoQfwuja+cl 5fVQ== 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=fNOfCVfWdoPxrm6pUzH6TbNG0LOZps4ShPWRZeKJsrw=; b=FGgMU1iw7hMWVwbyii2MLm0OqXy18HNQvb8L3GcV/npeH5tGAWMDHESJ9EllOlUPj3 jc8BZV3INB9lgCpUtZEjnjitniXJirrwEukBcYVcY6vxQqo4bwCmJb7G+b2p8XmPGlDG 61JnumhBIqemHjMJLKivGlP42XshDwoyTNoTbFTQkKuefgEMIkJRlwn86XzrQLoRb0PP kVmY8pRtITFiUgSvBMaIiv1l+/rAEhvCuSVAznVXk30EdbQ1t8OLj9BnvEB40mGiFgGn 1MzHpZcjeTwFyhDppQX+TFrLT1D6jZjlTaPAFgGsY/wrPlmm6d2CuZeiqbsmSkaT53+Q OvVQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530+GCSphaY6aJABVd0MQk2p/7shBTdTILkGO3sgAiivu6jQN9n8 IOFdE0Z+QV6b82SPjhURIo0= X-Google-Smtp-Source: ABdhPJwhPwURM0uzLSJoig5TeGv0P5eAJezQYzipGUmwnrAc44wAGp1l+iTNrHzebQ3XwyVfejrhHg== X-Received: by 2002:a1c:5988:: with SMTP id n130mr3616121wmb.95.1602079295502; Wed, 07 Oct 2020 07:01:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:4e19:: with SMTP id g25ls1173137wmh.2.gmail; Wed, 07 Oct 2020 07:01:34 -0700 (PDT) X-Received: by 2002:a5d:5261:: with SMTP id l1mr4004014wrc.105.1602079294543; Wed, 07 Oct 2020 07:01:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602079294; cv=none; d=google.com; s=arc-20160816; b=VqS0Y1xw63NmvxhBIqtq/TikZtE+XwueYKibDjAaC8Axnd+Zj3UTUDBeW9luFZpeRE 9ybA3a5OFcX4fBAJhUWRWS//wOZ8LSi3yH/dYTfVRRRVODVlhVzogBNC08oRW5LqK/Vn kZ5DTlh/QRFZkQwd0mlyN/uzlNNTRTLe8WpB3UwnsoZhfUj9yQclUGbFVQbu0ZH8Uw+g D2g8yaYDNTJCHkJjOJ5gHsJk9Xe2vAEsuMsQvkyvd8ROSlEh5yT6PK8JUDge2tGnFLcH bXjXYX4IiMcM8RBzvO++xq6kYdhedCG7RGEc8g/9uFRGcC/LicX1HI/f5sMqAGYxE2ZC zGBg== 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=nMcNw9i4YBiUxhU0s+UUW4pni/GbE/QeXQZd2MDNiC+j+MUnNsnYzpGWNPRRVI760F mv0QvXzV7zgwPyYDGNDLZLKlrIG63XMh7ScDrvFCDUS6kdZYyMR67Incc3hLcc5BnR5u bAzpXwRt1He0tj6lk2SHMMoQfsIsSKSvaXsf5+4hZqeRToiGMuxi71tLsT6Tsx/snMfk 3GzpHVix7VnV4Odrbx6AFaZtjS7HFoRwReXte2LSisn9L9V9viHBCK2Ga4auVqM7AlT/ W7XyAXXVyauD1vRmIq3xwOj/pbEw+Uo9tvOr3pp2s0+c2nKATKvGo+23KXo39ygmTxT3 21mQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id b80si186019wme.1.2020.10.07.07.01.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Oct 2020 07:01:34 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 097E1YIJ017974 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 7 Oct 2020 16:01:34 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.113.50]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 097E1UkD019880 for ; Wed, 7 Oct 2020 16:01:33 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v4 10/13] Fix dependencies on isar-apt Date: Wed, 7 Oct 2020 16:01:27 +0200 Message-Id: <34ae60959477ac135316da85daff9dc05c170883.1602079290.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.2 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?1679901900383859378?= X-GMAIL-MSGID: =?utf-8?q?1679901900383859378?= 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=""