From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6880878174534631424 X-Received: by 2002:a05:600c:2241:: with SMTP id a1mr3673011wmm.49.1602079295682; 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-Google-Smtp-Source: ABdhPJyZliGPKdu3Aol72RiVNITxAi+XnYh0VSM4A1drx5YI9XXFc3xUPgP+z+JcIiMbLmg52GBr 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 Return-Path: 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; 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 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 Content-Transfer-Encoding: 8bit X-TUID: jFTCGmD4Lux0 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