From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7114179385042665472 X-Received: by 2002:a7b:c5c6:0:b0:397:8a39:37b with SMTP id n6-20020a7bc5c6000000b003978a39037bmr19036768wmk.182.1656398971065; Mon, 27 Jun 2022 23:49:31 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:1887:b0:218:5c3b:1a23 with SMTP id a7-20020a056000188700b002185c3b1a23ls9220479wri.0.gmail; Mon, 27 Jun 2022 23:49:30 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sgIiIdD/f/iNbEbqGbCNkua1/r/wPBq9NFkit4dwprwFeP3RCTUKV35dggxoLy0X72IbEx X-Received: by 2002:adf:e68b:0:b0:21d:1c8d:9891 with SMTP id r11-20020adfe68b000000b0021d1c8d9891mr2250304wrm.37.1656398970199; Mon, 27 Jun 2022 23:49:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656398970; cv=none; d=google.com; s=arc-20160816; b=zfTJavva+NigLyaxlIx57bxewZIjOFM5KZnSPQhCy64jQQMT3tnUQD5hI+3EiwDF/n o63+rtCYJE2cRdwwKXGq2zOQnTgHG6dQ2ZEJqonuEzwMJvajbSz6kTu0lmi3ANJha1pR fDhQiu7hVWS4wCSwy04e8Mv2/puzdZFJWw92tv4alLfV8MdAHUukxhChZNx5k/VRttmL lOP/JDTOGYqGv35UFuflPBgrSbmSErMwGTKvpaUSBIZDUKHtgbmkIKmwYM4wc3gidEeQ P17+pIDseB2CXZXtOTwl6Prjw2z+tO//I+l4ToNWj7bWVDXZOdlY9k4O9MtAUyc0vVZz hR9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=ztOiZQCF5255TP1ovIksL+0ZkblzrK1NZz7wVXmbqQQ=; b=kThmVdV2AbT/E5AgYsFbybrG4AYPpwzwi/dBsRtx+tq4FInQW2E5Rr+GWL84Trkvh2 2v5gvpxom1fiDRVpfKcEx79RqvpvoKrFXhkvts1C0RN60yaJ7AeEaRlz3Pkedpxw1vNP M5DXHHGk1jjY99z/u0p0JprwMgxxdQ6sUOtM8pDF25iUPqjMyBcLS5U1sHL4hIyppG5F 98jJRA9AW32gv4HUw3UFllbke3sbr5D4Cu6FOvag/Vf6roH3nC0mlj3a3WKVcw0hsL16 U8P7HZCBmkL9KXs/r/CMymylzDGSsG+/H0w0QMIO5/mjoCLHe2Lw8LGI1hTdMS21uHt4 /3dg== 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 c2-20020a05600c0a4200b0039c6559434bsi574202wmq.1.2022.06.27.23.49.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Jun 2022 23:49:30 -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-172-27-214-37.mgts.dynamic.pppoe.byfly.by [37.214.27.172] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 25S6nMS9030758 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Jun 2022 08:49:28 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich , Uladzimir Bely Subject: [PATCH v12 05/21] dpkg: Build packages with sbuild Date: Tue, 28 Jun 2022 09:48:57 +0300 Message-Id: <20220628064913.27938-6-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220628064913.27938-1-amikan@ilbers.de> References: <20220628064913.27938-1-amikan@ilbers.de> 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: AR4NGdcirhdh 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 7e032ba..dbe35f4 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 @@ -175,6 +178,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}" @@ -200,6 +204,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" @@ -222,14 +235,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 @@ -259,7 +269,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" @@ -269,15 +279,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 2b0b818..68172b3 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 af83353..5f68fd6 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 b9fc6a0..a3783bc 100644 --- a/meta/classes/sbuild.bbclass +++ b/meta/classes/sbuild.bbclass @@ -29,6 +29,8 @@ SBUILD_CHROOT ?= "${DEBDISTRONAME}-${SCHROOT_USER}-${@os.getpid()}" SBUILD_CONF_DIR ?= "${SCHROOT_CONF}/${SBUILD_CHROOT}" SCHROOT_CONF_FILE ?= "${SCHROOT_CONF}/chroot.d/${SBUILD_CHROOT}" +SBUILD_CONFIG="${WORKDIR}/sbuild.conf" + schroot_create_configs() { sudo -s <<'EOSUDO' set -e @@ -73,7 +75,6 @@ EOSUDO } sbuild_export() { - SBUILD_CONFIG="${WORKDIR}/sbuild.conf" VAR=${1}; shift VAR_LINE="'${VAR}' => '${@}'," if [ -s "${SBUILD_CONFIG}" ]; then @@ -83,7 +84,6 @@ sbuild_export() { echo "${VAR_LINE}" >> ${SBUILD_CONFIG} echo "};" >> ${SBUILD_CONFIG} fi - export SBUILD_CONFIG="${SBUILD_CONFIG}" } insert_mounts() { -- 2.17.1