From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7192672744921628672 X-Received: by 2002:a9d:5549:0:b0:684:9f74:7574 with SMTP id h9-20020a9d5549000000b006849f747574mr1324141oti.293.1674674634996; Wed, 25 Jan 2023 11:23:54 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6870:d344:b0:152:e7d4:7359 with SMTP id h4-20020a056870d34400b00152e7d47359ls7688032oag.2.-pod-prod-gmail; Wed, 25 Jan 2023 11:23:54 -0800 (PST) X-Google-Smtp-Source: AMrXdXvSOwSkNEliVB5Vm0j+sx0PmxtGvh96Bfh1jVhpgw7p+ImQK7/4PFGTvt8F9RBJm1a9TAKP X-Received: by 2002:a05:6870:4151:b0:15e:cc43:dd09 with SMTP id r17-20020a056870415100b0015ecc43dd09mr19621546oad.32.1674674634508; Wed, 25 Jan 2023 11:23:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674674634; cv=none; d=google.com; s=arc-20160816; b=af0dcF4VrxlkQh+2KT5nENrmOQUmCoAkim65AZWEKT+Fdlu0GMvZ80g7dgoiyOxWpz oBFB5u426Ci/weYDgBUhkFyJyub96B/KkP2mFEBxEOhNwuV7Ek8YIh1kYsRufaWg2TPO frxGkbk3+r1hq5M75JHeyemSO3wbhC77SdyluDmkiE6DGvFWEYY+AFqcymo+LQk6CeyN uX+8PFdpgjSOzRk7lQokK84LcJ7vmc6mf8yNV4Ob1/froTyEJgq7zC1icCpV4AdHyNdm sGnsIXJ5yu/eHZmqU10OAjWGcC3p1HzAtnSuOmXChP4C2xu9g0dsymlFEoq9jRwPYwje 5pWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=Oa4pNQT3h9Uvu0vYDBUWrL/HiLmXNHmk7RslcO42ClA=; b=esK5bNS1nHJoWd4MRH3yw8KRqpZSZAC472MASZq0jPl4AtqnlHIDoEdWWINYjAFXDR PUhF9KKnwDG78ImA41ar3NmJsGFCDQR+BH9OuLMt321tdBGD11YDtTWl/Y2MURNY3aR6 47NS5mD5IAr7SHvb8ukPVnm9Epn1E2J8KyBgehsMWXSfARZhsoZM9Pli2Rd0oxfCeCqo AZpz7PjkqJCE7fFJKLkztcjqsRdsknIFPyZR9MMnuGTomFtT0t4aIuYt2uxL5nnVcs6s rJcL3XY+SNhQiDtm67fUXLW9zEtiULlqKaILYwIb+HY3BOJcSbSFdKaAUe3baSpcAEq4 isrQ== 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 la8-20020a056871410800b0014f9cc82408si496086oab.5.2023.01.25.11.23.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Jan 2023 11:23: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 user-B660.. (IN-213-226-141-182.bitemobile.lv [213.226.141.182] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 30PJNdaN028378 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 25 Jan 2023 20:23:51 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich , Adriaan Schmidt Subject: [PATCH v8 08/20] bitbake.conf: align hash vars with openembedded Date: Wed, 25 Jan 2023 21:23:25 +0200 Message-Id: <20230125192337.86869-9-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230125192337.86869-1-amikan@ilbers.de> References: <20230125192337.86869-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: KZds+WDKavF3 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 cc2c1f8..f7b464c 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.34.1