From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:aa7:8d47:0:b0:4f6:a7f9:1ead with SMTP id s7-20020aa78d47000000b004f6a7f91eadmr24122521pfe.42.1653316593293; Mon, 23 May 2022 07:36:33 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:902:f30b:b0:162:1a2d:5b3c with SMTP id c11-20020a170902f30b00b001621a2d5b3cls2927006ple.7.gmail; Mon, 23 May 2022 07:36:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz89dZ3UnggsCP9x33BiZhDq+HBYk7GWRjdGoRBolcS5mucDziq1o/G2ounzuUo1OegqPPn X-Received: by 2002:a17:902:74c4:b0:162:1e9b:2bef with SMTP id f4-20020a17090274c400b001621e9b2befmr6769596plt.10.1653316592432; Mon, 23 May 2022 07:36:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653316592; cv=none; d=google.com; s=arc-20160816; b=usRl83wpV71CV11tuXLQ1wBw9xOFj93OsCBdOJ5PebfMMFZmsaOy/DHFfAubtvEJQV FTQptP6b6SCyibpHmPD6LGbaBr5wGW2cMrbH7POc3oQJrQ8Im1Rukco3C9FmwvL3+mJJ UZK1SqluRdAt4xDLfR3UPdDfMQ4ElJKXHEEfu+yehlMLZs9kpJ48J82NkKhXTgq2cmPC nr4qWx0JNdyFnz7dU8OgS35fEMgwXHut64UOcVw2pd6fT5KuRPb1TmmX6NSm7AOMdYuZ VDDWM1I4RtCZOsd8Ao/r3VHvLkyiHr8CEB19gQiZ9rlo+5OWbI8FDbzEPsWjFQr7NkFZ YykA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=c4UOOCANruyRTR3KLYNmlerh0n5b9NvUcZuUNj3Scnw=; b=P0oViEY3xA5GHnDp1eIp/Tb97FmiN4n95Tg9tLvy/CE+Q1q14FOdCjT/KdvIm9rL/V 0gC8cZclToK8rvsLBo4q+CDIq2AkuEC7F0RiSZwSuLgfS7nLF7lUQgzRaI3WpJGUh9pS Qx9I2a3D0o9W8V0MwJx0nuWO2hBslXmePEUcjPW0g8KQsIoJSI9wZoMH8pKSUn+ZGJPV cV2AGNOONY8qnnjHf5J5uzFHaOVmXZCU8W1gFWcSk+YUGGQo2FgHnlMtfZn5zPOIsFX3 +24ON3AbxnC5pLcpL7B4K7ne3wmyISSb8YfvH9aYbTggOvcprRESQ9kt13djCdZyGqep QWCw== 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 ot1-20020a17090b3b4100b001dcf4a10a68si670162pjb.1.2022.05.23.07.36.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 May 2022 07:36:32 -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-40-50-214-37.mgts.dynamic.pppoe.byfly.by [37.214.50.40] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 24NEaO3Q024879 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 23 May 2022 16:36:30 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Uladzimir Bely , Anton Mikanovich Subject: [PATCH v11 04/21] sbuild: Introduce a class for another build method Date: Mon, 23 May 2022 17:36:00 +0300 Message-Id: <20220523143617.24759-5-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220523143617.24759-1-amikan@ilbers.de> References: <20220523143617.24759-1-amikan@ilbers.de> 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: 1BTTrxNqDHCk From: Uladzimir Bely 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 Signed-off-by: Anton Mikanovich --- meta/classes/sbuild.bbclass | 108 ++++++++++++++++++++++++++++++++++++ meta/conf/bitbake.conf | 2 + 2 files changed, 110 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 0000000..b9fc6a0 --- /dev/null +++ b/meta/classes/sbuild.bbclass @@ -0,0 +1,108 @@ +# 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_CONF_DIR ?= "${SCHROOT_CONF}/${SBUILD_CHROOT}" +SCHROOT_CONF_FILE ?= "${SCHROOT_CONF}/chroot.d/${SBUILD_CHROOT}" + +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 + + # 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_CONF_FILE}" +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}" +} + +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 +} diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index a05bd90..cbd9036 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.17.1