[v2,2/5] sbuild: Support overwriting configured schroot dir

Message ID 20221220170921.1718503-3-stefan-koch@siemens.com
State Superseded, archived
Headers show
Series linux-custom: Split up binaries from kernel headers to kbuild packages | expand

Commit Message

Koch, Stefan Dec. 20, 2022, 5:09 p.m. UTC
This brings support to specify an other than the default schroot dir
as argument when creating the schroot configs.

Signed-off-by: Stefan Koch <stefan-koch@siemens.com>
---
 meta/classes/sbuild.bbclass | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/classes/sbuild.bbclass b/meta/classes/sbuild.bbclass
index a29b745..ad9f72f 100644
--- a/meta/classes/sbuild.bbclass
+++ b/meta/classes/sbuild.bbclass
@@ -31,14 +31,19 @@  SCHROOT_CONF_FILE ?= "${SCHROOT_CONF}/chroot.d/${SBUILD_CHROOT}"
 SBUILD_CONFIG="${WORKDIR}/sbuild.conf"
 
 schroot_create_configs() {
+    schroot_dir="${SCHROOT_DIR}"
+    if [ -n "${1}" ]; then
+        schroot_dir="${1}"
+    fi
+
     mkdir -p "${TMPDIR}/schroot-overlay"
-    sudo -s <<'EOSUDO'
+    schroot_dir="${schroot_dir}" sudo --preserve-env=schroot_dir -s <<'EOSUDO'
         set -e
 
         cat << EOF > "${SCHROOT_CONF_FILE}"
 [${SBUILD_CHROOT}]
 type=directory
-directory=${SCHROOT_DIR}
+directory=${schroot_dir}
 profile=${SBUILD_CHROOT}
 users=${SCHROOT_USER}
 groups=root,sbuild