From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:a7b:c14c:0:b0:381:32fb:a128 with SMTP id z12-20020a7bc14c000000b0038132fba128mr6283975wmi.116.1647415580149; Wed, 16 Mar 2022 00:26:20 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:1d94:b0:1f1:dc97:d9c4 with SMTP id bk20-20020a0560001d9400b001f1dc97d9c4ls932404wrb.3.gmail; Wed, 16 Mar 2022 00:26:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyPEbQlxT0MGkZIG7iuooO+PbpfUWdv8Z1Ctvoyi4TKXgNu1EhE9TAnzxU1yZRI3QF7vapm X-Received: by 2002:adf:e5d2:0:b0:1fb:768d:7d5 with SMTP id a18-20020adfe5d2000000b001fb768d07d5mr23518816wrn.256.1647415579358; Wed, 16 Mar 2022 00:26:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647415579; cv=none; d=google.com; s=arc-20160816; b=yRyeSAt2A4LZNWKWpLG0aOnTKcUYNLSv6oYlHnwMyAZj6mHw+AUck688GAqv3hMtNl raSZuCSVew5iA5qy7/6TzXkm25J49oY6QsukcMxQVNKAvGLLR3wmccIDxs1NmLQV87on IZQ7HuTMrJh5SCDJ8dMsb27O7HU5G5DL8zP+mL2bUZIXqRioXEH6fqQW+3sg6uE04xuH kB/6VKSbNxxwpK+ua3M7dA0vrhw7zbT+YQc8Ur9zu44CG87UF2NL4066xDH1tPGPx77R Xiw/S3l9d9Sih4kafbBO308punAvSHIUhWXdxFzVE9K9MWGnFeGhsfAo/A/WD8C710fM 1kCQ== 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=nryDtWCrH/RCErl9t1Wmzn7RfMj5XrrAs2wjF9KuZcmxS9YMjCZgmPCEDmi6QNJOd4 Bxh8LvB3Bb0C1aiM1f+NbUhzrH/J9bHskwP1NgEO0mR5zHowNrser1TU4MuZMknePKkx QVxKg/DYFIAQskxJkMnwZJFKtra7GIjP+k/O/p024Rk1WOVOgzQrarryK9mkElDFmTCN UT84h4kDcCiwX4CsO/epDeVFI0xKVPwRzQOv8dspYjYbSDo7ERT1C8MiHGc1AMlzB1dF 7hvppN6JnxrwAwU4a1FlpSp/9vGCoTqTPO0oZVirHMe4Wk00EQpuAjn1OJMRrwkmxdiU ku+A== 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 v193-20020a1cacca000000b003816971af44si337712wme.1.2022.03.16.00.26.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 Mar 2022 00:26:19 -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 22G7Q7do021517 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 16 Mar 2022 08:26:18 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v8 10/15] dpkg-base: Switch devshell to use schroot Date: Wed, 16 Mar 2022 08:26:02 +0100 Message-Id: <20220316072607.20518-11-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220316072607.20518-1-ubely@ilbers.de> References: <20220316072607.20518-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: 2NPMTuS+q8Vg 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