From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7032253102499561472 X-Received: by 2002:a2e:974e:: with SMTP id f14mr49573907ljj.153.1638968752269; Wed, 08 Dec 2021 05:05:52 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:8946:: with SMTP id b6ls324892ljk.7.gmail; Wed, 08 Dec 2021 05:05:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJzTy8JVYUdeVSk5WlkNZSwb6SAzKOcIiqbJRG0hUMveZD5E2KFPrTA3sybZryg3tp2vxckz X-Received: by 2002:a2e:7819:: with SMTP id t25mr49516179ljc.374.1638968751072; Wed, 08 Dec 2021 05:05:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638968751; cv=none; d=google.com; s=arc-20160816; b=JUdC4UXwlKk/IaCqRn+djcZD1iUjTIdMIMIRORR0tcMSLI2HARSSba/BTuF7eMLm1S eJ8rfLH17SD7KPHUgiY0cFTAtEorWFm2rcJUPSzRTCYvuyRzjyddnW/YSgzXod6fOfgV omcYiwnJEaqiiwaWE69gaAx4pAf4xrxsTf6nJKSWKYwF4+B2OJUEgQrk9Tx2PT2LO++r MSZHvyPTdlmFTMT4ZfeGbrjc7JhsQeIebjAx0nwvDfmCTm+wA90tqPqr9TMggpcflZbP 7mmwGFyYcTH1zjjkrt5fxN3deg6S1/O+T4a1JW9A2q4MqtOO2o2ZJxie60S15R96xlEo BKqg== 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=L5YRVxtqaLO0RN4z7d2pMfOPR/olIRGihDcA/Ml9XZI=; b=q8rGl0MSbOYCfG01rWonFPeI/JvWtWiaabMoxei5YdeuM3GESWKSPUSgFx+aBNj30+ bZxWsIvMeD+WnqNcxlCer/33mzTKMIES1sTqJFRoEZR8WC4Jxoke2LKIwX+bkoLhSmQA Ot4mJXDfnyQOTREU6iVS13Udk/GStQkrSRkI3jFyaXkMRAQ46z6cW2SFxfZColISGmea W0URRlszSoGgdAWOsk+TJZ27ki3J3q9pmVDhCaxtEoeYvmfQFL6X6LvbFeQJ56tkzAuw /44Kes2c31c0w9eUnERZ2BhIRG76+ppx9OLEVnockbzdjeFlTOWVLNeldu0Y+0Vg+Ql6 fRHw== 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 j13si153077lfu.5.2021.12.08.05.05.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 Dec 2021 05:05:51 -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 1B8D5iLH009193 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 8 Dec 2021 14:05:50 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3 16/20] dpkg-base: Switch devshell to use schroot Date: Wed, 8 Dec 2021 14:05:40 +0100 Message-Id: <20211208130544.15133-17-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211208130544.15133-1-ubely@ilbers.de> References: <20211208130544.15133-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: QgPraQCTUqC7 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 | 22 ++++++++++++++----- meta/classes/sbuild.bbclass | 3 +++ .../sbuild-chroot/sbuild-chroot.inc | 2 ++ 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 18c80411..34f6e7ab 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -288,16 +288,28 @@ 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) - 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')) - termcmd = "sudo -E chroot {0} sh -c 'cd {1}; $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 3471595a..0df8cb90 100644 --- a/meta/classes/sbuild.bbclass +++ b/meta/classes/sbuild.bbclass @@ -76,6 +76,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 177a8a6d..7b41d11d 100644 --- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc +++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc @@ -14,6 +14,8 @@ SBUILD_CHROOT_PREINSTALL_COMMON = " \ fakeroot \ build-essential \ debhelper \ + devscripts \ + equivs \ " SBUILD_CHROOT_PREINSTALL ?= " \ -- 2.20.1