From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7172560304523444224 X-Received: by 2002:ac8:6751:0:b0:3a8:495:1116 with SMTP id n17-20020ac86751000000b003a804951116mr771782qtp.472.1672124462238; Mon, 26 Dec 2022 23:01:02 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:622a:259a:b0:3a9:7e8b:ed6c with SMTP id cj26-20020a05622a259a00b003a97e8bed6cls8713520qtb.8.-pod-prod-gmail; Mon, 26 Dec 2022 23:01:01 -0800 (PST) X-Google-Smtp-Source: AMrXdXu5Q66SAl46AXdsTAdn9OIL4j421dskTMHYI0TMoTQjeo46UsZE4BLLu0jt7vlTJmjxzl4m X-Received: by 2002:a05:622a:5a94:b0:3a5:7645:c06c with SMTP id fz20-20020a05622a5a9400b003a57645c06cmr29082795qtb.59.1672124461662; Mon, 26 Dec 2022 23:01:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672124461; cv=none; d=google.com; s=arc-20160816; b=vkHCA7nEQ1qqyYVGXi3LVdwkv2WJvxoxEXzLrNtu82To/55kqHRydHsbJcNsm8bRZY 2wZE1N0lMAwopHVc1dgmiho9n3JmpphMbX6qfYbWWITf1cnKwjk6JUl/EKYqK+lzFui1 E/CTt0K2mW1KV5bSd42JUoGdqcFDyFdVhrMqQNHSsAZKCeHuzvOeJ6K2vddyMltcH4ye p+gX3PZTD+NNU+tJ92YWs2DFsCczd6HaRAmWu+ZNclt5RarOzz6HXVkhKakSP4XW94wD 0Ha7C3KEpxCAqIdUCxvwLtrMG/r19Gq82YSH6Wkb0YkjGufpNYJKMvh4KzYlp0E4SQxd XIuw== 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=Ih025fBMLRSQXIfgAYWA9VzrEc8iUiEB53hyEbgfIX0=; b=SbAZTy0J3Wc/BsDSFbrmjuU+v3DkA/9mLmIYa6sJftJ6AZkD9EsBqXkRxAPpYFr0Ej FpImTSmMfXN05qqN7wRdcgeXyYMwUpO1sFBf7e0ksj/bs0qRWep2M7YWwydAC8STTnL6 xmxYh/+lc+tMnK6nvAVBJCNzIwnayNo4o001xV5pvypRBmrhL5EwHRrRUDcuetmaHBxX UKZ6hitcWZXm1WH0/6Shv13MOVvTPWMA21e9rwKmneqvUtMEMFd6ien7MSe5lL/C5+qV 3geGtjuDE4lsK5c5r2QitEEhsmttfoIk79Fq8Uu3hppEDt/o8Tn+CUYkgpY/o2wOR7rk 6glA== 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 h20-20020a05620a10b400b006eeb0d15906si823643qkk.6.2022.12.26.23.01.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Dec 2022 23:01:01 -0800 (PST) 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 alena-nb.promwad.com ([193.228.193.9]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 2BR70j9r030666 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 27 Dec 2022 08:00:59 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich , Adriaan Schmidt Subject: [PATCH v7 08/20] bitbake.conf: align hash vars with openembedded Date: Tue, 27 Dec 2022 10:00:27 +0300 Message-Id: <20221227070039.23496-9-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221227070039.23496-1-amikan@ilbers.de> References: <20221227070039.23496-1-amikan@ilbers.de> X-Spam-Status: No, score=-0.2 required=5.0 tests=ALL_TRUSTED,UPPERCASE_50_75 autolearn=no autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: jh1UgJt05EkB Restructure and update hash-related variables to be compatible with current Bitbake/Openembedded versions. Based on OE 4.0.5 commit fbdf93f43ff4b876487e1f26752598ec8abcb46e Signed-off-by: Anton Mikanovich Signed-off-by: Adriaan Schmidt --- meta/conf/bitbake.conf | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index cc2c1f8a..f7b464c7 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -96,20 +96,33 @@ THIRD_PARTY_APT_KEYRING = "/etc/apt/trusted.gpg.d/third_party.gpg" REPO_BASE_DIR = "${DEPLOY_DIR}/base-apt/${DISTRO}/apt" REPO_BASE_DB_DIR = "${DEPLOY_DIR}/base-apt/${DISTRO}/db" -BB_BASEHASH_IGNORE_VARS ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH BBSERVER DL_DIR \ - SSTATE_DIR THISDIR FILESEXTRAPATHS FILE_DIRNAME HOME LOGNAME SHELL TERM \ +# Setup our default hash policy +BB_SIGNATURE_HANDLER ?= "OEBasicHash" +BB_HASHEXCLUDE_ISAR ?= "CCACHE_DEBUG LAYERDIR_core SCRIPTSDIR TOPDIR ISAR_BUILD_UUID" +BB_HASHEXCLUDE_COMMON ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH BBSERVER DL_DIR \ + THISDIR FILESEXTRAPATHS FILE_DIRNAME HOME LOGNAME SHELL \ USER FILESPATH STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE PRSERV_HOST \ - PRSERV_DUMPDIR PRSERV_DUMPFILE PRSERV_LOCKDOWN PARALLEL_MAKE \ - CCACHE_DIR CCACHE_DEBUG EXTERNAL_TOOLCHAIN CCACHE CCACHE_NOHASHDIR LICENSE_PATH SDKPKGSUFFIX \ - WORKDIR STAMPCLEAN PKGDATA_DIR BUILD_ARCH SSTATE_PKGARCH \ - BB_WORKERCONTEXT BB_LIMITEDDEPS LAYERDIR_core SCRIPTSDIR TOPDIR ISAR_BUILD_UUID" -BB_HASHCONFIG_IGNORE_VARS ?= "${BB_BASEHASH_IGNORE_VARS} DATE TIME SSH_AGENT_PID \ + STAMPS_DIR PRSERV_DUMPDIR PRSERV_DUMPFILE PRSERV_LOCKDOWN PARALLEL_MAKE \ + CCACHE_DIR EXTERNAL_TOOLCHAIN CCACHE CCACHE_NOHASHDIR LICENSE_PATH SDKPKGSUFFIX \ + WARN_QA WORKDIR STAMPCLEAN PKGDATA_DIR BUILD_ARCH SSTATE_PKGARCH \ + BB_WORKERCONTEXT BB_LIMITEDDEPS BB_UNIHASH extend_recipe_sysroot \ + SSTATE_HASHEQUIV_METHOD SSTATE_HASHEQUIV_REPORT_TASKDATA \ + SSTATE_HASHEQUIV_OWNER CCACHE_TOP_DIR BB_HASHSERVE GIT_CEILING_DIRECTORIES \ + OMP_NUM_THREADS BB_CURRENTTASK ${BB_HASHEXCLUDE_ISAR}" +BB_BASEHASH_IGNORE_VARS ?= "${BB_HASHEXCLUDE_COMMON} PSEUDO_IGNORE_PATHS BUILDHISTORY_DIR \ + SSTATE_DIR SOURCE_DATE_EPOCH" +BB_HASHCONFIG_IGNORE_VARS ?= "${BB_HASHEXCLUDE_COMMON} DATE TIME SSH_AGENT_PID \ SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_PASSTHROUGH_ADDITIONS DISABLE_SANITY_CHECKS \ - BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED \ + PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED \ GIT_PROXY_COMMAND ALL_PROXY all_proxy NO_PROXY no_proxy FTP_PROXY ftp_proxy \ HTTP_PROXY http_proxy HTTPS_PROXY https_proxy SOCKS5_USER SOCKS5_PASSWD \ BB_SETSCENE_ENFORCE BB_CMDLINE BB_SERVER_TIMEOUT" -BB_SIGNATURE_HANDLER ?= "basichash" +BB_SIGNATURE_EXCLUDE_FLAGS ?= "doc deps depends \ + lockfiles vardepsexclude vardeps vardepvalue vardepvalueexclude \ + file-checksums python task nostamp \ + sstate-lockfile-shared prefuncs postfuncs export_func deptask rdeptask \ + recrdeptask nodeprrecs stamp-extra-info sstate-outputdirs filename lineno \ + progress mcdepends number_threads" # Default to setting automatically based on cpu count BB_NUMBER_THREADS ?= "${@bb.utils.cpu_count()}" -- 2.17.1