From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7114179385042665472 X-Received: by 2002:a05:6000:2aa:b0:21b:b8cc:ceaa with SMTP id l10-20020a05600002aa00b0021bb8ccceaamr16636709wry.57.1656398976193; Mon, 27 Jun 2022 23:49:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:350f:b0:397:475d:b954 with SMTP id h15-20020a05600c350f00b00397475db954ls4421461wmq.0.canary-gmail; Mon, 27 Jun 2022 23:49:35 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u2I5uB+Yl1P4gARGNZeslcPCMW5SSvEYrvzYWnH0rY4ELtmnrt+yEHz0WgKpGIsSXTVqrA X-Received: by 2002:a05:600c:350:b0:3a0:4910:9ebc with SMTP id u16-20020a05600c035000b003a049109ebcmr12182648wmd.148.1656398975285; Mon, 27 Jun 2022 23:49:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656398975; cv=none; d=google.com; s=arc-20160816; b=upisbWjy2CdK1AyDwA5f1qHz4NLMDt2FcKb6PIQTzosWKHX/IJ6CqhXq94/DCP5yqM 3KLiNVy5xn93FobRP7/ThjDlGx9P3QRgpvFSM4JZ5EQ8R68ea51/OZPz/uTR72pXE8IM demABlgM9kL1lRRRZSHPWtRFHJxEu0npM0t2Hnd2TKMIGb1OvcvxXD++Ww4NI7LZBOED T7jSLd/kOy++k1lCN2rDQgzHn+TDysZB8kT0jC7/XXSRoctXWp+ZL8vFzhhB9b/dGCUf sLD7+hUf1J00DreTkeT/ZrudcWKFoOT3Hv/9K1xxk8tZxDwhcX0mHw/ApvmKhG5R4Io6 C8Eg== 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=lPoj2vThtdvDYiPUuHE8FVKQ/V7K9fHQJE5Kris4KaU=; b=x7nYLJ3wQbyN92+hci0DykoIMh0NBWcblHB+q+qcRDKBrlUu4oNPIbcc2jlS8CUsrc Kii7yMoWG5whPDGbEZIomfNYe3gQpedvDsZ5P6RBSJa3ZFsdAxMSidGUlS61NqaTXNOW Xb3Bf/j9vocMCcRQIpMh2vfhn/VnQbP8uilWFflmIQkFX5Q9Y32G2UA/8GsC6Ugo7HQA S3yq13cCJo0FH6NhfTmbFIN6lOrCDsSmxyOIpiD1X+ECqhXJDOvKDDQEwz4hcYNT00Zs jGe/ZaNOZwmTgxM0kjqdKuNK3OABbqbQpF57DXxxqMLpCx5h/5GwiN5zmxX6oHhD3IzU 1q4g== 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 f17-20020a5d58f1000000b002102a7531cesi413399wrd.2.2022.06.27.23.49.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Jun 2022 23:49:35 -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 25S6nMSE030758 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Jun 2022 08:49:34 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Uladzimir Bely Subject: [PATCH v12 10/21] dpkg-base: Switch devshell to use schroot Date: Tue, 28 Jun 2022 09:49:02 +0300 Message-Id: <20220628064913.27938-11-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: RdrSh8hsB+ly From: Uladzimir Bely While packages are now build in schroot with sbuild, devshell task should make terminal open inside sbuild environment. Signed-off-by: Uladzimir Bely --- meta/classes/dpkg-base.bbclass | 23 ++++++++++++++----- meta/classes/sbuild.bbclass | 3 +++ .../sbuild-chroot/sbuild-chroot.inc | 2 ++ 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index dbe35f4..7005aa5 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -298,19 +298,30 @@ do_deploy_deb[lockfiles] = "${REPO_ISAR_DIR}/isar.lock" do_deploy_deb[dirs] = "${S}" python do_devshell() { - bb.build.exec_func('dpkg_do_mounts', d) + bb.build.exec_func('schroot_create_configs', d) isar_export_proxies(d) isar_export_ccache(d) isar_export_build_settings(d) - buildchroot = d.getVar('BUILDCHROOT_DIR') + schroot = d.getVar('SBUILD_CHROOT') + isar_apt = d.getVar('ISAR_APT_REPO') pp_pps = os.path.join(d.getVar('PP'), d.getVar('PPS')) - # the PATH variable is not forwarded by sudo -E. - termcmd = "sudo -E chroot {0} sh -c 'cd {1}; export PATH=$PATH_PREPEND:$PATH; $SHELL -i'" - oe_terminal(termcmd.format(buildchroot, pp_pps), "Isar devshell", d) - bb.build.exec_func('dpkg_undo_mounts', d) + install_deps = ":" if d.getVar('BB_CURRENTTASK') == "devshell_nodeps" else "mk-build-deps -i -t \ + \"apt-get -y -q -o Debug::pkgProblemResolver=yes --no-install-recommends --allow-downgrades\" \ + debian/control" + + termcmd = "schroot -d / -c {0} -u root -- sh -c ' \ + cd {1}; \ + echo {2} > /etc/apt/sources.list.d/isar_apt.list; \ + apt-get -y -q update; \ + {3}; \ + $SHELL -i \ + '" + oe_terminal(termcmd.format(schroot, pp_pps, isar_apt, install_deps), "Isar devshell", d) + + bb.build.exec_func('schroot_delete_configs', d) } addtask devshell after do_prepare_build diff --git a/meta/classes/sbuild.bbclass b/meta/classes/sbuild.bbclass index 6ff41dd..2d52307 100644 --- a/meta/classes/sbuild.bbclass +++ b/meta/classes/sbuild.bbclass @@ -56,6 +56,9 @@ EOF fstab_baseapt="${REPO_BASE_DIR} /base-apt none rw,bind 0 0" grep -qxF "${fstab_baseapt}" ${sbuild_fstab} || echo "${fstab_baseapt}" >> ${sbuild_fstab} + fstab_pkgdir="${WORKDIR} /home/builder/${PN} none rw,bind 0 0" + grep -qxF "${fstab_pkgdir}" ${sbuild_fstab} || echo "${fstab_pkgdir}" >> ${sbuild_fstab} + if [ -d ${DL_DIR} ]; then fstab_downloads="${DL_DIR} /downloads none rw,bind 0 0" grep -qxF "${fstab_downloads}" ${sbuild_fstab} || echo "${fstab_downloads}" >> ${sbuild_fstab} diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc index 74811e2..4688da1 100644 --- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc +++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc @@ -15,6 +15,8 @@ SBUILD_CHROOT_PREINSTALL_COMMON = " \ build-essential \ debhelper \ ccache \ + devscripts \ + equivs \ " SBUILD_CHROOT_PREINSTALL ?= " \ -- 2.17.1