From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6984671516770172928 X-Received: by 2002:a05:600c:35c9:: with SMTP id r9mr2307729wmq.139.1626245567620; Tue, 13 Jul 2021 23:52:47 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1554:: with SMTP id f20ls765513wmg.0.gmail; Tue, 13 Jul 2021 23:52:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxfnzQBT6GIDhtQjUZNAs3XHp4D6NT1K/i8nosCdq3lAktNEkoBPX607X5RfzSQm7IFgq8X X-Received: by 2002:a1c:9a12:: with SMTP id c18mr9776008wme.48.1626245566764; Tue, 13 Jul 2021 23:52:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626245566; cv=none; d=google.com; s=arc-20160816; b=eRE1b+IYSlo7rjl0Xe+CE/SmHDKbVXq/O3lEPcucwy6kYhOwHJz8hn8dvbkGot8n+q IcPZb+WGamzdik58ddMsUX06skzsM09WMx0Bm0W2KlNVbJp/FAHFWzPhEL/FLp7rnziH MdcDGDl+zxFDHqlUG8XNR7V1mIc8QQCRlvVhkZ4qiU9vQGq7FGNhfquJ6E2hht08Dafn ZD1+BnNr66cRZeDLX8lQwgFYzjcSElX76+6cwy8+zWWto+AgiuUryBwzZyLnVHQaV0tl t5YB2aRTwQb5ijRASMC6wCmmOrPjt8pZPROjiOTMmbFWbHeP9SJKe6RqXpBMxXqb2hRv Ft4g== 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:cc:to:from; bh=NQlFGU9n08yh7+8f7RGhAiRpyyUr4L3Xdb4Fb8/8jog=; b=jYgQ1w3Nh/XJwahTZUz7ehVtBqCRCcU6G3xvS54nJyJQAjAifB5kU+pCV3NcqqlTpp WfRl9lnxzeiUwDWNOe3FH+yczJeNP3wgZ3jivP1hsDX+bzuDWttAq/P8IqJcTOI0vU2Z i+NT2LMmplrsfh8z2Tov2xrkdr3hGSQN4siylwY80sjE3qwMWmvk9bM34dTndaW2FlyG cWDp96cOTcRhpzBxirzgr2dDP3hjBGKh3nlzzPDqiMkJj/ilT43Vuy5tr4srG+ecHpdG zIz0eVW+cbhbIfTVDII0b62m4YVbDEOh1SJfkfHpquBN0wmfPLOETaSddYH19HnfrmnX FROw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 192si152926wma.3.2021.07.13.23.52.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Jul 2021 23:52:46 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (mm-40-58-214-37.mgts.dynamic.pppoe.byfly.by [37.214.58.40] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 16E6qgvg031061 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 14 Jul 2021 08:52:46 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v3 2/3] buildchroot: Move apt_fetch dependency to dpkg-base Date: Wed, 14 Jul 2021 09:52:33 +0300 Message-Id: <20210714065234.300300-3-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210714065234.300300-1-amikan@ilbers.de> References: <20210714065234.300300-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: cerw9W8B4MSv Buildchroot should not care about all the task depends on it, so we should move do_apt_fetch dependency to the place where this task was implemented. Signed-off-by: Anton Mikanovich --- meta/classes/buildchroot.bbclass | 3 +-- meta/classes/dpkg-base.bbclass | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes/buildchroot.bbclass b/meta/classes/buildchroot.bbclass index 0db6ef9..f77e4f0 100644 --- a/meta/classes/buildchroot.bbclass +++ b/meta/classes/buildchroot.bbclass @@ -5,7 +5,7 @@ ISAR_CROSS_COMPILE ??= "0" -# Add dependency from the correct buildchroot: host or target +# Choose the correct buildchroot: host or target python __anonymous() { mode = d.getVar('ISAR_CROSS_COMPILE', True) distro_arch = d.getVar('DISTRO_ARCH') @@ -17,7 +17,6 @@ python __anonymous() { dep = "buildchroot-host:do_build" rootfs = d.getVar('BUILDCHROOT_HOST_DIR', True) - d.setVarFlag('do_apt_fetch', 'depends', dep) d.setVar('BUILDCHROOT_DEP', dep) d.setVar('BUILDCHROOT_DIR', rootfs) } diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index ed162b3..ec8fbc1 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -89,6 +89,9 @@ python do_apt_fetch() { addtask apt_fetch after do_unpack before do_apt_unpack do_apt_fetch[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" +# Add dependency from the correct buildchroot: host or target +do_apt_fetch[depends] = "${BUILDCHROOT_DEP}" + unpack_apt() { for uri in "${SRC_APT}"; do sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \ -- 2.25.1