From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:a5d:598f:0:b0:20c:83c9:b05b with SMTP id n15-20020a5d598f000000b0020c83c9b05bmr6465776wri.343.1651761589800; Thu, 05 May 2022 07:39:49 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:6d84:0:b0:20c:7b09:42a4 with SMTP id l4-20020a5d6d84000000b0020c7b0942a4ls1926404wrs.2.gmail; Thu, 05 May 2022 07:39:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz+MsL175L3y7mlaHv/OSki1EB0Kc7R3e4P8siiZIl+dny5tJXH5Z16FAxYgfCacjpt68ul X-Received: by 2002:adf:e6c3:0:b0:20a:e1a1:b176 with SMTP id y3-20020adfe6c3000000b0020ae1a1b176mr20715589wrm.291.1651761588868; Thu, 05 May 2022 07:39:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651761588; cv=none; d=google.com; s=arc-20160816; b=mfZyUWHbHRwPyYjne9GhtVZGBFBBUvRCTciAKXxJLfY1vmYwe4/0AqR5ifgiZ8KR83 v7nf7v/eZcWeeqnRM0lZyezxa1nnzgGnyvuycVh50aj+Q1Xgu1IL9JBtOLjU1Hd6UMjY efTybP9tNV2IwwdIKOf0n3iR3z1eFEaDNW1O7sXrwhmqjAGiXuV9PVZ0SoJxnitnBWPz qOKRpd9zAAvRMM2NHk6CakMzf241Gy7SgBj2yPF9zBHSE/oy2TmqUCaW4q6QReeQ0WxN lUtqnQmSyB9EKVf4+5yranv8WWIIJgwN7YI2Eorm0LEKAsAOMJEMK99ZNgolkwFFFdW/ V5Rw== 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=H7ucRVV/d4v6Um0QVX5O9pRfVNjf3QXFCkjd4ADL3VU=; b=bctDOs9JH1Pt1lLEIlxruLk8SxFhXzlP8/EHh59t97edZv82Oi2Vd+RIohZLgtR4iN 7vdz6FqUZGEQ9fRpUfaYMAzqzFJ2WowGumeBw4lnhj2dpleFU70+uTJZGbYFQoL1n16y QPXBjclrGcirUYkqBAXU8MBBXIYLMMLkR3zWuMiUkCItAvQknjS5+BVmvy27yztMBLMG p3glMDqZfplAopoyOwZUGiKpWRBvsiB1LoXInXxf65gue07LKTs0yZiRlOWgE2V75Hms JYFU4a3Wmy/OSh+6RBHxjqemibD/I6QmXu21bLqQpthl3DS9pxXxDPkrnjXdcRguJp5p nfQA== 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 k6-20020a05600c1c8600b0039439429409si129675wms.2.2022.05.05.07.39.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 May 2022 07:39:48 -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-0-74-214-37.mgts.dynamic.pppoe.byfly.by [37.214.74.0] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 245Edf7X014026 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 5 May 2022 16:39:48 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, Anton Mikanovich , Uladzimir Bely Subject: [PATCH v10 05/19] dpkg: Build packages with sbuild Date: Thu, 5 May 2022 17:39:20 +0300 Message-Id: <20220505143934.16096-6-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220505143934.16096-1-amikan@ilbers.de> References: <20220505143934.16096-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: 1ayE+t771Fc2 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 86933c5..c60052d 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 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 320102b..848ffad 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