From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057122428766388224 X-Received: by 2002:a2e:9bd4:: with SMTP id w20mr17127688ljj.324.1643734861357; Tue, 01 Feb 2022 09:01:01 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:22d1:: with SMTP id g17ls926765lfu.2.gmail; Tue, 01 Feb 2022 09:01:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJwoqJV6byS6koMtHIfyWAKOlncoSk+dEe4iMp2ZQiewBgHVn2/9JzUMEVlrp0T2a4HNOfth X-Received: by 2002:ac2:50d8:: with SMTP id h24mr20457398lfm.33.1643734860316; Tue, 01 Feb 2022 09:01:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643734860; cv=none; d=google.com; s=arc-20160816; b=Q7kDKFPK3JLhqpK54+x3C/6NMmI3T8E5kvJ3FVAMybhZRA13aBaq3fYkDmljzdd+kx cJskH7JJFQPJ4AE9CycabXhVeL0wetz9W8lTJPn5zhpMScV9JiNLCcCzucuxfHiM3z8M n9NChFH0p71EXz22zRWuV6GA1bbTDXG+NYM0VN54B2Mv0AwV8Tr5r2NjxFzDt402kqik uMv4b3G1+7HWXSUTeZwPwsz8ZIWohDA5fR91OtDvwP0hd2guWPjNSWLSfBsAu+mU8CMK IIeibpb/v0MzmABHIPKlXU//0Syk75Ja+AyKc6ckEH7WA95I6AfL4nSFOU9UwTl9dy5O cCww== 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=efOOjXptC4awoNBwxj1+cwmhUKjeGoeRjOOVnGfXtYQ=; b=XRQbREblxNhyAzOeCfoa21NrYSGyCOJa6J2GeUrRWYraa5I4Bnfk7snibdva8fmc3D SkcQ7qm4dldjXQjSt0eqJbY18cl9p57ceQ4+01adaBQYSqf3RHEhhuSYlecbCH/8eYZR WBewgNSA8qoSsabI1AbYH/w0cDt2L+XRix0INIDBXFA5QzdlUGakF0gNPDOWzWM4ON0V tdG7DNqU9jS2ahfGqb6zhQ9lTahdIxFBsEu/5cutxaqMQUVdpRbAALvdA5BuO4IQdMDS D5NUSNJz4lHIQ9ZXtPo2QbjRL/YJ8to/4QSNeiBv+kPm1NmRhZbEH73Ch1gTg1AQ4wBu HgKw== 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 z7si610124ljn.8.2022.02.01.09.01.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 01 Feb 2022 09:01:00 -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 211H0cA8019722 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 1 Feb 2022 18:00:59 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v5 04/12] sbuild: Introduce a class for another build method Date: Tue, 1 Feb 2022 18:00:30 +0100 Message-Id: <20220201170038.5723-5-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220201170038.5723-1-ubely@ilbers.de> References: <20220201170038.5723-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: FatoYNJJJT6m This also adds mounts for base-apt inside schroot and adds import/export deb files to/from schroot. So that it becomes possible to run second `cached` build from local base-apt repo. Signed-off-by: Uladzimir Bely --- meta/classes/sbuild.bbclass | 160 ++++++++++++++++++++++++++++++++++++ meta/conf/bitbake.conf | 2 + 2 files changed, 162 insertions(+) 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..e4341a6f --- /dev/null +++ b/meta/classes/sbuild.bbclass @@ -0,0 +1,160 @@ +# This software is a part of ISAR. +# Copyright (C) 2021 ilbers GmbH + +SCHROOT_CONF ?= "/etc/schroot" + +SCHROOT_MOUNTS ?= "" + +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) + d.setVar('SCHROOT_DIR', d.getVar('SCHROOT_TARGET_DIR')) + dep = "sbuild-chroot-target:do_build" + else: + d.setVar('SBUILD_HOST_ARCH', d.getVar('HOST_ARCH')) + d.setVar('SCHROOT_DIR', d.getVar('SCHROOT_HOST_DIR')) + dep = "sbuild-chroot-host:do_build" + d.setVar('SCHROOT_DEP', dep) +} + +SBUILD_CHROOT ?= "${DEBDISTRONAME}-${SCHROOT_USER}-${@os.getpid()}" +SBUILD_CHROOT_RW ?= "${SBUILD_CHROOT}-rw" + +SBUILD_CONF_DIR ?= "${SCHROOT_CONF}/${SBUILD_CHROOT}" +SCHROOT_CONF_FILE ?= "${SCHROOT_CONF}/chroot.d/${SBUILD_CHROOT}" +SCHROOT_CONF_FILE_RW ?= "${SCHROOT_CONF}/chroot.d/${SBUILD_CHROOT}-rw" + +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 +EOF + + cat << EOF > "${SCHROOT_CONF_FILE_RW}" +[${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_baseapt="${REPO_BASE_DIR} /base-apt none rw,bind 0 0" + grep -qxF "${fstab_baseapt}" ${sbuild_fstab} || echo "${fstab_baseapt}" >> ${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}" + rm -f "${SCHROOT_CONF_FILE_RW}" +EOSUDO +} + +sbuild_export() { + SBUILD_CONFIG="${WORKDIR}/sbuild.conf" + VAR=${1}; shift + VAR_LINE="'${VAR}' => '${@}'," + if [ -s "${SBUILD_CONFIG}" ]; then + sed -i -e "\$i\\" -e "${VAR_LINE}" ${SBUILD_CONFIG} + else + echo "\$build_environment = {" > ${SBUILD_CONFIG} + echo "${VAR_LINE}" >> ${SBUILD_CONFIG} + echo "};" >> ${SBUILD_CONFIG} + fi + export SBUILD_CONFIG="${SBUILD_CONFIG}" +} + +schroot_install() { + schroot_create_configs + APTS="$1" + + distro="${DISTRO}" + if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then + distro="${HOST_DISTRO}" + fi + + deb_dl_dir_import ${SCHROOT_DIR} ${distro} + schroot -d / -c ${SBUILD_CHROOT_RW} -u root -- \ + apt install -y -o Debug::pkgProblemResolver=yes \ + --no-install-recommends --download-only ${APTS} + deb_dl_dir_export ${SCHROOT_DIR} ${distro} + + schroot -d / -c ${SBUILD_CHROOT_RW} -u root -- \ + apt install -y -o Debug::pkgProblemResolver=yes \ + --no-install-recommends ${APTS} + schroot_delete_configs +} + +insert_mounts() { + sudo -s <<'EOSUDO' + 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 +EOSUDO +} + +remove_mounts() { + sudo -s <<'EOSUDO' + 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 +EOSUDO +} + +schroot_run() { + schroot_create_configs + insert_mounts + schroot $@ + remove_mounts + schroot_delete_configs +} diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index cd1c4a64..c1458f05 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -58,6 +58,8 @@ SSTATE_DIR ?= "${TOPDIR}/sstate-cache" SSTATE_MANIFESTS = "${TMPDIR}/sstate-control/${DISTRO}-${DISTRO_ARCH}" BUILDCHROOT_HOST_DIR = "${DEPLOY_DIR_BUILDCHROOT}-host/${HOST_DISTRO}-${HOST_ARCH}_${DISTRO}-${DISTRO_ARCH}" BUILDCHROOT_TARGET_DIR = "${DEPLOY_DIR_BUILDCHROOT}-target/${DISTRO}-${DISTRO_ARCH}" +SCHROOT_HOST_DIR = "${DEPLOY_DIR}/schroot-host/${HOST_DISTRO}-${HOST_ARCH}_${DISTRO}-${DISTRO_ARCH}" +SCHROOT_TARGET_DIR = "${DEPLOY_DIR}/schroot-target/${DISTRO}-${DISTRO_ARCH}" SDKCHROOT_DIR = "${DEPLOY_DIR_SDKCHROOT}/${DISTRO}-${DISTRO_ARCH}" CACHE = "${TMPDIR}/cache" KERNEL_FILE ?= "vmlinuz" -- 2.20.1