From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6876081983550652416 X-Received: by 2002:ac2:5541:: with SMTP id l1mr27566lfk.89.1600962594788; 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-Google-Smtp-Source: ABdhPJy7ba6RZkjFfKZ4x4hX21zn0wAZ8CziHJoI22idrCCRV+R1HcH/dEXaUFTuzGbsFNNYcCMe 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 Return-Path: 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; 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 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 Content-Transfer-Encoding: 8bit X-TUID: X3k9CK9AcYbP 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="" -- 2.26.2