From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:a05:651c:248:b0:24f:d8b:113a with SMTP id x8-20020a05651c024800b0024f0d8b113amr16512806ljn.447.1651761595320; Thu, 05 May 2022 07:39:55 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:1693:b0:448:3742:2320 with SMTP id bu19-20020a056512169300b0044837422320ls1213401lfb.1.gmail; Thu, 05 May 2022 07:39:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxq0AdIsLbWGoL3jyrZYQXG57K2OjRr8Xfp/n7eeQaNsXcyBla1+2POS7Lzme7myKXxyA3f X-Received: by 2002:ac2:5cdb:0:b0:471:fd36:fa56 with SMTP id f27-20020ac25cdb000000b00471fd36fa56mr18270082lfq.501.1651761594232; Thu, 05 May 2022 07:39:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651761594; cv=none; d=google.com; s=arc-20160816; b=hPUJdanmjc22fVoouT2+z3aRRkYkG0o+/kxhfPnSMoISHislqv8f6jsaiMkXjaYbAv nqF0EfQP7ROTfdBTxo5tMJCQ7uBTwwys4yfHWhxiqdx4gsFjpbMN4R8LHEzIpZAviJCI TCBQNJLGgspo95+nrkD0izgbplDI9W//hw17aG09RFBBsXBKxLqnWmIysMGgHxzXoVtf jF+9QDjHsW8cJ1sFv5IDEQIFAxujxz5F+0q6+NBIuDMXRhpcYC/aAa/Zgt72qF4e6Bmj duhsZPWYblpo6EhvrBVl/4/XtRuGl24zDqfBC/wRs7p7K3neWlz0OZ5/Oi54LZ8DK+tV J6VA== 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=w/XZJ6UnII8dPdf39UAVkaC6ZgiB0vkMxYk1qwzh368=; b=WqAuU2TER24ZGHVIe9g0TSyF7Im7VsppLllNOgIe1IT+3ZQA+MTijf1uCDi/aLdd9p F/EcEXIlxExBpPsN2UDQY+p57IEYtEEah/NBtO7LV2/hncI7+gJzyroEr08Jl4CLh/xw /RYO0KyBX+hQDxXbQxayD1uddjsqZNMf7azY/NJoMZ6ckfNFy7FWo2PCNHbv8u3cMfjP kNQCtdmOmYLq3fyysib50MuwdWw6SJuoAtU1hZUYWJfFymKf5cDYfLoe7vG0YRyjVde3 yZcNvyzK4RH3P/YaAiVK/T9ppwvyxT9RM004cet7C6UFV7bzFEbAPnuZU5eBt9FR/6T1 WWBg== 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 h13-20020a2e900d000000b0024da01a8c6dsi81121ljg.1.2022.05.05.07.39.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 May 2022 07:39:54 -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 245Edf7c014026 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 5 May 2022 16:39:53 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, Uladzimir Bely Subject: [PATCH v10 10/19] dpkg-base: Switch devshell to use schroot Date: Thu, 5 May 2022 17:39:25 +0300 Message-Id: <20220505143934.16096-11-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: t2+7Ik6hR2r8 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 c60052d..df42e41 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