From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:a81:cf02:0:b0:2d0:b68c:cf30 with SMTP id u2-20020a81cf02000000b002d0b68ccf30mr24502342ywi.510.1653316598747; Mon, 23 May 2022 07:36:38 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a25:844d:0:b0:64e:18ce:57de with SMTP id r13-20020a25844d000000b0064e18ce57dels8579206ybm.2.gmail; Mon, 23 May 2022 07:36:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzxzlGujAO4wTku1JDVrlHe+9komaz1jdw2K8E1Chl9B3GsBfrY1AEqibqJVKyJ2cLgVhx1 X-Received: by 2002:a25:eb01:0:b0:64b:11ee:f046 with SMTP id d1-20020a25eb01000000b0064b11eef046mr23189104ybs.377.1653316598334; Mon, 23 May 2022 07:36:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653316598; cv=none; d=google.com; s=arc-20160816; b=I7yaqSy78IVFKXa2M+1+J74QQOfYyW15YZTorZKBrAHg2mCoReE5+sJyQ2xb5ammX+ 2hwkQOnVUGb3o1ln7bWhHKVeBnZ7IinXeNn1bzHlxkOlUNgbrOwMqKlhyTfKDLGCY8eF ZyeyKi0M2Rv/92bNKfjmYsVLGpekUFJpadyHcFQjPl9IgqoHZaEc5GSh6Dw/C1DGDYrW 10lWftWVnmK2yFYxihoBMGGhoYKsssPL5Waoqvq9fbGJqnPX77V5ZpySOsZAZjwFDfZD Eh/oHjsEOtvJwuRI9N88+xg+FHHwGcSibjpVJ1ZmuzD4UvZca9FbPaeDo/LDnpRfzneW pSOw== 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=fZnoj4JupAF6eBX0BSdSWQRWt8O2qFCgUmrKXVSgqV96wnsuIX2yHgunYAfuoMViuN LycO0o/DZ7MgOPUMWTPl9d3sSz0ZxXU6486BDMF8l30/2gtyM/NRQkylbgX12EBrzG4t SkBNWpUokU67RibmYwgBQevJp8u/bLi4BIsmSrBMRZHna++cqxP+FZt5C0q7tQpw7Ptj V9Mvq1c/LWI/TbROIAfNXgmWqlfVvIl9OEpP5RJs23ZQLaIX0MThGk0AESp8IJ1D6ODQ 1nBDKJsL0SnrAHQ4MyIhmoJuKLWJMLG/5wZT1za1H8L79ImXHuf/mc08j+5HfGCA311h lPxQ== 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 84-20020a811157000000b002fede485d10si708717ywr.2.2022.05.23.07.36.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 May 2022 07:36:38 -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 24NEaO3W024879 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 23 May 2022 16:36:36 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Uladzimir Bely Subject: [PATCH v11 10/21] dpkg-base: Switch devshell to use schroot Date: Mon, 23 May 2022 17:36:06 +0300 Message-Id: <20220523143617.24759-11-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: 00sP+tKvlB8m 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