From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7097485294514995200 X-Received: by 2002:a05:6000:144e:b0:20c:ab37:70f3 with SMTP id v14-20020a056000144e00b0020cab3770f3mr6796990wrx.682.1652512070950; Sat, 14 May 2022 00:07:50 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:1688:b0:20c:67b9:e68b with SMTP id y8-20020a056000168800b0020c67b9e68bls10724856wrd.3.gmail; Sat, 14 May 2022 00:07:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw/uyXNNVeAG5SvZ1yF1roaGFosoW1MGobLBHUse5k/2X9Tpp6CkkDnt95bQB/R94C4ArfJ X-Received: by 2002:adf:e8cb:0:b0:20c:5584:ba44 with SMTP id k11-20020adfe8cb000000b0020c5584ba44mr6679281wrn.173.1652512069997; Sat, 14 May 2022 00:07:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652512069; cv=none; d=google.com; s=arc-20160816; b=HH8dmxX4i+fy4R1filg53868y8yJZ88ZDocNxciSVFFOGWtXuTqRILEd0EW48CYMLC Jjai9Fu8d30fIH2Hbqpv3Dt9gJf8CbOX3VwxbB+jLFOtjV9iQNTkkoWDMNLdA4rWZL3w KTmLRl2pdDa29y1/mTCPzax1GeUEpL5GAjiEjbq0aUhJ1dlBlw4EXtjiQiAJerOgZY3T MJK/tIsp19A2QV1dPbZhQdvzr73Xzr9KswMREk5tBHT69MLaBzSMq2S2f4LEHi2LhA3l aW3WP/Hk8IFGWdJDGnIK4DxNE4iHht+tRbeHJGNgc6gmgU6nrup7oUjOQnHiI9OmPB/i xGRg== 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=taGCSYJnyulaXJYAn+fkxndTdWyLvPV7+6hJPb3+Bpc=; b=BcU5lreRw1WlzYHeq2LowYs5V1eSqZifx3QB4zIAwWfo9R9YA2ZB5eaPHOZavlUnEg fq85dnrWC3UhT/OSfQe8uTL6ZVF34A7f/fVRFeeWDmNQIbKefyERgeesdYuVMxM0dbiZ DwV4kANhsX9s8vtc3s7WBayLeSrXUhWAhAyUFgU2rUrq8iJcEghCmneTsPZabxmwpX55 uESqgiP7T6O6OFeMGyLPKLq6E6srGRuwkYtCHnW5Z3ec2WinWcdAkJKisT2KOi3G4A/6 0giO/sElD4q9zDD6Sm7fwPbrNr/+OOZfxZ6VO3Gw+jTx1sJ215ifOYo7NnRDGRGUvXQv ciXg== 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 a5-20020adfeec5000000b0020c7be5f931si179051wrp.8.2022.05.14.00.07.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 14 May 2022 00:07:49 -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-235-31-214-37.mgts.dynamic.pppoe.byfly.by [37.214.31.235] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 24E77k07025368 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 14 May 2022 09:07:48 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, Anton Mikanovich Subject: [PATCH 1/6] sbuild: Allow setting custom config paths Date: Sat, 14 May 2022 10:07:31 +0300 Message-Id: <20220514070736.12997-2-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220514070736.12997-1-amikan@ilbers.de> References: <20220514070736.12997-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: mZeTI4ycv4hk Extend internal schroot APIs to be able to set custom chroot config name. This will allow to configure/unconfigure schroots from any task. Signed-off-by: Anton Mikanovich --- meta/classes/sbuild.bbclass | 50 +++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/meta/classes/sbuild.bbclass b/meta/classes/sbuild.bbclass index f9bfaaf..2523154 100644 --- a/meta/classes/sbuild.bbclass +++ b/meta/classes/sbuild.bbclass @@ -31,10 +31,17 @@ SCHROOT_CONF_FILE ?= "${SCHROOT_CONF}/chroot.d/${SBUILD_CHROOT}" SBUILD_CONFIG="${WORKDIR}/sbuild.conf" schroot_create_configs() { - sudo -s <<'EOSUDO' + conf_dir="${SBUILD_CONF_DIR}" + conf_file="${SCHROOT_CONF_FILE}" + if [ -n "$1" ]; then + conf_dir="${SCHROOT_CONF}/${1}" + conf_file="${SCHROOT_CONF}/chroot.d/${1}" + fi + export conf_dir conf_file + sudo -E -s <<'EOSUDO' set -e - cat << EOF > "${SCHROOT_CONF_FILE}" + cat << EOF > "${conf_file}" [${SBUILD_CHROOT}] type=directory directory=${SCHROOT_DIR} @@ -50,8 +57,8 @@ preserve-environment=true EOF # Prepare mount points - cp -rf "${SCHROOT_CONF}/sbuild" "${SBUILD_CONF_DIR}" - sbuild_fstab="${SBUILD_CONF_DIR}/fstab" + cp -rf "${SCHROOT_CONF}/sbuild" "${conf_dir}" + sbuild_fstab="${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} @@ -67,12 +74,19 @@ EOSUDO } schroot_delete_configs() { - sudo -s <<'EOSUDO' + conf_dir="${SBUILD_CONF_DIR}" + conf_file="${SCHROOT_CONF_FILE}" + if [ -n "$1" ]; then + conf_dir="${SCHROOT_CONF}/${1}" + conf_file="${SCHROOT_CONF}/chroot.d/${1}" + fi + export conf_dir conf_file + sudo -E -s <<'EOSUDO' set -e - if [ -d "${SBUILD_CONF_DIR}" ]; then - rm -rf "${SBUILD_CONF_DIR}" + if [ -d "${conf_dir}" ]; then + rm -rf "${conf_dir}" fi - rm -f "${SCHROOT_CONF_FILE}" + rm -f "${conf_file}" EOSUDO } @@ -106,22 +120,32 @@ sbuild_export() { } insert_mounts() { - sudo -s <<'EOSUDO' + conf_dir="${SBUILD_CONF_DIR}" + if [ -n "$1" ]; then + conf_dir="${SCHROOT_CONF}/${1}" + fi + export conf_dir + sudo -E -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 + grep -qxF "${FSTAB_LINE}" ${conf_dir}/fstab || \ + echo "${FSTAB_LINE}" >> ${conf_dir}/fstab done EOSUDO } remove_mounts() { - sudo -s <<'EOSUDO' + conf_dir="${SBUILD_CONF_DIR}" + if [ -n "$1" ]; then + conf_dir="${SCHROOT_CONF}/${1}" + fi + export conf_dir + sudo -E -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 + sed -i "\|${FSTAB_LINE}|d" ${conf_dir}/fstab done EOSUDO } -- 2.17.1