From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7116443733323677696 X-Received: by 2002:adf:d22f:0:b0:21d:6b26:8c6f with SMTP id k15-20020adfd22f000000b0021d6b268c6fmr3427652wrh.70.1656926177648; Mon, 04 Jul 2022 02:16:17 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:47ce:0:b0:21d:339f:dc1 with SMTP id o14-20020a5d47ce000000b0021d339f0dc1ls19806849wrc.0.gmail; Mon, 04 Jul 2022 02:16:16 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tLF8BF0JTwQosZAa2WbDIhJLsFForuGgR0+A30PuFkt1j+GSE4kLpQoUuo47DLL9kLEDsk X-Received: by 2002:adf:f34c:0:b0:21d:6705:87dd with SMTP id e12-20020adff34c000000b0021d670587ddmr5949811wrp.430.1656926176738; Mon, 04 Jul 2022 02:16:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656926176; cv=none; d=google.com; s=arc-20160816; b=KCQ8XuD2LABSxylPJYyAE/CbOz0ZqjQd+LuseXGIMsm+In2gciuK3N+9rNWIL8r/8G LKaM8vdDy+jpTdHkuvgNcuNMa95maQvmvUXweNQ9SYRzVEy1Gjweba38KVn8bqfpqqQW STK7IR8ulJwa6aqJSCRqnrNEWJMsOz25+jHopehbuotNo7VUs3p1nV7oDDLR+7CWjYL7 r1pJVpheaJEBLWYs5LRNBbijn0/l0ZE6IIzZ7jTX5ZlLVyHiYP7Rayv+RdnKVX+nfT/B 6DWruzgRSzWNWorN0tGWzcuRuHGquR2Pw2NCvySuWBh4ZISSUtAUm/e0BsiK2fTH6Hez p41g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=5avxGsOWtBbeggKozDXlLI4OJuz/e9CEvXfiVdV8dlE=; b=A7TzhTF8NcXnKL48zKd8QxM4KHXz58EsXJRevKLD7kzJGfbwySyVhXayk6jGxC3+5g itt4vO2Buf6XNemu/c/XC/OCnH1e7xUgj7jnKj5uBxZrJcxAwTsmyKjistUUplLvsIjH bB4h8MbNxYkEVdL280pg8qvzljONzFtaaTjJUAnEELQfD5sWW+u/LFPx+N5YS6ZXhPN8 afAfK6enXnXQOaPo2F9gmoNn5B9R/LkJdsoyMX/nDshDBBXX6NQ0LGllmFQYTKvOL4ms EEKL9rFooNg77ptf8qgVYNNmuh+ansTOeIdjV+ONfFzVjV4R6Z+pa3bbvHJqUU2IXXkR BHjQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Nt17un8t; spf=pass (google.com: domain of fm-72506-202207040916160882281366b81098ef-eoyvn3@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-202207040916160882281366b81098ef-eoyvN3@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id y16-20020adfdf10000000b002132c766fd7si1053720wrl.4.2022.07.04.02.16.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Jul 2022 02:16:16 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-202207040916160882281366b81098ef-eoyvn3@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Nt17un8t; spf=pass (google.com: domain of fm-72506-202207040916160882281366b81098ef-eoyvn3@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-202207040916160882281366b81098ef-eoyvN3@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 202207040916160882281366b81098ef for ; Mon, 04 Jul 2022 11:16:16 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=5avxGsOWtBbeggKozDXlLI4OJuz/e9CEvXfiVdV8dlE=; b=Nt17un8tb3KUPMs6ehG8zkdK7UJPv4oWKrD+Rzx4duYDZ9e9pYc3gbAnDA2hz4eDD8sOOa Deyn57FcEUMrEfPRwDKdFvVWq3GnXNd69nPmEqpGEh36N53YbbnJD2raSR82BTK08G129bAH FY4yAwLioCxi85CtsnNRzP0DyK4Is=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: florian.bezdeka@siemens.com, amikan@ilbers.de, henning.schild@siemens.com, Felix Moessbauer Subject: [PATCH v3 1/1] add uuid to schroot folder Date: Mon, 4 Jul 2022 11:15:57 +0200 Message-Id: <20220704091557.1761054-2-felix.moessbauer@siemens.com> In-Reply-To: <20220704091557.1761054-1-felix.moessbauer@siemens.com> References: <20220704091557.1761054-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-TUID: 2E5QnSYHidtN PIDs are not unique across containers. When running the build in a container (e.g. the kas container), the PID of bitbake is likely the same across multiple simultaneously running builds. This is especially the case for CI runners, where it is common that multiple jobs run in parallel. This patch adds an additional UUID component that is injected from the ISAR environment. Signed-off-by: Felix Moessbauer --- meta/classes/sbuild.bbclass | 2 +- meta/conf/bitbake.conf | 7 ++++++- scripts/isar-buildenv-internal | 4 +++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/meta/classes/sbuild.bbclass b/meta/classes/sbuild.bbclass index f9bfaaf6..7c399543 100644 --- a/meta/classes/sbuild.bbclass +++ b/meta/classes/sbuild.bbclass @@ -23,7 +23,7 @@ python __anonymous() { d.setVar('SCHROOT_DEP', dep) } -SBUILD_CHROOT ?= "${DEBDISTRONAME}-${SCHROOT_USER}-${@os.getpid()}" +SBUILD_CHROOT ?= "${DEBDISTRONAME}-${SCHROOT_USER}-${ISAR_BUILD_UUID}-${@os.getpid()}" SBUILD_CONF_DIR ?= "${SCHROOT_CONF}/${SBUILD_CHROOT}" SCHROOT_CONF_FILE ?= "${SCHROOT_CONF}/chroot.d/${SBUILD_CHROOT}" diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 6451cb59..31e11569 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -104,7 +104,7 @@ BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH BBSERVER DL_DI WORKDIR STAMPCLEAN PKGDATA_DIR BUILD_ARCH SSTATE_PKGARCH \ BB_WORKERCONTEXT BB_LIMITEDDEPS DEPLOY_DIR BUILDCHROOT_DIR \ REPO_ISAR_DIR REPO_ISAR_DB_DIR REPO_BASE_DIR REPO_BASE_DB_DIR LAYERDIR_core \ - SCRIPTSDIR TOPDIR" + SCRIPTSDIR TOPDIR ISAR_BUILD_UUID" BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SSH_AGENT_PID \ SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \ BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED \ @@ -134,6 +134,11 @@ USE_CCACHE ??= "0" CCACHE_TOP_DIR ?= "${TMPDIR}/ccache" CCACHE_DIR ?= "${CCACHE_TOP_DIR}/${DISTRO}-${DISTRO_ARCH}" +# Unique ID for this build, used to avoid name clashes on external mountpoints +# When running parallel builds in different PID namespaces, overwrite +# this with a globally unique value (e.g. by injecting a UUID from the environment) +ISAR_BUILD_UUID ??= "none" + include conf/local.conf include conf/multiconfig/${BB_CURRENT_MC}.conf include conf/machine/${MACHINE}.conf diff --git a/scripts/isar-buildenv-internal b/scripts/isar-buildenv-internal index ec8e4377..e5cb5364 100755 --- a/scripts/isar-buildenv-internal +++ b/scripts/isar-buildenv-internal @@ -62,6 +62,8 @@ export BUILDDIR export BITBAKEDIR="${ISARROOT}/bitbake" export SCRIPTSDIR="${ISARROOT}/scripts" export TESTSUITEDIR="${ISARROOT}/testsuite" +# use builtin python uuid to avoid dep to uuidgen +export ISAR_BUILD_UUID="$(python3 -c 'import uuid; print(str(uuid.uuid4()))')" for newpath in "$BITBAKEDIR/bin" "$SCRIPTSDIR"; do # Remove any existences of $newpath from $PATH @@ -77,5 +79,5 @@ export PATH BBPATH="${BUILDDIR}" export BBPATH -BB_ENV_EXTRAWHITE="BITBAKEDIR SCRIPTSDIR TESTSUITEDIR http_proxy https_proxy ftp_proxy no_proxy GNUPGHOME" +BB_ENV_EXTRAWHITE="BITBAKEDIR SCRIPTSDIR TESTSUITEDIR http_proxy https_proxy ftp_proxy no_proxy GNUPGHOME ISAR_BUILD_UUID" export BB_ENV_EXTRAWHITE -- 2.30.2