From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:a5d:6da8:0:b0:1f1:fa31:e7f7 with SMTP id u8-20020a5d6da8000000b001f1fa31e7f7mr2468825wrs.389.1647492625079; Wed, 16 Mar 2022 21:50:25 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3544:b0:38c:6c15:b2dd with SMTP id i4-20020a05600c354400b0038c6c15b2ddls2002891wmq.3.gmail; Wed, 16 Mar 2022 21:50:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyWv0jTk6g1he9Iz1C087xzuOkVfFjI0jVu89iE0ffo6hdd9HGWELSFZzvQveYEgFgtVlOB X-Received: by 2002:a05:600c:284b:b0:38b:5133:bba2 with SMTP id r11-20020a05600c284b00b0038b5133bba2mr2265948wmb.11.1647492624125; Wed, 16 Mar 2022 21:50:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647492624; cv=none; d=google.com; s=arc-20160816; b=xP2BIXbdJBQ9COeHE2qXMAz2kMZKL2MgLrrV0UF0ag5F9OvSLh4u+TZ7f1B0/V+/5q H7N4or7BYln8yer+E3VRpkOomP83g8c55U678dDGr0ja4e2ENJPA6Qne6gJLLfFW5i7T ahStkxs+ZDipssq5eW9iJEaKbxJuRh6H02rTpgbXKaeCxfMT3NqrXyu0zrbToN7oN7de gt2HKYQrBsbwzqjBjETqKV7gY6BE+VfhNTKENQHAJE0PRe5aRLD/3abjryt7pEXqaNrh EqX6AfemCMxriavAbO2uXSjaUezoVnQGjOGbd0GQGeBGfKpnwv0XcrCtnZJTaOib9F4x KVFg== 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=VXvyceEoeNSfiVZrNsgU3pz+MDmfTgJlbUtqS8v03uU=; b=veSMpm0qBK3VnxKHKfoGvsbj+4YebgknamWbZvNayKtUkIxpKqIUCW5xv6yrqlI2EA yjw+khEoeh360eD31RZH4b2xcc9lejBsAmG/o1lP5YPgBSRa2U6hzxGskJYj1OdQxRcU t9KR1zst1t8iQ024olG81FdF3HAOL703zAmE19Av3XY87P7VNESkzGzTtcU/BZc+4tz6 xba5D0HL5OOxkKeElX/uumh7De+ORJfPqMLqX1utuE8Z6AsIaAtvFeCyOuYQCO3Mp29u XcNCVzoqhhsnTs2UT7PUFbLijLU30TNS+/2yWB8pjd5SMD/EIXNpT1HLRja/RH1lJBVz KNLQ== 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 l10-20020a05600002aa00b00203c23e563bsi240554wry.2.2022.03.16.21.50.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 Mar 2022 21:50:24 -0700 (PDT) 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 22H4oLHc025716 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 17 Mar 2022 05:50:23 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v8 05/16] dpkg: Build packages with sbuild Date: Thu, 17 Mar 2022 05:50:10 +0100 Message-Id: <20220317045021.4018-6-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220317045021.4018-1-ubely@ilbers.de> References: <20220317045021.4018-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: ZhlqRTGUTGdl 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 | 31 ++++++++++++++++--------------- meta/classes/dpkg-gbp.bbclass | 2 ++ meta/classes/dpkg.bbclass | 10 ++++++++-- meta/classes/sbuild.bbclass | 4 ++-- 4 files changed, 28 insertions(+), 19 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 86933c57..c60052d3 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 @@ -16,6 +17,8 @@ DEPENDS_append_riscv64 = "${@' crossbuild-essential-riscv64' if d.getVar('ISAR_C DEB_BUILD_PROFILES ?= "" DEB_BUILD_OPTIONS ?= "" +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 @@ -177,6 +180,7 @@ addtask prepare_build after do_patch do_transform_template before do_dpkg_build # If Isar recipes depend on each other, they typically need the package # deployed to isar-apt do_prepare_build[deptask] = "do_deploy_deb" +do_prepare_build[depends] = "${SCHROOT_DEP}" BUILDROOT = "${BUILDCHROOT_DIR}/${PP}" @@ -202,6 +206,15 @@ 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" @@ -224,14 +237,11 @@ def isar_export_build_settings(d): os.environ['DEB_BUILD_PROFILES'] = isar_deb_build_profiles(d) python do_dpkg_build() { - lock = bb.utils.lockfile(d.getVar("REPO_ISAR_DIR") + "/isar.lock", - shared=True) - bb.build.exec_func("dpkg_do_mounts", d) + bb.build.exec_func('schroot_create_configs', d) try: bb.build.exec_func("dpkg_runbuild", d) finally: - bb.build.exec_func("dpkg_undo_mounts", d) - bb.utils.unlockfile(lock) + bb.build.exec_func('schroot_delete_configs', d) } addtask dpkg_build @@ -261,7 +271,7 @@ python do_dpkg_build_setscene() { addtask dpkg_build_setscene do_dpkg_build_setscene[dirs] += "${S}/.." -KEEP_INSTALLED_ON_CLEAN ?= "0" +do_dpkg_build[depends] = "${SCHROOT_DEP}" CLEANFUNCS += "deb_clean" @@ -271,15 +281,6 @@ deb_clean() { for d in ${DEBS}; do repo_del_package "${REPO_ISAR_DIR}"/"${DISTRO}" \ "${REPO_ISAR_DB_DIR}"/"${DISTRO}" "${DEBDISTRONAME}" "${d}" - if [ "${KEEP_INSTALLED_ON_CLEAN}" = "1" ]; then - continue; - fi - package=$(basename "${d}") - package_remove="/usr/bin/apt-get remove -y ${package%%_*}" - sudo -E chroot ${BUILDCHROOT_DIR} ${package_remove} || true - if [ "${BUILDCHROOT_DIR}" != "${BUILDCHROOT_TARGET_DIR}" ]; then - sudo -E chroot ${BUILDCHROOT_TARGET_DIR} ${package_remove} || true - fi done fi } diff --git a/meta/classes/dpkg-gbp.bbclass b/meta/classes/dpkg-gbp.bbclass index 2b0b8184..68172b3f 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 320102ba..848ffad1 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -39,6 +39,12 @@ dpkg_runbuild() { export DEB_BUILD_OPTIONS="${@ isar_deb_build_options(d)}" export DEB_BUILD_PROFILES="${@ isar_deb_build_profiles(d)}" export PARALLEL_MAKE="${PARALLEL_MAKE}" - sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \ - /isar/build.sh ${PP}/${PPS} ${PACKAGE_ARCH} + + export SBUILD_CONFIG="${SBUILD_CONFIG}" + + 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} } diff --git a/meta/classes/sbuild.bbclass b/meta/classes/sbuild.bbclass index e4341a6f..6fff664f 100644 --- a/meta/classes/sbuild.bbclass +++ b/meta/classes/sbuild.bbclass @@ -31,6 +31,8 @@ SBUILD_CONF_DIR ?= "${SCHROOT_CONF}/${SBUILD_CHROOT}" SCHROOT_CONF_FILE ?= "${SCHROOT_CONF}/chroot.d/${SBUILD_CHROOT}" SCHROOT_CONF_FILE_RW ?= "${SCHROOT_CONF}/chroot.d/${SBUILD_CHROOT}-rw" +SBUILD_CONFIG="${WORKDIR}/sbuild.conf" + schroot_create_configs() { sudo -s <<'EOSUDO' set -e @@ -96,7 +98,6 @@ EOSUDO } sbuild_export() { - SBUILD_CONFIG="${WORKDIR}/sbuild.conf" VAR=${1}; shift VAR_LINE="'${VAR}' => '${@}'," if [ -s "${SBUILD_CONFIG}" ]; then @@ -106,7 +107,6 @@ sbuild_export() { echo "${VAR_LINE}" >> ${SBUILD_CONFIG} echo "};" >> ${SBUILD_CONFIG} fi - export SBUILD_CONFIG="${SBUILD_CONFIG}" } schroot_install() { -- 2.20.1