From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:a2e:aa10:0:b0:248:33d:3569 with SMTP id bf16-20020a2eaa10000000b00248033d3569mr1783184ljb.107.1647492626908; Wed, 16 Mar 2022 21:50:26 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:b710:0:b0:249:1800:6d81 with SMTP id j16-20020a2eb710000000b0024918006d81ls809413ljo.0.gmail; Wed, 16 Mar 2022 21:50:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxsg0tBbkWbCucG97nDVASx/tS0AcuoTaaWgIfHoWj6IA3knxlsIEaGk4xYeWlqR64REt5a X-Received: by 2002:a2e:9d83:0:b0:246:2c6:79df with SMTP id c3-20020a2e9d83000000b0024602c679dfmr1772699ljj.280.1647492625841; Wed, 16 Mar 2022 21:50:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647492625; cv=none; d=google.com; s=arc-20160816; b=QYME006ZgcgtwO/NxDOpRbmNnlvaxptnJRpGhl/8uL0d4cpUiHjbSsrzWSwXtHkm6t PoUTeCmiq240WBE1MNSd8OTKIMUaAlzblQ0l76zdUgFpKKFJMn8setn13wTWUTkYzhfu 7KDjx/cMkcVDRTdmmtOxfE/717433I/aymQSZY7PaWb0UNhTuyj1a+lCAuGCqAbFNLku gNbxTjy3DDGrh1/oePhIQ/9oKMMFfyD0ST648xSSJsd+d5Ppy/e1eA6Jx001Il+JHdq6 dTK1wUknbZ8J4Bhkxpy1HUaJcA/CXTVvQaFHBJhpPFnP8UbZwGkGn84N7+8aWkEe13F0 jnBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=HQj6yK6opHkmbTdio1X7gtwGMDnUsoLECHMEnzdfMpg=; b=DGgAswMloFpw1RPK8Z5MJkSlNbPutrND1Xnn4xTCrNu36UmbnVPAri1RcW5s1SLc02 E/YwXGx5d9v9fy//IWiT+W/nTTDc3YvgmhrcYqwaYzh5K+gujZsCJ+y+ooUjPZzvUTXD VXeYOVfRl6vitMnchTqZu3ra3MLGJG0482zXP+z1mhzukPi3Kksyvn1ouuzIQ5s1RMNV v+OmwvabToE/fKYXfDX37vY06lPoXrEFNfIdxfx90W2h67oOFiR/6hU3J1P6kwip3kax dPqdM2rToAQBlVSUc1e4o1LDVabegbM49Ylk0jP0jWUUMzGfq91oG7OhrcJ9ZAngpK9O MEYw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id x6-20020a056512046600b00449ad17c638si137040lfd.1.2022.03.16.21.50.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 Mar 2022 21:50:25 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@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 ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 22H4oLHh025716 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 17 Mar 2022 05:50:25 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v8 10/16] dpkg-base: Switch devshell to use schroot Date: Thu, 17 Mar 2022 05:50:15 +0100 Message-Id: <20220317045021.4018-11-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220317045021.4018-1-ubely@ilbers.de> References: <20220317045021.4018-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: 0b9Vmy+MQZMF 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 c60052d3..df42e417 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 63820793..f7c93bbe 100644 --- a/meta/classes/sbuild.bbclass +++ b/meta/classes/sbuild.bbclass @@ -77,6 +77,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 74811e22..4688da1d 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.20.1