From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7032253102499561472 X-Received: by 2002:a7b:c770:: with SMTP id x16mr3079743wmk.66.1637324027988; Fri, 19 Nov 2021 04:13:47 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:23c8:: with SMTP id j191ls1608462wmj.1.gmail; Fri, 19 Nov 2021 04:13:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJwXKLd/wIBR/5r1u6z504xDArElpnS+919KHDnh0oQm29NRNUnzY2f7XBU732ukmwBzk5IG X-Received: by 2002:a05:600c:3489:: with SMTP id a9mr6376883wmq.53.1637324020821; Fri, 19 Nov 2021 04:13:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637324020; cv=none; d=google.com; s=arc-20160816; b=0uGDG97h8dmF3tYU9jj1BOsfkjjLfjkfGWCOc6bhnR+wXnEvMzqIKah21wyO9TPv2B LbCcbz1FVzhwJaFHZIVanaE1VXf3GrRmuGBFB8k3MSJNqZGbUIAkbWh2tafigrmuM5N0 Dcxu1N1ZfoDaq8VLku1dw98rjPqVqgchO8n1fsviRAAREsMT9r3YCtHpOvj9vzugiSmX IZ1L68qCBhqvbApCFreieABrABCGJUgM9Ndx+Ft0mC6MQIKWkHvRBNaKXdtzinmuWdCZ qIrNX+Pcd5Kk/Gv6XBZbHL2Vv6pv6hDzpiRi3iPSFmmiTVZynhUACD3npv64DdXPJaD3 Tjlg== 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=DhO31mEfM8sTX647KdQAyZD+2a2qONffDGSr15OJcog=; b=jHdZvQ767Pg2Lg10OI5OoAR1LBDhRyYK2RLLh7xfcXhnYBfdgsCDJVaeICqo4i91d2 AbQV4ntnCLO6u/7kWqK7nOEewBb5MAmHNFbgMA5QqaNpRUcoMTWnq5KQ36Pao74a75xE pi2r6R7GAKuNfBEsS6HouQ8ydAp1DSzidXgE25BKAlBZldw4Iq3je6v2BOraVCtdURpc BqqotqJpMVi/424Su/2RLKdBoYEuIPw6OPJqIgFSh6CrzZ9L9AP88Yg0E5OHke5tw7nA ZfQp9uA1WA8nRXaDYi6MLs18JDFVnYn0mbUycmHGcMcbJATNkyeO4vhY1v85AhbzIB0e o+4Q== 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 o19si285886wme.2.2021.11.19.04.13.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Nov 2021 04:13:40 -0800 (PST) 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 1AJCDX7T021829 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Nov 2021 13:13:40 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 19/24] dpkg-base: Switch devshell to use schroot Date: Fri, 19 Nov 2021 13:13:28 +0100 Message-Id: <20211119121333.13805-20-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211119121333.13805-1-ubely@ilbers.de> References: <20211119121333.13805-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: 2B97c1YdQXLe 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 | 10 +++++----- meta/classes/sbuild.bbclass | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index acf967ac..861b2cb7 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -256,16 +256,16 @@ python do_devshell() { oe_lib_path = os.path.join(d.getVar('LAYERDIR_core'), 'lib') sys.path.insert(0, oe_lib_path) - bb.build.exec_func('dpkg_do_mounts', d) + bb.build.exec_func('schroot_create_configs', d) isar_export_proxies(d) - buildchroot = d.getVar('BUILDCHROOT_DIR') + schroot = d.getVar('SBUILD_CHROOT') pp_pps = os.path.join(d.getVar('PP'), d.getVar('PPS')) - termcmd = "sudo -E chroot {0} sh -c 'cd {1}; $SHELL -i'" - oe_terminal(termcmd.format(buildchroot, pp_pps), "Isar devshell", d) + termcmd = "schroot -d / -c {0} -u root -- sh -c 'cd {1}; $SHELL -i'" + oe_terminal(termcmd.format(schroot, pp_pps), "Isar devshell", d) - bb.build.exec_func('dpkg_undo_mounts', 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 dcdd638b..799f210e 100644 --- a/meta/classes/sbuild.bbclass +++ b/meta/classes/sbuild.bbclass @@ -75,6 +75,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} -- 2.20.1