From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7032253102499561472 X-Received: by 2002:a05:600c:354b:: with SMTP id i11mr6456745wmq.61.1637324016924; Fri, 19 Nov 2021 04:13:36 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:fe0b:: with SMTP id n11ls2907581wrr.0.gmail; Fri, 19 Nov 2021 04:13:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJwSRZzSFpTia4yVSQqy0UVXAD06ZoFl50sgfZVMzI/UjYjUspdhi0Hf64ixEuIkdZT3KCFP X-Received: by 2002:a05:6000:1787:: with SMTP id e7mr6702880wrg.433.1637324015916; Fri, 19 Nov 2021 04:13:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637324015; cv=none; d=google.com; s=arc-20160816; b=WPrtthwHZpmZiuR3qMXh7RCmV6Eggshk2TZ0IE+8reGnKseQ8O1o0EyiVOfyaU2hLI Rl1UUiL5LBdXTk6gACN11/iE98skZ4O2f8kxQ3qgOXjv9oUappeji9bAvSRVXuRPRsgj WZC4A9runCj5XlSX2AsNupcJVNl0A+JaH82fuqvrSw4UIjthXhO6bvIo/IzKHxhRRJdQ c08Ak37fAa7X4g3C6dEBD0JFuTJptfgpEvdFuwWMzwb1tWN35pyCVwg+CZmcvfVyzF7w cpIH1XiKo6abiqLd1/slPg4ZJgil7vR6Q2bxaUJfdtcBaQj9DySm7XEr/J4nfzD46JJO 14rw== 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=vxATYf4JZLbYFYHXnQQHzGJHE+w/1utUf26V4MjDNlY=; b=hrFfv2FA414F+OrojycDIcSIZY4kguhAVSTybPPvgAP6BjprQ+9zzPXGvd/C8MjoFG t140rRSSfKAvyl5+T5YtMyrw67VMzYS5N2KTRiMxbe4s/msLp25jYm/q0PCaUcK+SfRx dhmqGmVdw1FDycOiB88svPaI1pBjuZoRqtzFBP6v17aWlN7gOH/XwjUWJyl9Ao6atpW+ HlWCDBdWpasurekn0rCvRScbLzRX0xa+Cu8/iPd+Lilgb4SK/zc3F5QIkaTB0rhC2j2D 1cE19WwihVS8sEO8Ce8wIU6w2ow6zZyX3L9XzQaBVbC1/2u71aMFFLm9z7a+7MNVicXi Gl0w== 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 q74si868192wme.0.2021.11.19.04.13.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Nov 2021 04:13:35 -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 1AJCDX7D021829 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Nov 2021 13:13:35 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 03/24] isar-bootstrap: Export bootstrap to schroot config Date: Fri, 19 Nov 2021 13:13:12 +0100 Message-Id: <20211119121333.13805-4-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: 8XE3LbwD4rts From: Anton Mikanovich To use isar-bootstrap with sbuild and schroot tools we need to export the path to schroot config. We also need to put isar-apt and downloads into fstab for sbuild profile to have it mounted inside schroot. Signed-off-by: Anton Mikanovich Signed-off-by: Uladzimir Bely --- meta/classes/sbuild.bbclass | 87 +++++++++++++++++++ .../isar-bootstrap/isar-bootstrap.inc | 10 ++- 2 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 meta/classes/sbuild.bbclass diff --git a/meta/classes/sbuild.bbclass b/meta/classes/sbuild.bbclass new file mode 100644 index 00000000..d6e5b926 --- /dev/null +++ b/meta/classes/sbuild.bbclass @@ -0,0 +1,87 @@ +# This software is a part of ISAR. +# Copyright (C) 2021 ilbers GmbH + +SCHROOT_CONF ?= "/etc/schroot" + +python __anonymous() { + import pwd + d.setVar('SCHROOT_USER', pwd.getpwuid(os.geteuid()).pw_name) + d.setVar('SCHROOT_USER_HOME', pwd.getpwuid(os.geteuid()).pw_dir) + + mode = d.getVar('ISAR_CROSS_COMPILE', True) + distro_arch = d.getVar('DISTRO_ARCH') + if mode == "0" or d.getVar('HOST_ARCH') == distro_arch or \ + (d.getVar('HOST_DISTRO') == "debian-stretch" and distro_arch == "i386"): + d.setVar('SBUILD_HOST_ARCH', distro_arch) + else: + d.setVar('SBUILD_HOST_ARCH', d.getVar('HOST_ARCH')) +} + +SBUILD_CHROOT ?= "${DEBDISTRONAME}-${SCHROOT_USER}-${DISTRO}-${SBUILD_HOST_ARCH}" +SBUILD_CHROOT_RW ?= "${SBUILD_CHROOT}-rw" + +SBUILD_CONF_DIR ?= "${SCHROOT_CONF}/${SBUILD_CHROOT}" +SCHROOT_CONF_FILE ?= "${SCHROOT_CONF}/chroot.d/${SBUILD_CHROOT}" + +SCHROOT_DIR ?= "${DEPLOY_DIR_BOOTSTRAP}/${DISTRO}-${SBUILD_HOST_ARCH}" + +schroot_create_configs() { + sudo -s <<'EOSUDO' + set -e + + cat << EOF > "${SCHROOT_CONF_FILE}" +[${SBUILD_CHROOT}] +type=directory +directory=${SCHROOT_DIR} +profile=${SBUILD_CHROOT} +users=${SCHROOT_USER} +groups=root,sbuild +root-users=${SCHROOT_USER} +root-groups=root,sbuild +source-root-users=${SCHROOT_USER} +source-root-groups=root,sbuild +union-type=overlay +preserve-environment=true + +[${SBUILD_CHROOT_RW}] +type=directory +directory=${SCHROOT_DIR} +profile=${SBUILD_CHROOT} +users=${SCHROOT_USER} +groups=root,sbuild +root-users=${SCHROOT_USER} +root-groups=root,sbuild +preserve-environment=true +EOF + + mkdir -p "${SCHROOT_DIR}/etc/apt/preferences.d" + cat << EOF > "${SCHROOT_DIR}/etc/apt/preferences.d/isar-apt" +Package: * +Pin: release n=${DEBDISTRONAME} +Pin-Priority: 1000 +EOF + + # Prepare mount points + cp -rf "${SCHROOT_CONF}/sbuild" "${SBUILD_CONF_DIR}" + sbuild_fstab="${SBUILD_CONF_DIR}/fstab" + + fstab_isarapt="${DEPLOY_DIR}/isar-apt /isar-apt none rw,bind 0 0" + grep -qxF "${fstab_isarapt}" ${sbuild_fstab} || echo "${fstab_isarapt}" >> ${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} + fi +EOSUDO +} + +schroot_delete_configs() { + sudo -s <<'EOSUDO' + set -e + if [ -d "${SBUILD_CONF_DIR}" ]; then + rm -rf "${SBUILD_CONF_DIR}" + fi + rm -f "${SCHROOT_DIR}/etc/apt/preferences.d/isar-apt" + rm -f "${SCHROOT_CONF_FILE}" +EOSUDO +} diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index e9f92916..39e9c007 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -25,13 +25,14 @@ APTSRCS_INIT = "${WORKDIR}/apt-sources-init" DISTRO_BOOTSTRAP_KEYFILES = "" THIRD_PARTY_APT_KEYFILES = "" DEPLOY_ISAR_BOOTSTRAP ?= "" -DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales" +DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales,fakeroot,build-essential,debhelper" DISTRO_BOOTSTRAP_BASE_PACKAGES_append_gnupg = ",gnupg" DISTRO_BOOTSTRAP_BASE_PACKAGES_append_https-support = "${@https_support(d)}" DISTRO_VARS_PREFIX ?= "${@'HOST_' if d.getVar('BOOTSTRAP_FOR_HOST') == '1' else ''}" BOOTSTRAP_DISTRO = "${@d.getVar('HOST_DISTRO' if d.getVar('BOOTSTRAP_FOR_HOST') == '1' else 'DISTRO')}" inherit deb-dl-dir +inherit sbuild python () { distro_bootstrap_keys = (d.getVar("DISTRO_BOOTSTRAP_KEYS") or "").split() @@ -398,6 +399,13 @@ EOSUDO addtask bootstrap before do_build after do_generate_keyrings +do_schroot_config() { + schroot_create_configs +} + +addtask schroot_config before do_bootstrap after do_generate_keyrings +# TODO: remove configs from /etc/schroot + CLEANFUNCS = "clean_deploy" clean_deploy() { rm -f "${DEPLOY_ISAR_BOOTSTRAP}" -- 2.20.1