From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6989231260094693376 X-Received: by 2002:a05:6512:3056:: with SMTP id b22mr12863681lfb.339.1627307224168; Mon, 26 Jul 2021 06:47:04 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a7c4:: with SMTP id x4ls2698699ljp.8.gmail; Mon, 26 Jul 2021 06:47:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxz1FRsZW7VcDzieqcufH1wdMTqiE2OSoYk1QSu3w4zpSFWxnhNMpSwVkALk+Wd4wfw6pyz X-Received: by 2002:a2e:bd11:: with SMTP id n17mr12444104ljq.480.1627307223283; Mon, 26 Jul 2021 06:47:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627307223; cv=none; d=google.com; s=arc-20160816; b=beePYV7ZYm4o82Gde2Ghqut7scnNzXD08NavQ78qZXXzEBNgXzExj5dObF6Z75mDYs mIewVUIC5ip4WmxVIx96ahshDcHIWz2O8MtsU+H8aavuOBYGse2Tl5hKCC3/ZMffQSBT /0st0TP5qElwwYdzM1Mvs0mrul8is3ulVvfOSI4ZiISt0Xue0hhIBI99Ej9B2iD3TC0X 7BtFiPfJ5bZvwN8AYoNcRH4eerXXBm6m2bXhDOS6qfmTIqXAmOZoS8HsHxm6xA7IbKUl sFkz+DBEtQ49Op2mG2MNwE729g+4RInhULrTPFnnmZwibR4ZWaRp4DzN9sSyCICkbJ0W pSDA== 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:cc:to:from; bh=ePT2tM3Zvpig7PdKPOxPZJ3bY6EZK9k0FZkmqvrjqD8=; b=H+RHuZy23UKNcnA7ampM733YHhY6Pr25h9h3sxzh0chkrPcw+7nY+S0tMfkxf0WBzg hSa4aigWN55rJWlKOPlk0NPOGlhsjaxGmlNk/Bo5kUQabwJn8uk7Iti5I3aS9Mq+43g/ nuHh1QKic2VzAADHwDZGz5ogNn3ORz3Yw7UFJ0ANnOiSvQrzJCMRHVniI2D93fxK6kmL zSoBHXDepX6FbthcsTCwqvjhArLp+22mtbmnMfiQLXuhYE9W3/1H9ZQt+gOmKv62rac3 U1OcUqhiOGyFXlTqBP8XpKzQkt2RGdKcDkuzynUFl/+9Kec4wn6WCkYZ+3iTxauOEbxv ydAQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id q4si981439lji.2.2021.07.26.06.47.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jul 2021 06:47:03 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@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 amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (mm-198-62-214-37.mgts.dynamic.pppoe.byfly.by [37.214.62.198] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 16QDknv4019679 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 26 Jul 2021 15:47:02 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [RFC 12/15] dpkg-gbp: Migrate to schroot Date: Mon, 26 Jul 2021 16:46:33 +0300 Message-Id: <20210726134636.30800-13-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210726134636.30800-1-amikan@ilbers.de> References: <20210726134636.30800-1-amikan@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: YsYVbCGOf/0t Use schroot instead of chroot for git-buildpackage. Signed-off-by: Anton Mikanovich --- meta/classes/dpkg-gbp.bbclass | 15 ++++------- meta/classes/sbuild.bbclass | 48 +++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 10 deletions(-) diff --git a/meta/classes/dpkg-gbp.bbclass b/meta/classes/dpkg-gbp.bbclass index 0c60bda..e4e5ea6 100644 --- a/meta/classes/dpkg-gbp.bbclass +++ b/meta/classes/dpkg-gbp.bbclass @@ -13,18 +13,13 @@ GBP_DEPENDS ?= "git-buildpackage pristine-tar" GBP_EXTRA_OPTIONS ?= "--pristine-tar" do_prepare_build() { - 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} + schroot_install "${GBP_DEPENDS}" } do_prepare_build[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" +SCHROOT_MOUNTS = "${WORKDIR}:${PP}" + dpkg_runbuild_prepend() { - sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \ - sh -c "cd ${PP}/${PPS} && gbp export-orig ${GBP_EXTRA_OPTIONS}" + schroot_run -d ${PP}/${PPS} -c ${SBUILD_CHROOT} -- \ + gbp export-orig ${GBP_EXTRA_OPTIONS} } diff --git a/meta/classes/sbuild.bbclass b/meta/classes/sbuild.bbclass index cc7db66..3eede71 100644 --- a/meta/classes/sbuild.bbclass +++ b/meta/classes/sbuild.bbclass @@ -3,6 +3,8 @@ SCHROOT_CONF ?= "/etc/schroot" +SCHROOT_MOUNTS ?= "" + python __anonymous() { mode = d.getVar('ISAR_CROSS_COMPILE', True) distro_arch = d.getVar('DISTRO_ARCH') @@ -28,3 +30,49 @@ 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} +} + +SCHROOT_FSTAB ?= "${SCHROOT_CONF}/${DEBDISTRONAME}-${@os.getlogin()}/fstab" +SCHROOT_LOCKFILE ?= "schroot_fstab.lock" + +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}" ${SCHROOT_FSTAB} || \ + echo "${FSTAB_LINE}" >> ${SCHROOT_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" ${SCHROOT_FSTAB} + done + ) 9>'${SCHROOT_LOCKFILE}' +EOSUDO +} + +schroot_run() { + insert_mounts + schroot $@ + remove_mounts +} -- 2.25.1