From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7286543990069919744 X-Received: by 2002:a05:6402:4314:b0:523:4069:182c with SMTP id m20-20020a056402431400b005234069182cmr7590970edc.2.1696606506155; Fri, 06 Oct 2023 08:35:06 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:d981:0:b0:537:a193:1300 with SMTP id u1-20020aa7d981000000b00537a1931300ls372273eds.1.-pod-prod-05-eu; Fri, 06 Oct 2023 08:35:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGGCd938nxWaL/16GXU9k7Afr9UWCQdztjSc5dnXNg7CJeEk4d1pBfozozCb7pox15iubgY X-Received: by 2002:a17:906:104e:b0:9b9:fe89:4dac with SMTP id j14-20020a170906104e00b009b9fe894dacmr1636450ejj.5.1696606504141; Fri, 06 Oct 2023 08:35:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696606504; cv=none; d=google.com; s=arc-20160816; b=MZyBGGLsTa0qG+m4Ywvst+BWOmNfQ+x8sgOiH7hbukfZVp2/BdWI04GFaYxhTzYQuY BU010ws9LaJILccRfMVFg4XzfqwRxOH0k9lK4NVHx6LgtemojWLHcJr6hEUEI7wAjwAJ U+6ozkpbq6VUUHWhxKlsIvLLy2KdW6g14DETTEfAh9U7WGdiU718+5H7oqu+u6tyLGwL MrcvuRjSrv77saLchQyObz/RdcTWv2X7LnBuVxcTI5xL6yQaOHZA6W6+p0+26CS9+tpx V/S9b3+m1JGUyvEQFfinrMZYce2cMN6H6PdkrUx2tocd8cWr+zepdfQMF1AmMhikN4Tx pc+w== 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=hXcPmTS7Sx6QS9lheJoKWJSYPDgmbyeVMG+V/wm9vZ7M9Pw3Log55uiibClNR8pV2s eSkY4sSmBnKYfs3LC13PWxtNvyRaH5kYbuwQVWDjmSJJ0Gh6CPc8HgJqRiJxfL2kdpZo HlAI6sORJApNQTCnjnI+guxbInK8RTcfV1Kf/vtWmaUCQ4xpzsVY2JGNis+V0xi3S7Ak bMUxOhzQyQA5CDhETWjZGPnSctQTUh/ol1ZUxPJFHMx6VyLuaDaIRtSHfqG7Ymdv7yzM tlIsqyM0m+9O+T3zxEnGOqA1MbqUxsWNvejHqn2ijrGmcgZx0+8yXDMQu1lEUQPfh6zO 9gog== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=ZxDJ4ZHE; spf=pass (google.com: domain of fm-294854-2023100615350308481123e92005b964-fa_to9@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-2023100615350308481123e92005b964-fa_tO9@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id b30-20020a05651c0b1e00b002c17e2e5fb9si222136ljr.5.2023.10.06.08.35.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Oct 2023 08:35:04 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-2023100615350308481123e92005b964-fa_to9@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=ZxDJ4ZHE; spf=pass (google.com: domain of fm-294854-2023100615350308481123e92005b964-fa_to9@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-2023100615350308481123e92005b964-fa_tO9@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 2023100615350308481123e92005b964 for ; Fri, 06 Oct 2023 17:35:03 +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=ZxDJ4ZHEWjUPalATcH2dvyjkWsIqGisW7h2S1vKl1KcgLROMYtLZ/xiYpBtDNlMX5f2PfS 89i1RnaH145DpQ3py21B8uPclYNaUZC+lB1CW5TmWJ4xA//DfaMPUojkkkHOZ+fAHtfaOj68 O3Ef+nRRIWvIheyk2xaJDlMfPiLTI=; From: Jan Kiszka To: isar-users Cc: Adriaan Schmidt , Felix Moessbauer , Uladzimir Bely , Cedric Hombourger Subject: [PATCH v2 1/9] Rename BUILD_HOST_ARCH to BUILD_ARCH Date: Fri, 6 Oct 2023 17:34:54 +0200 Message-Id: <60dba7199afdc8b71494b55081b1193e091b9bde.1696606502.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: 1LUa5oj2p7mB 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