From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:a05:6512:6c2:b0:46b:9578:7c63 with SMTP id u2-20020a05651206c200b0046b95787c63mr18813394lff.204.1651761593126; Thu, 05 May 2022 07:39:53 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:210e:b0:250:5bd1:6dab with SMTP id a14-20020a05651c210e00b002505bd16dabls1113083ljq.6.gmail; Thu, 05 May 2022 07:39:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwmmbUlj+s39AQw33+KS3qNxlcuRjmDHQz9dG7Yz3rGCJKUcvh2hguNRWrjrtQ1tr70NukH X-Received: by 2002:a05:651c:1a28:b0:24f:4bd9:c44d with SMTP id by40-20020a05651c1a2800b0024f4bd9c44dmr15529328ljb.479.1651761592044; Thu, 05 May 2022 07:39:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651761592; cv=none; d=google.com; s=arc-20160816; b=KZB/CguA/ACzlfUetBKP6rFcDCaOCYRqGVzHb/rHDngGcMDDETEifvk1kW1meP6AcU h3XblFF4TPrmP8REGp1THqqZMkkfholWUhNMNrElUQSdywakSCFmnq1f2cB/wnGn0xkr nPRvnaY1zRmR0SyxtbX4L1YIa0M8lfxC8Wd/KrmCAguno4islFWOl3aSducIpJ6Abd7B Fph/77P9mxgYG4mGVtwVFfUxkVI04ocQkgKFKIhMxeilJYiy5MArEn0IzWC3pYxFc+d1 Pm8xinxC2AunCfQwoMlgph64BccmPGgqI05NbewGld5Vuc7kYqEVZMSoevztduAsl+QV PoHA== 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=XPIhNeSCSrG1xkUL5o6HaPNiB0qxLfrdi5+ffOwCRJ0=; b=riL17AMDk2F1bb+OdGzdA9Fr03r14v+FzynQWxsWcqIGEzJ1T0nMzFUpdyaCyDC3mh lub0DL68ySIMWysqZ665r7xx0gbjjDppTDarxn3wLayXL9TMH+LYpySj4gAufr5h59qn Kqd2Syjq9P0FLcHeN5JDR615QTtOMFyogze4zmhHz7wK7u1KeWiGjfGCmzShg81sV0nB IKgUn1CgtZ42eqaUesGfnSWdauSHfVsoBsfj+LC44G4JKtCcee1s2tZjnHEC0v/aUbR7 tDD149LtM/JckyemLdmoJaPou9aMQgQzE4qn9U7/M6h7fC274lEUdsh2nz0RDjkGCLdl OTfQ== 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 v8-20020a056512348800b0047238f0bc72si96354lfr.12.2022.05.05.07.39.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 May 2022 07:39:52 -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 245Edf7a014026 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 5 May 2022 16:39:51 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, Uladzimir Bely , Anton Mikanovich Subject: [PATCH v10 08/19] dpkg: Remove builddeps install task Date: Thu, 5 May 2022 17:39:23 +0300 Message-Id: <20220505143934.16096-9-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: mW/aHVXEaAFy From: Uladzimir Bely While builddeps are now handled interlnally by sbuild, we don't need a task to preinstall them in buildchroot. But for the second local (base-apt) build we need a way to keep all dependencies in form of .deb files in DL_DIR. This is done by executing additional commands in sbuild that copy them to/from an externally mounted folder. Signed-off-by: Uladzimir Bely Signed-off-by: Anton Mikanovich --- meta/classes/dpkg.bbclass | 47 ++++++++++++++++--------------------- meta/classes/sbuild.bbclass | 1 - 2 files changed, 20 insertions(+), 28 deletions(-) diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index b61d182..3c7b670 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -5,33 +5,6 @@ inherit dpkg-base PACKAGE_ARCH ?= "${DISTRO_ARCH}" -# Install build dependencies for package -do_install_builddeps() { - dpkg_do_mounts - E="${@ isar_export_proxies(d)}" - export DEB_BUILD_OPTIONS="${@ isar_deb_build_options(d)}" - export DEB_BUILD_PROFILES="${@ isar_deb_build_profiles(d)}" - distro="${DISTRO}" - if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then - distro="${HOST_DISTRO}" - fi - - deb_dl_dir_import "${BUILDCHROOT_DIR}" "${distro}" - sudo -E chroot ${BUILDCHROOT_DIR} /isar/deps.sh \ - ${PP}/${PPS} ${PACKAGE_ARCH} --download-only - deb_dl_dir_export "${BUILDCHROOT_DIR}" "${distro}" - sudo -E chroot ${BUILDCHROOT_DIR} /isar/deps.sh \ - ${PP}/${PPS} ${PACKAGE_ARCH} - dpkg_undo_mounts -} - -addtask install_builddeps after do_prepare_build before do_dpkg_build -do_install_builddeps[depends] += "isar-apt:do_cache_config" -# apt and reprepro may not run in parallel, acquire the Isar lock -do_install_builddeps[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" - -addtask devshell after do_install_builddeps - DPKG_PREBUILD_ENV_FILE="${WORKDIR}/dpkg_prebuild.env" do_prepare_build_append() { @@ -65,6 +38,16 @@ dpkg_runbuild() { bbwarn "Export of '${line}' detected, please migrate to templates" done + distro="${DISTRO}" + if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then + distro="${HOST_DISTRO}" + fi + + deb_dl_dir_import "${WORKDIR}/rootfs" "${distro}" + + deb_dir="/var/cache/apt/archives" + ext_deb_dir="${PP}/rootfs/${deb_dir}" + profiles="${@ isar_deb_build_profiles(d)}" if [ ! -z "$profiles" ]; then profiles=$(echo --profiles="$profiles" | sed -e 's/ \+/,/g') @@ -72,9 +55,19 @@ dpkg_runbuild() { export SBUILD_CONFIG="${SBUILD_CONFIG}" + echo '$apt_keep_downloaded_packages = 1;' >> ${SBUILD_CONFIG} + sbuild -A -n -c ${SBUILD_CHROOT} --extra-repository="${ISAR_APT_REPO}" \ --host=${PACKAGE_ARCH} --build=${SBUILD_HOST_ARCH} ${profiles} \ --no-run-lintian --no-run-piuparts --no-run-autopkgtest \ + --chroot-setup-commands="cp -n --no-preserve=owner ${ext_deb_dir}/*.deb -t ${deb_dir}/ || :" \ + --finished-build-commands="rm -f ${deb_dir}/sbuild-build-depends-main-dummy_*.deb" \ + --finished-build-commands="cp -n --no-preserve=owner ${deb_dir}/*.deb -t ${ext_deb_dir}/ || :" \ --debbuildopts="--source-option=-I" \ --build-dir=${WORKDIR} ${WORKDIR}/${PPS} + + deb_dl_dir_export "${WORKDIR}/rootfs" "${distro}" + + # Cleanup apt artifacts + sudo rm -rf ${WORKDIR}/rootfs } diff --git a/meta/classes/sbuild.bbclass b/meta/classes/sbuild.bbclass index a3783bc..178ba1b 100644 --- a/meta/classes/sbuild.bbclass +++ b/meta/classes/sbuild.bbclass @@ -8,7 +8,6 @@ SCHROOT_MOUNTS ?= "" python __anonymous() { import pwd d.setVar('SCHROOT_USER', pwd.getpwuid(os.geteuid()).pw_name) - d.setVar('SCHROOT_USER_HOME', pwd.getpwuid(os.geteuid()).pw_dir) mode = d.getVar('ISAR_CROSS_COMPILE', True) distro_arch = d.getVar('DISTRO_ARCH') -- 2.17.1