From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:a17:90b:4c88:b0:1df:c5e1:986e with SMTP id my8-20020a17090b4c8800b001dfc5e1986emr26944546pjb.8.1653316597331; Mon, 23 May 2022 07:36:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:902:d506:b0:161:d3bd:ebea with SMTP id b6-20020a170902d50600b00161d3bdebeals8891530plg.0.gmail; Mon, 23 May 2022 07:36:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxtFbIZp/nct/wXUwenr4USahB1z7Pbw/Y3+XeAHOGUbZpc0QsmR0yKJhSlLq89PW9Qx3bK X-Received: by 2002:a17:90a:d505:b0:1df:7d0e:a03c with SMTP id t5-20020a17090ad50500b001df7d0ea03cmr27702176pju.170.1653316596478; Mon, 23 May 2022 07:36:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653316596; cv=none; d=google.com; s=arc-20160816; b=hZ9PbXVHa9xEBEmf8sZ8OERGOgH9ATef38Y8Z1WzdetwpeVVekb+f6zkJmEG16ns1d N2a0Nc/ARLic9xsDa+V+au970IJqibOejfru5wy+bBiQ4NnRp2HYLuNtysa7Bg1Mqm9H xXpDyyDqa81gWH0+czf83kV+zJEBxkld5Ep3atpDDxcR1T+maRGLRmNCBcvatJ01YJZ/ d/Ggr3FV+YVOV+RKwlty5/UEDO6j7ubLM8/+vkrXeyLc9MfjrFbi2XCmSh8z5+t8F1RA y2i4KmtEIA5zk+3+sDCLiiJJpKSklkx7Tc/AJgk/l6j6PaitfdAytb+bPT5vtGqvXwSY RZbw== 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=mmt1f6NBmeyeB0KGn5LHHgkI55ZtGwendKBrd507RPM=; b=TDO7ILQ0f9jG36sR5K6XtGNjjTlwd3Z48AHAS1gJXVya4CgmySGdpoPffTUNE7yAEQ oSPVkGSJJF6CYpd6XPdq1qNnUN1Aq4FVLRzqzrrP8qSDK3+49DHB9zETT2mgqDXdhc2I a5bbzM90XNqZRi7Ax/LpThYlf7x+kDBMv5TUPv31Zmpmh8kNDjpFsZCz+jUAOH6Zxbnw +qwAIMukQc3CkNqpjhelrsxgKmhsXhni9KKpg0ezf0xqWIyryUeVJpT2R5Yk+LBXM5ND N2n7XqgcsoqguwLo6ffIxyq/DG30y18bnea/UYMnqkwD7Hoby4XJQ8gQKQc3HA11vNAT R63A== 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 k1-20020a170902d58100b0015a1cc64912si271242plh.3.2022.05.23.07.36.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 May 2022 07:36:36 -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-40-50-214-37.mgts.dynamic.pppoe.byfly.by [37.214.50.40] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 24NEaO3U024879 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 23 May 2022 16:36:34 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Uladzimir Bely , Anton Mikanovich Subject: [PATCH v11 08/21] dpkg: Remove builddeps install task Date: Mon, 23 May 2022 17:36:04 +0300 Message-Id: <20220523143617.24759-9-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220523143617.24759-1-amikan@ilbers.de> References: <20220523143617.24759-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: P8vWXEW7kBiE 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 05b46c9..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] += "${BUILDCHROOT_DEP} 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