From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7172560304523444224 X-Received: by 2002:a17:903:1c4:b0:189:de27:679a with SMTP id e4-20020a17090301c400b00189de27679amr17856384plh.15.1670936035153; Tue, 13 Dec 2022 04:53:55 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:902:c454:b0:178:35a3:84d9 with SMTP id m20-20020a170902c45400b0017835a384d9ls18844863plm.10.-pod-prod-gmail; Tue, 13 Dec 2022 04:53:54 -0800 (PST) X-Google-Smtp-Source: AA0mqf49PHKCQsTTvYnJCEuYYbrft6asjWUKlvikguHLBG4dZm/DoTKquu8BL3eIL5/4zApVU2Ip X-Received: by 2002:a05:6a20:1584:b0:aa:7d04:109b with SMTP id h4-20020a056a20158400b000aa7d04109bmr34832799pzj.40.1670936034312; Tue, 13 Dec 2022 04:53:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670936034; cv=none; d=google.com; s=arc-20160816; b=IEpJmMQXZtAZLbPjChdvDrkCpvla2ZeWqqQKT88xq4NTUEPYVe2Gp4AYtReA6g3xfY /rKXGgc0dLL7CFFAHBOwTOstyBm1+On3OSWOCPLq3DkUZaQgjWEPPQnw23HC/zcY2JmA POQLqtdg57aOufelNXB/6C2X4O8RWCq6LLmdtVdnPp7nn0HRZbYv7SwWYo8Cvrx7ZvCY bU1GpsKUteKn8UsiXhJ06zhnMVe2WtSnlDA7kwFWoUdrevO8JypRIoJeReT62Zd9/mZ2 AoHuyoYFkOE53b2mzjg5qVL+FFNos6GMRmbsb5MAzFpYViLk+2d4GM+xyTyQgOLI5bR7 H8AQ== 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=bQVWNg8R9qZarfjwuYL2hy9ww1TCe4ZKRZTNBS/MRSiNAxI6x5FiAayAi+BjEB+8kF W5RGQeYb5CRF4NpWH4ZFN/ay3VtdV+wgN0egpfcabtXYS0EqhyR7HIhJ3782CbWIw2m1 Cd/C9AZlXKs9Oca8jHVYRitOdcSGioB1ThX5f+CbEOqy7z7X6yhOWB5cib81igfzqo6U E4j/oH9CL21xFUMIL3ari+ip6U//hS+m2iWGTJmjD7yTzh5SZclfsPA1fPs0SrnW+xsj yuOLRtUBBI4huJmjambRuuEZQU3+G7eGejBzObgk6iGfKhd4M4sy74zeUVp1na7e7Nr9 +QxQ== 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 p28-20020a63741c000000b00478eaef1200si701858pgc.4.2022.12.13.04.53.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Dec 2022 04:53:54 -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 ([194.49.52.147]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 2BDCrDub001200 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 13 Dec 2022 13:53:48 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich , Adriaan Schmidt Subject: [PATCH v6 09/21] bitbake.conf: align hash vars with openembedded Date: Tue, 13 Dec 2022 15:52:53 +0300 Message-Id: <20221213125305.10984-10-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221213125305.10984-1-amikan@ilbers.de> References: <20221213125305.10984-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: tLLfehoHcmk1 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