From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057122428766388224 X-Received: by 2002:a05:6402:1594:: with SMTP id c20mr7060436edv.154.1644475585600; Wed, 09 Feb 2022 22:46:25 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:43cf:: with SMTP id p15ls820024edc.2.gmail; Wed, 09 Feb 2022 22:46:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJx1WaBLgH24JOh0pKA52ADRJhXH2ZAPefbXw0d/tu0bH2OlJqUvy/H/V0r6tlUnGKDDhmJB X-Received: by 2002:a05:6402:f17:: with SMTP id i23mr6798237eda.196.1644475584706; Wed, 09 Feb 2022 22:46:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644475584; cv=none; d=google.com; s=arc-20160816; b=SDD/BYa4AkXX+Z015PO5OXOKW0bqz89PQwxxK9Lzo58F6jATp5dACwBqB+Hg57XDu7 BWkzq6cEtjgGJZQTLGfnPbquGGMKqwUpzffJ001L2QTD8Vw5EOSrxnmd/+3s1mQx4mt4 iWGfwEO0n90IfPnn9F2qquX7pdO0giT03K5gIwySbdy/RLr/Vf7m8gUtgvW2cnnrlLRF uMh6/HwbuC9rgYAIRaEyMZx+mQAr9WTsyCKFxVq8aBjp5kJVtH2IGNLBKHQ/x98Iufo7 9X5Q9rjiUgVeud698OEnruc639FPRGTeTHo1Y1YFwstCqJ30X2h+f8wQQgAD3ahwImv/ Iomg== 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=UN73av+ejfye0qf7Wyw98MdwYN+Wexs5d2UAJMCWfjY=; b=HjqrMIxFF19KDgWiYResie6f15xeYAGIpAeFgP1Y7zc8vg9onIitb3miz9jNeEXRBd IBIahzRea8t8uRpGEIVutYrlnAgTcBJAg7QqOJ3SJJ4vXqrTFU6CcGS/qEZPF86RZpUt gITtY8PRrXxp4BXQtXt5HUU+EdVLuCchtN7f2MxDIOpx77JBQ2YKWIX5khvyd3VAeQMH nIoTFdtVRYTZiSQavb2iP35IpWzVVj3lSvTE5xXKFi+shQH0vwC6IQNm+iQYXLmAkO2p tPdDvgjeOGl6HkPf9KJfR72rMyWfFQhKojb1MWPaZdbmgOoLdHPtUYAj0xR3+5uo+sxj SX5w== 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 r25si587227ejz.2.2022.02.09.22.46.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 22:46:24 -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 21A6kKrC028169 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 10 Feb 2022 07:46:24 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v6 10/12] dpkg-base: Switch devshell to use schroot Date: Thu, 10 Feb 2022 07:46:18 +0100 Message-Id: <20220210064620.4392-11-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220210064620.4392-1-ubely@ilbers.de> References: <20220210064620.4392-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: eSvfDeHK6WyQ 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 31d41754..238a0bbd 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -296,19 +296,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 9896b772..eb358c71 100644 --- a/meta/classes/sbuild.bbclass +++ b/meta/classes/sbuild.bbclass @@ -78,6 +78,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