From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7032253102499561472 X-Received: by 2002:a1c:8002:: with SMTP id b2mr16130436wmd.2.1638968750428; Wed, 08 Dec 2021 05:05:50 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:1c7:: with SMTP id 190ls2614885wmb.3.canary-gmail; Wed, 08 Dec 2021 05:05:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJxSCgqWWDBzmv0S0Yk5HPuA/EdfvZHCogd/f0hvuaDDiW5O88eiS9qpVb5fwiCXub6aGvr9 X-Received: by 2002:a05:600c:2118:: with SMTP id u24mr15869854wml.0.1638968749415; Wed, 08 Dec 2021 05:05:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638968749; cv=none; d=google.com; s=arc-20160816; b=Q97etC0oQMfzeo3pTgKsdLMEPLRcUgBrEdI9N6bJwfPhjguUwv6DQHT1gaYDIt2Zx2 qMZNH/mEads6aDyR9NkZNHvWBKcl2m9TpFss9N72X7IOFERPZlcMqPqiIz978OKeIAaA 9huJ0en4nrpMxI7/eqJsY3XHy1npAPBtgkBl8TWWV15gwAEPmjTiOBTkGyQgL0XVVC0P uLSF77qggDW67IFHFGsmVnB5OD+/TzsuhDcwVjILtU5E1aUFPerBwVlFgIPD2VuwUzNb bkJgcWsgof/hl11ntr7D6gKdYkP1o9B/YcYEVsbSFENO7XUWLakoknhw15+V0Hil6xml HYTA== 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=OX4H//g+0oGpj4P5FA2DKi9b+ulAIyJW63CmQCgf6UA=; b=0q0ew+5IbjCLrpMNiofhzbvWe/Eaz9ns7FHtdjmF08dtN7oBDX/veQk44pTFb5uHyL vScj+tl/E+vfzJZYguLR5/ZYITbFL+vWfILghTHrkttnQnqQlp4Wp/3pIuoYuY5mNtsl Qujt5R6OlLf9eDRSMPV543UcZF4LUyP1PMxevIC70pJ16vf6H75X4lY1fDIjOJVmMxvl Y1QKAR7LIewlUa9aiGNxg9+xGzEoTQ0VU33HLy6/QPRFuWTFohsOidHgyaDBvddz0uXK kKhh6pUG7wm386wHM4/M0jAP4uSDbu1prnb6lp7FTZwlNrsOdVpobG407S6fyoL83yy8 FXsw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 125si608290wmc.1.2021.12.08.05.05.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 Dec 2021 05:05:49 -0800 (PST) Received-SPF: pass (google.com: domain of ubely@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 ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 1B8D5iLD009193 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 8 Dec 2021 14:05:48 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3 12/20] dpkg: Build packages with sbuild Date: Wed, 8 Dec 2021 14:05:36 +0100 Message-Id: <20211208130544.15133-13-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211208130544.15133-1-ubely@ilbers.de> References: <20211208130544.15133-1-ubely@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: z+FxkO24wN8I From: Anton Mikanovich Use previously exported to schroot rootfs to build the package with sbuild tool. Provide isar-apt as extra repository to be automatically add to apt sources. Also added /home/.git-downloads mount while it's used as git alternates location. Signed-off-by: Anton Mikanovich Signed-off-by: Uladzimir Bely --- meta/classes/dpkg-base.bbclass | 13 +++++++++++++ meta/classes/dpkg-gbp.bbclass | 2 ++ meta/classes/dpkg.bbclass | 14 ++++++++++++-- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 6704385b..18c80411 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -4,6 +4,7 @@ # # SPDX-License-Identifier: MIT +inherit sbuild inherit buildchroot inherit debianize inherit terminal @@ -14,6 +15,8 @@ DEPENDS ?= "" DEPENDS_append_riscv64 = "${@' crossbuild-essential-riscv64' if d.getVar('ISAR_CROSS_COMPILE', True) == '1' and d.getVar('PN') != 'crossbuild-essential-riscv64' else ''}" +ISAR_APT_REPO ?= "deb [trusted=yes] file:///home/builder/${PN}/isar-apt/${DISTRO}-${DISTRO_ARCH}/apt/${DISTRO} ${DEBDISTRONAME} main" + python do_adjust_git() { import subprocess @@ -196,6 +199,14 @@ dpkg_undo_mounts() { sudo rmdir ${BUILDROOT} } +do_prepare_build_append() { + # Make a local copy of isar-apt repo that is not affected by other parallel builds + mkdir -p ${WORKDIR}/isar-apt/${DISTRO}-${DISTRO_ARCH} + rm -rf ${WORKDIR}/isar-apt/${DISTRO}-${DISTRO_ARCH}/* + cp -Rl ${REPO_ISAR_DIR} ${WORKDIR}/isar-apt/${DISTRO}-${DISTRO_ARCH} +} +do_prepare_build[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" + # Placeholder for actual dpkg_runbuild() implementation dpkg_runbuild() { die "This should never be called, overwrite it in your derived class" @@ -239,6 +250,8 @@ python do_dpkg_build_setscene() { addtask dpkg_build_setscene do_dpkg_build_setscene[dirs] += "${S}/.." +do_dpkg_build[depends] = "${SCHROOT_DEP}" + KEEP_INSTALLED_ON_CLEAN ?= "0" CLEANFUNCS += "deb_clean" diff --git a/meta/classes/dpkg-gbp.bbclass b/meta/classes/dpkg-gbp.bbclass index 2fc37b2f..7eda9b03 100644 --- a/meta/classes/dpkg-gbp.bbclass +++ b/meta/classes/dpkg-gbp.bbclass @@ -11,6 +11,8 @@ PATCHTOOL ?= "git" GBP_EXTRA_OPTIONS ?= "--git-pristine-tar" +SCHROOT_MOUNTS = "${WORKDIR}:${PP} ${GITDIR}:/home/.git-downloads" + dpkg_runbuild_prepend() { sh -c " cd ${WORKDIR}/${PPS} diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 7da73341..6cd0f7d1 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -29,10 +29,20 @@ do_install_builddeps[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" addtask devshell after do_install_builddeps + # Build package from sources using build script dpkg_runbuild() { E="${@ isar_export_proxies(d)}" export PARALLEL_MAKE="${PARALLEL_MAKE}" - sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \ - /isar/build.sh ${PP}/${PPS} ${PACKAGE_ARCH} ${USE_CCACHE} + + schroot_create_configs + + sbuild -A -n -c ${SBUILD_CHROOT} --extra-repository="${ISAR_APT_REPO}" \ + --host=${PACKAGE_ARCH} --build=${SBUILD_HOST_ARCH} \ + --starting-build-commands="runuser -u ${SCHROOT_USER} -- sh -c \"${SBUILD_PREBUILD:-:}\"" \ + --no-run-lintian --no-run-piuparts --no-run-autopkgtest \ + --debbuildopts="-d --source-option=-I" \ + --build-dir=${WORKDIR} ${WORKDIR}/${PPS} + + schroot_delete_configs } -- 2.20.1