From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7172560304523444224 X-Received: by 2002:a05:6870:3c8b:b0:13b:738a:ea70 with SMTP id gl11-20020a0568703c8b00b0013b738aea70mr212791oab.131.1670936029610; Tue, 13 Dec 2022 04:53:49 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a4a:d85:0:b0:49f:774a:70d4 with SMTP id 127-20020a4a0d85000000b0049f774a70d4ls745318oob.11.-pod-prod-gmail; Tue, 13 Dec 2022 04:53:49 -0800 (PST) X-Google-Smtp-Source: AA0mqf4dfkXq1MO9dgeMn5bZGSJCcM3ggnbdS70mj8n18/nE7d44etH4abmdYWrtSJTJrlOFtu8I X-Received: by 2002:a4a:e882:0:b0:49f:f4e6:2063 with SMTP id g2-20020a4ae882000000b0049ff4e62063mr7802456ooe.6.1670936029073; Tue, 13 Dec 2022 04:53:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670936029; cv=none; d=google.com; s=arc-20160816; b=e2tNEEkX1rMWwom4y7Kgq7ZJuHSKEKEh267gDPBZ6PPsdWUaQNVgcAnbRRjvm7Da4m tj0eIU2NDwN4Pl3NPhXd1D1RrsrSfnBxi7QsAx39elC2KhvrBMJcARkxSBXZ4yqPW6vt JLvG5tJ1Sx68MzhE1OpcYFiwXhuEHAX1/K+BOrwoHMMXipMYb9DDWex7VGgjKh2vIyY1 u3gYdXCi/Hoh6GqX5La1AThqzGPo0RnddvJ92zu8G4h8A1CBXQYX9HtXsR95C+gQsE0D WYziMpYwO7oNpEEi2ZbxT2kBOsaSDx8abK2kNnEJQ+vrLQRdLch9NRAYyDhAA1t4MMgb sb5Q== 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=vupMDpvZ4w6EKUTK2JuUG/XZIpRvYPbQiEfuoVAJC4I=; b=e4BiYYU8NZknirdGYJxFWPU5Xdy5iuZeqh5DmO9vo5JtQQMgou0OHCzpK8iqvVNTVG SOGFcmoECHxUGlTIV0iKFtX0QGXTAMMW2/ey4DUiNlKNiMvi0lfARYlgAuadfWh/EIT8 Ux2LFwsDQEDvcfU7akcT/UJktcyAFurN3yQrPz1zmnly5MIUm0kaDgwr9LfrGhHkopYO a2+xYVGrgf8S5innQn+jC2wKgV9FePdjhjqM5iThqx2N7H7SLI1xTx2+C9SqUgbE9sjI 20wKyChLF+H4Oj92Ifv2ibhF1rkJW9QKoXGzrBUtxm0MEz3G5EPmca+Wcai5a6YzdtQ9 lqpw== 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 y22-20020a4acb96000000b004a399d01471si176511ooq.1.2022.12.13.04.53.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Dec 2022 04:53:49 -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 2BDCrDua001200 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 13 Dec 2022 13:53:45 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v6 08/21] meta: update bitbake variables Date: Tue, 13 Dec 2022 15:52:52 +0300 Message-Id: <20221213125305.10984-9-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: 3XQ4LfmM5LFm Adopt variables for the Bitbake update requirements: BB_ENV_EXTRAWHITE has been renamed to BB_ENV_PASSTHROUGH_ADDITIONS BB_HASHBASE_WHITELIST has been renamed to BB_BASEHASH_IGNORE_VARS BB_HASHCONFIG_WHITELIST has been renamed to BB_HASHCONFIG_IGNORE_VARS BB_STAMP_POLICY is a deprecated variable and support has been removed The BB_DISKMON_DIRS "ABORT" action has been renamed to "HALT" Signed-off-by: Anton Mikanovich --- meta-isar/conf/local.conf.sample | 8 ++++---- meta/conf/bitbake.conf | 7 +++---- scripts/isar-buildenv-internal | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 57d06202..381e2327 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -162,10 +162,10 @@ BB_DISKMON_DIRS = "\ STOPTASKS,${DL_DIR},1G,100K \ STOPTASKS,${SSTATE_DIR},1G,100K \ STOPTASKS,/tmp,100M,100K \ - ABORT,${TMPDIR},100M,1K \ - ABORT,${DL_DIR},100M,1K \ - ABORT,${SSTATE_DIR},100M,1K \ - ABORT,/tmp,10M,1K" + HALT,${TMPDIR},100M,1K \ + HALT,${DL_DIR},100M,1K \ + HALT,${SSTATE_DIR},100M,1K \ + HALT,/tmp,10M,1K" # Isar MIRRORS in case of service unavailable MIRRORS ?= "git?://salsa\.debian\.org/debian/.* git://github.com/ilbers/BASENAME" diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 2ddc68db..cc2c1f8a 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -96,21 +96,20 @@ 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_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH BBSERVER DL_DIR \ +BB_BASEHASH_IGNORE_VARS ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH BBSERVER DL_DIR \ SSTATE_DIR THISDIR FILESEXTRAPATHS FILE_DIRNAME HOME LOGNAME SHELL TERM \ 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_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SSH_AGENT_PID \ - SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \ +BB_HASHCONFIG_IGNORE_VARS ?= "${BB_BASEHASH_IGNORE_VARS} 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 \ 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_STAMP_POLICY ?= "full" # Default to setting automatically based on cpu count BB_NUMBER_THREADS ?= "${@bb.utils.cpu_count()}" diff --git a/scripts/isar-buildenv-internal b/scripts/isar-buildenv-internal index 7ef9c542..1f609a5e 100755 --- a/scripts/isar-buildenv-internal +++ b/scripts/isar-buildenv-internal @@ -77,5 +77,5 @@ export PATH BBPATH="${BUILDDIR}" export BBPATH -BB_ENV_EXTRAWHITE="BITBAKEDIR SCRIPTSDIR TESTSUITEDIR http_proxy https_proxy ftp_proxy no_proxy GNUPGHOME CCACHE_DEBUG BB_NUMBER_THREADS PARALLEL_MAKE" -export BB_ENV_EXTRAWHITE +BB_ENV_PASSTHROUGH_ADDITIONS="BITBAKEDIR SCRIPTSDIR TESTSUITEDIR http_proxy https_proxy ftp_proxy no_proxy GNUPGHOME CCACHE_DEBUG BB_NUMBER_THREADS PARALLEL_MAKE" +export BB_ENV_PASSTHROUGH_ADDITIONS -- 2.17.1