From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057122428766388224 X-Received: by 2002:a05:6000:15ca:: with SMTP id y10mr18612807wry.202.1643114358914; Tue, 25 Jan 2022 04:39:18 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:e390:: with SMTP id e16ls60425wrm.0.gmail; Tue, 25 Jan 2022 04:39:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJyzWxMuWUfpvYnEWCPxwca4svdl59beVk6at57RMlIt5a7qPs3zXsUM6ZrKgOn6qhj/NPbb X-Received: by 2002:a05:6000:144c:: with SMTP id v12mr18301716wrx.218.1643114358141; Tue, 25 Jan 2022 04:39:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643114358; cv=none; d=google.com; s=arc-20160816; b=Vzw6RuuQ5lwaypKiIW2IU8SrKzkInc7/m/gOD6mnz8W1XwdwHQbfrjSRtZkjYukuNr JGkn5fnQ04jQDJybjxiz43aopzlscAfT5DdSnUkk8mTZvGi1I+tQu5iEM2IBNnMXcfAP Y2uPQJGjjxcZnN0Fe/b/EGP6JqBvH7EeIBjKMuP52gdrl+BvZ56DOXsBkw/pQNc2X/k/ K3MP2UF9Rc088XCQ0teZHxmaA7chUuHl+QvnB9j/sw/O2IMYJUMLlcQdWB0Y9XnIGoi2 APOsBOTwKQshCk/7HiYEFsiUN54PH8RN1TYeEVcFkWr9GitPdwNigDUSzv6kkurMKXxO SxOA== 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=c6X8IDQ0wyNOfYHI30fyj2zD7Zwe0JsVNMyzYCENKPQ=; b=0jxS/BaXWXbQvbKPrF8msOWAaFduFyZzJonw+86hPHtJER4qHtM77sK3x5+4F/PbsH G73WH0ZxXeTGgKK/EOKUS8NbEtBjAK1R1NS1WFxMBgxH1Qw41UCBGY+W2ZC6PUXsQMAs 1AB4CqHm3SYw9U7PEqICVWQ/+oZ309gZLoGompK8NuAp0UadCKQAqQoappTYeYykkVCs TZG/TrTH8N1uephJn0tZltKQIYCPq9Z2HAlaKJ2Bu5h4dWNREJiS4cJ3gfAkNAZbQqKr ANQerRL45bPvxVmMMsOjNVflb71qzpr5nuSO8I65An66rpROuGcOM39jtD0wjx1hAhNl GBwg== 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 l24si184418wmg.1.2022.01.25.04.39.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Jan 2022 04:39:18 -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 20PCdFmf019254 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 25 Jan 2022 13:39:17 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v4 05/12] dpkg: Build packages with sbuild Date: Tue, 25 Jan 2022 13:39:08 +0100 Message-Id: <20220125123915.1053-6-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220125123915.1053-1-ubely@ilbers.de> References: <20220125123915.1053-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: mcp1unNQeR0M 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 | 16 +++++++++++++++- meta/classes/dpkg-gbp.bbclass | 2 ++ meta/classes/dpkg.bbclass | 13 +++++++++++-- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 76b1290a..e1c27b9e 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,13 +199,22 @@ 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" + # Basic export implementation supporting multiword values dpkg_build_export() { var=$1 shift value=$@ - export $var="$value" + sbuild_export $var "$value" } # Placeholder for actual dpkg_runbuild() implementation @@ -250,6 +262,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 e8c7e2eb..66539f48 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -29,11 +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)}" E="${@ isar_export_ccache(d)}" dpkg_build_export PARALLEL_MAKE "${PARALLEL_MAKE}" - sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \ - /isar/build.sh ${PP}/${PPS} ${PACKAGE_ARCH} + + schroot_create_configs + + sbuild -A -n -c ${SBUILD_CHROOT} --extra-repository="${ISAR_APT_REPO}" \ + --host=${PACKAGE_ARCH} --build=${SBUILD_HOST_ARCH} \ + --no-run-lintian --no-run-piuparts --no-run-autopkgtest \ + --debbuildopts="--source-option=-I" \ + --build-dir=${WORKDIR} ${WORKDIR}/${PPS} + + schroot_delete_configs } -- 2.20.1