From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7032253102499561472 X-Received: by 2002:a05:600c:2308:: with SMTP id 8mr6037160wmo.179.1637324019279; Fri, 19 Nov 2021 04:13:39 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f1c2:: with SMTP id z2ls2905622wro.2.gmail; Fri, 19 Nov 2021 04:13:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJzsXU7aGi3WCsLJPWkuDc71XRpZyDwCmlzo4giKhc9TpQ488nCClvwh3BdKn/q8ql6yIIIa X-Received: by 2002:adf:e54a:: with SMTP id z10mr6992242wrm.328.1637324018331; Fri, 19 Nov 2021 04:13:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637324018; cv=none; d=google.com; s=arc-20160816; b=IWuCl/yLRKb7kKSEu/R59/BNUQHwDb1sqnVSepLnIcEjIw/rbYR2S1zDqWw0/Yqsar 8+K2oDfMIJoYEqYqhRyxxLKXKFUOUEF/Pg/bn0sX756Rzj0QfeFPHXDUbfhmPg8AT+oe cAokA+FPVnhx5IMNJhvYMCNmK2vsYejhvqoYBk9GHlN2POY4IdivbtGmr0iGqpaDXHiH w1f7ML+Iv6mJ9cmuM58+rOz+NTaumdCD0lDqvj7R14/jHrbowdzk1QIsPJivCRyladEw /ZbK0Xnm73RfkXZ5DeaS9ct0IGdvy1cKq0Hntny1Utw0ljnARAvR0uursUwSFYv0b7y3 LFjQ== 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=m6d/Attzy6DCR2JzAgYRFG2FX907xZiWvEOsR1AHy3U=; b=mot7dOxkzOiZ7+tCMfi9rzEL54EHvRifwFAiM1+IqaCjOctJE3kJ4nVKQmO4hT3vUg aeYK9mxLfLmjM679SMLN8MDqn215jhIHk8EGBHRZYM3c2UVCenVBSsGFYZ8dNNWMGK7M pEWVWsAxTywHS0m7vJXC097/l1p4RE2uX+rlDN8fz7oZHcgQfvxYyXqYybhzRF2h8wvc EkdJKoG054YtktnmBUpxGBwus0J+oTOLbHHtt4u67af6v652nvTD8u9vTNOhRKOdX2aq AZCIsuln3QfZMV5nvk0RDsOsXihpSiL6HPdxj/FVYHpTo9Z/EcBERf94S6qAVoFh7Qv7 N49A== 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 p11si806137wms.3.2021.11.19.04.13.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Nov 2021 04:13:38 -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 1AJCDX7L021829 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Nov 2021 13:13:37 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 11/24] dpkg-gbp: Migrate to schroot Date: Fri, 19 Nov 2021 13:13:20 +0100 Message-Id: <20211119121333.13805-12-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: f8zshz6yKwRU From: Anton Mikanovich Use schroot instead of chroot for git-buildpackage. Also added /home/.git-downloads mount while it's used as git alternates location. Signed-off-by: Anton Mikanovich Signed-off-by: Uladzimir Bely --- meta/classes/dpkg-gbp.bbclass | 21 ++++------------ meta/classes/sbuild.bbclass | 45 +++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 16 deletions(-) diff --git a/meta/classes/dpkg-gbp.bbclass b/meta/classes/dpkg-gbp.bbclass index ddf23ca5..7ebbf2e0 100644 --- a/meta/classes/dpkg-gbp.bbclass +++ b/meta/classes/dpkg-gbp.bbclass @@ -13,25 +13,14 @@ GBP_DEPENDS ?= "git-buildpackage pristine-tar" GBP_EXTRA_OPTIONS ?= "--git-pristine-tar" do_install_builddeps_append() { - dpkg_do_mounts - distro="${DISTRO}" - if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then - distro="${HOST_DISTRO}" - fi - deb_dl_dir_import "${BUILDCHROOT_DIR}" "${distro}" - sudo -E chroot ${BUILDCHROOT_DIR} \ - apt-get install -y -o Debug::pkgProblemResolver=yes \ - --no-install-recommends --download-only ${GBP_DEPENDS} - deb_dl_dir_export "${BUILDCHROOT_DIR}" "${distro}" - sudo -E chroot ${BUILDCHROOT_DIR} \ - apt-get install -y -o Debug::pkgProblemResolver=yes \ - --no-install-recommends ${GBP_DEPENDS} - dpkg_undo_mounts + schroot_install "${GBP_DEPENDS}" } +SCHROOT_MOUNTS = "${WORKDIR}:${PP} ${GITDIR}:/home/.git-downloads" + dpkg_runbuild_prepend() { - sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \ - sh -c "cd ${PP}/${PPS} && gbp buildpackage --git-builder=/bin/true ${GBP_EXTRA_OPTIONS}" + schroot_run -d ${PP}/${PPS} -c ${SBUILD_CHROOT} -- \ + gbp buildpackage --git-builder=/bin/true ${GBP_EXTRA_OPTIONS} # NOTE: `buildpackage --git-builder=/bin/true --git-pristine-tar` is used # for compatibility with gbp version froms debian-stretch. In newer distros # it's possible to use a subcommand `export-orig --pristine-tar` diff --git a/meta/classes/sbuild.bbclass b/meta/classes/sbuild.bbclass index 5f9f7691..b7a349e6 100644 --- a/meta/classes/sbuild.bbclass +++ b/meta/classes/sbuild.bbclass @@ -3,6 +3,8 @@ SCHROOT_CONF ?= "/etc/schroot" +SCHROOT_MOUNTS ?= "" + python __anonymous() { import pwd d.setVar('SCHROOT_USER', pwd.getpwuid(os.geteuid()).pw_name) @@ -98,3 +100,46 @@ sbuild_export() { fi export SBUILD_CONFIG="${SBUILD_CONFIG}" } + +schroot_install() { + APTS="$1" + #TODO deb_dl_dir_import "${BUILDCHROOT_DIR}" "${distro}" + schroot -d / -c ${SBUILD_CHROOT_RW} -u root -- \ + apt install -y -o Debug::pkgProblemResolver=yes \ + --no-install-recommends --download-only ${APTS} + #TODO deb_dl_dir_export "${BUILDCHROOT_DIR}" "${distro}" + schroot -d / -c ${SBUILD_CHROOT_RW} -u root -- \ + apt install -y -o Debug::pkgProblemResolver=yes \ + --no-install-recommends ${APTS} +} + +insert_mounts() { + sudo -s <<'EOSUDO' + ( flock 9 + set -e + for mp in ${SCHROOT_MOUNTS}; do + FSTAB_LINE="${mp%%:*} ${mp#*:} none rw,bind 0 0" + grep -qxF "${FSTAB_LINE}" ${SBUILD_CONF_DIR}/fstab || \ + echo "${FSTAB_LINE}" >> ${SBUILD_CONF_DIR}/fstab + done + ) 9>'${SCHROOT_LOCKFILE}' +EOSUDO +} + +remove_mounts() { + sudo -s <<'EOSUDO' + ( flock 9 + set -e + for mp in ${SCHROOT_MOUNTS}; do + FSTAB_LINE="${mp%%:*} ${mp#*:} none rw,bind 0 0" + sed -i "\|${FSTAB_LINE}|d" ${SBUILD_CONF_DIR}/fstab + done + ) 9>'${SCHROOT_LOCKFILE}' +EOSUDO +} + +schroot_run() { + insert_mounts + schroot $@ + remove_mounts +} -- 2.20.1