From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7286543990069919744 X-Received: by 2002:a2e:8845:0:b0:2c0:2edb:3b1 with SMTP id z5-20020a2e8845000000b002c02edb03b1mr19440478ljj.37.1697087810049; Wed, 11 Oct 2023 22:16:50 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:bc11:0:b0:2be:58d1:dc38 with SMTP id b17-20020a2ebc11000000b002be58d1dc38ls394072ljf.1.-pod-prod-06-eu; Wed, 11 Oct 2023 22:16:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH9Hiixd6pFCnbN5j1cInfQiySjpkFO2Dpn+fK9Z/vOe85YBX2EFh2hPjUfglHJTG8BaG+o X-Received: by 2002:a2e:8507:0:b0:2bc:feb6:6da4 with SMTP id j7-20020a2e8507000000b002bcfeb66da4mr19495654lji.33.1697087807929; Wed, 11 Oct 2023 22:16:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697087807; cv=none; d=google.com; s=arc-20160816; b=hzgOMSZuB2gHSmGJfHyCCaqA+vAoVmkRfHWibIWVbW+X7ViWKqXyjvI3+2BUqaXGz3 YM+8rBAWrqygm8Nu21zAvwLZcl2dBYE7Ghuqx40LGzY38L/rrDObQXG8iZ3E5zqJT9/l 7V8gWtxF/leFk3fwztbFpOdBYObjGzMU5tCv6+BzSnLzCRAIM3lYtY4yGbRXaydaeYEe mJc1bTzN0kbIVIJK2KkZyl1IB1Tx1fvKU8FKtPXR+YTk/vmBlqohNah9pLmV/FlzGmQf VybEU1Sp4IdBNvluZXdaf/bmhv0/EW3IG4XDIKGQgce0HFghCnFY5rvQHMnLXu/zdDF0 bciA== 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=MVBCcwLiQaQ/UarlCb9iRxO7v8KRiJLDiVWS7OunLUM=; fh=oMwV7fLMNO6+b1+J7DgRaIeS6HOdhYK0IzT7NJ4piPQ=; b=eD55ZZ4VfnOwbT9DyYzIcVPC925yBrjf61e0hDENRUgCv85met+TaSF1mSPVjHo0gX Kb8yB03DHpEpt9hbTsHzYFEHwU2HNhIoDluAYkColyOCorSd6SgcIF089PpROwx7G2Wh bCWQRw+/ssEWq1odaJhXw4Q98VlxO+IqSXxHxJ8o12wd0K9n6vpxAUsb2Cc/DyoEHMdj P9kn+7ebXeAqKSQMkPUcJLOzq4C5BLJzMKYfon4r5FbitT6/Ozy6jpxZ20X5JFBm7xEG f+hIkIdDm2gHyf1xbeEfPhqX/FIiPZnpuG/RcvOt9TOheci3ydZoPD+DXj9nHNLpMvJv 4n0g== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=fMOw5ONy; spf=pass (google.com: domain of fm-294854-2023101205164754cc787e23331361af-wk8ksv@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-294854-2023101205164754cc787e23331361af-wK8kSV@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net. [185.136.64.227]) by gmr-mx.google.com with ESMTPS id b28-20020a2ebc1c000000b002c29b97d5f2si827072ljf.1.2023.10.11.22.16.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Oct 2023 22:16:47 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-2023101205164754cc787e23331361af-wk8ksv@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) client-ip=185.136.64.227; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=fMOw5ONy; spf=pass (google.com: domain of fm-294854-2023101205164754cc787e23331361af-wk8ksv@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-294854-2023101205164754cc787e23331361af-wK8kSV@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 2023101205164754cc787e23331361af for ; Thu, 12 Oct 2023 07:16:47 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=MVBCcwLiQaQ/UarlCb9iRxO7v8KRiJLDiVWS7OunLUM=; b=fMOw5ONy2/asg2NaW7NRoMWGeyPUGr+XkFuGE+fVYNWpth9+5qpLT4a1jyC7KBGjAJ9ocn thPB8BRmXnZDLcbdNuRk8bRs2SQKHYDUSiYpNhnDb8tSNpjIlGPHSAOfGknr5HEGDYZnZubf a4ajvpxdjhksNy2odjLJKbZPDLmnQ=; From: Jan Kiszka To: isar-users Cc: Adriaan Schmidt , Felix Moessbauer , Uladzimir Bely , Cedric Hombourger Subject: [PATCH v3 1/9] Rename BUILD_HOST_ARCH to BUILD_ARCH Date: Thu, 12 Oct 2023 07:16:37 +0200 Message-Id: <60dba7199afdc8b71494b55081b1193e091b9bde.1697087805.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-TUID: aY3SzccNT3aU From: Jan Kiszka Aligns us also with OE/Yocto and prepares for a potential future renaming of HOST_ARCH as well. Signed-off-by: Jan Kiszka --- doc/user_manual.md | 4 ++-- meta/classes/crossvars.bbclass | 4 ++-- meta/classes/dpkg-base.bbclass | 2 +- meta/classes/dpkg.bbclass | 2 +- meta/conf/bitbake.conf | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/user_manual.md b/doc/user_manual.md index be47fdcc..ecb987f4 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -1080,8 +1080,8 @@ to `local.conf`. If some package requires ccache to be always disabled, By default, ccache directory is created inside `TMPDIR`, but it can be adjusted by `CCACHE_TOP_DIR` variable in `local.conf`. Ccache directory `CCACHE_DIR` default value is -`"${CCACHE_TOP_DIR}/${DISTRO}-${DISTRO_ARCH}-${BUILD_HOST_ARCH}"`, -that means caches for different distros and architectures are not overlapped. +`"${CCACHE_TOP_DIR}/${DISTRO}-${DISTRO_ARCH}-${BUILD_ARCH}"`, that means +caches for different distros and architectures are not overlapped. The ccache debug mode can be enabled by setting `CCACHE_DEBUG = "1"` in the `local.conf`. diff --git a/meta/classes/crossvars.bbclass b/meta/classes/crossvars.bbclass index df26f47f..22bc4714 100644 --- a/meta/classes/crossvars.bbclass +++ b/meta/classes/crossvars.bbclass @@ -17,12 +17,12 @@ python __anonymous() { distro_arch = d.getVar('DISTRO_ARCH') if mode == "0" or d.getVar('HOST_ARCH') == distro_arch or distro_arch == None: - d.setVar('BUILD_HOST_ARCH', distro_arch) + d.setVar('BUILD_ARCH', distro_arch) schroot_dir = d.getVar('SCHROOT_TARGET_DIR', False) sbuild_dep = "sbuild-chroot-target" + flavor_suffix + ":do_build" sdk_toolchain = "build-essential" else: - d.setVar('BUILD_HOST_ARCH', d.getVar('HOST_ARCH')) + d.setVar('BUILD_ARCH', d.getVar('HOST_ARCH')) schroot_dir = d.getVar('SCHROOT_HOST_DIR', False) sbuild_dep = "sbuild-chroot-host" + flavor_suffix + ":do_build" sdk_toolchain = "crossbuild-essential-" + distro_arch diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index f223fc16..7b054d3f 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -299,7 +299,7 @@ python do_devshell() { schroot = d.getVar('SBUILD_CHROOT') isar_apt = d.getVar('ISAR_APT_REPO') pkg_arch = d.getVar('PACKAGE_ARCH') - build_arch = d.getVar('BUILD_HOST_ARCH') + build_arch = d.getVar('BUILD_ARCH') pp_pps = os.path.join(d.getVar('PP'), d.getVar('PPS')) debdistroname = d.getVar('DEBDISTRONAME') diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index d896fc91..7bcb4367 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -101,7 +101,7 @@ dpkg_runbuild() { DSC_FILE=$(find ${WORKDIR} -name "${DEB_SOURCE_NAME}*.dsc" -maxdepth 1 -print) sbuild -A -n -c ${SBUILD_CHROOT} --extra-repository="${ISAR_APT_REPO}" \ - --host=${PACKAGE_ARCH} --build=${BUILD_HOST_ARCH} ${profiles} \ + --host=${PACKAGE_ARCH} --build=${BUILD_ARCH} ${profiles} \ --no-run-lintian --no-run-piuparts --no-run-autopkgtest --resolve-alternatives \ --bd-uninstallable-explainer=apt \ --no-apt-update \ diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 9eb93e2b..80dc01c7 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -163,7 +163,7 @@ INHERIT += "${@'buildstats' if d.getVar('USE_BUILDSTATS') == '1' else ''}" # Default values for ccache USE_CCACHE ??= "0" CCACHE_TOP_DIR ?= "${TMPDIR}/ccache" -CCACHE_DIR ?= "${CCACHE_TOP_DIR}/${DISTRO}-${DISTRO_ARCH}-${BUILD_HOST_ARCH}" +CCACHE_DIR ?= "${CCACHE_TOP_DIR}/${DISTRO}-${DISTRO_ARCH}-${BUILD_ARCH}" CCACHE_DEBUG ?= "0" # Variables for tasks marking -- 2.35.3