From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6989231260094693376 X-Received: by 2002:a05:600c:3510:: with SMTP id h16mr17540824wmq.65.1627307223038; Mon, 26 Jul 2021 06:47:03 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:4dd1:: with SMTP id f17ls1487948wru.0.gmail; Mon, 26 Jul 2021 06:47:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyqj/97qwNRi41VI+i/z7X3CebVr1Qs9BxCaSfdBHGyeEomJd2pwTaT2E1GeeTtsoIAp/u9 X-Received: by 2002:adf:c409:: with SMTP id v9mr19440335wrf.102.1627307222169; Mon, 26 Jul 2021 06:47:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627307222; cv=none; d=google.com; s=arc-20160816; b=B4szvGsewU89ipM0WmB1V7n0ZUrtt+R1YWGVFFT4YjVEG/DrtE7+3qg+dWzcg2pDrl gk7WUOLryYGDvJoaGrjwt8lifyUC0byPy7PvTm7v0E/caS9dGsEdlM6a+zPFYdktEDli oFeU0aOlAo2Dqg2vt+wLZSDDzvXQu0YOL5zgwU84p6Q3YB7mDMG/UXCrUHnch5Y6OpoV DrBZdr2hDzXXQh85jtSu0Lj4p3XI1hU6QlpHYuxxw2Yw/w6AOJYj4xoez+aqP1MhA1zp A+5suVvj3jgXcuUYGG3xQwN6YjcFR+icLjBqQfDqtd7fO/i5BJ+cD/ggOvl08bALC3PI LtnQ== 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=NNUif/Ghe3I3FJGHYAMX1Sh7hBLlTV+n0t2R3q5TGvQ=; b=oxaKiyHSaD2Kxx2YzhXJcKGlSpjZtM7Bqm8FN84E6Zfeb907Q+dJSeJ+vtyhJxtHNJ VQxbtKCdO9wSzlz3xYnB0e2K+z9czGdlMJX1sEv8ZzJaPJOpyx7+RmTpkFVhrFl5B0Iq gd3YlKMOlsm+B2Vo1vEZ+qiW5gg4GO07+A2UIwS6YLCDJbwRX4dU4IzSCTkW82luACbK 07ohZPdIUtylV0cVxMI72vHTObtdOlfSE43Axz3qJiID2vErPFdQPMapzlEXxt0giRS2 3xJxSDFgMDLFIaX84CRrQHxwwN6nkP2Q9S/sCVcItG0b8TMAJJihYsNy9CAiW4M3/wJv xdkg== 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 n5si803wms.1.2021.07.26.06.47.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jul 2021 06:47:02 -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-198-62-214-37.mgts.dynamic.pppoe.byfly.by [37.214.62.198] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 16QDknv3019679 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 26 Jul 2021 15:47:01 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [RFC 11/15] dpkg: Remove builddeps install task Date: Mon, 26 Jul 2021 16:46:32 +0300 Message-Id: <20210726134636.30800-12-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210726134636.30800-1-amikan@ilbers.de> References: <20210726134636.30800-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: vRsVQETr1Fux Build dependencies are installed by sbuild now. Signed-off-by: Anton Mikanovich --- meta/classes/dpkg-gbp.bbclass | 3 ++- meta/classes/dpkg.bbclass | 29 +---------------------------- 2 files changed, 3 insertions(+), 29 deletions(-) diff --git a/meta/classes/dpkg-gbp.bbclass b/meta/classes/dpkg-gbp.bbclass index 2711e6c..0c60bda 100644 --- a/meta/classes/dpkg-gbp.bbclass +++ b/meta/classes/dpkg-gbp.bbclass @@ -12,7 +12,7 @@ PATCHTOOL ?= "git" GBP_DEPENDS ?= "git-buildpackage pristine-tar" GBP_EXTRA_OPTIONS ?= "--pristine-tar" -builddeps_install_append() { +do_prepare_build() { deb_dl_dir_import "${BUILDCHROOT_DIR}" "${distro}" sudo -E chroot ${BUILDCHROOT_DIR} \ apt-get install -y -o Debug::pkgProblemResolver=yes \ @@ -22,6 +22,7 @@ builddeps_install_append() { apt-get install -y -o Debug::pkgProblemResolver=yes \ --no-install-recommends ${GBP_DEPENDS} } +do_prepare_build[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" dpkg_runbuild_prepend() { sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \ diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 524aecc..582c2b6 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -6,34 +6,7 @@ inherit sbuild PACKAGE_ARCH ?= "${DISTRO_ARCH}" -# Install build dependencies for package -builddeps_install() { - distro="${DISTRO}" - if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then - distro="${HOST_DISTRO}" - fi - deb_dl_dir_import "${BUILDCHROOT_DIR}" "${distro}" - sudo -E chroot ${BUILDCHROOT_DIR} /isar/deps.sh \ - ${PP}/${PPS} ${PACKAGE_ARCH} --download-only - deb_dl_dir_export "${BUILDCHROOT_DIR}" "${distro}" - sudo -E chroot ${BUILDCHROOT_DIR} /isar/deps.sh \ - ${PP}/${PPS} ${PACKAGE_ARCH} -} - -python do_install_builddeps() { - dpkg_do_mounts(d) - isar_export_proxies(d) - try: - bb.build.exec_func("builddeps_install", d) - finally: - dpkg_undo_mounts(d) -} - -addtask install_builddeps after do_prepare_build before do_dpkg_build -# apt and reprepro may not run in parallel, acquire the Isar lock -do_install_builddeps[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" - -addtask devshell after do_install_builddeps +addtask devshell after do_prepare_build ISAR_APT_REPO ?= "deb [trusted=yes] file:///isar-apt/${DISTRO}-${DISTRO_ARCH}/apt/${DISTRO} ${DEBDISTRONAME} main" -- 2.25.1