From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7111687409920638976 X-Received: by 2002:a05:6102:956:b0:34c:5a1a:3574 with SMTP id a22-20020a056102095600b0034c5a1a3574mr11580207vsi.43.1655818790120; Tue, 21 Jun 2022 06:39:50 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a67:844:0:b0:34b:c6a1:884d with SMTP id 65-20020a670844000000b0034bc6a1884dls2530163vsi.4.gmail; Tue, 21 Jun 2022 06:39:49 -0700 (PDT) X-Google-Smtp-Source: AGRyM1s7NBPYRa3nkJBpb8hxokBw4ZgbZqFGMpJP9zQO+x9BIH59xgJiLBk2AQGxZUNGcHQ8b3qu X-Received: by 2002:a05:6102:23eb:b0:335:e508:8593 with SMTP id p11-20020a05610223eb00b00335e5088593mr11836381vsc.52.1655818789717; Tue, 21 Jun 2022 06:39:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655818789; cv=none; d=google.com; s=arc-20160816; b=LSxRK47luNdtozMoV7WPApVnxacBTIgAcNEZ+h+3AYRP6Xlw+OlnRV/Hnu6mFCRIan D1RZKe1axjqPeaVH9rhDsz0Wud7VUj7FTziSaA/+BBzFZoSdESFAQKn6uUMIfT/hZOX5 1cGsnqXD0sY9CHo0IwGPKTpUuKkhpdGkvOyLrLEezys2A6MVH+hRApGU2bjNa8zHmwhp h4soDuiXMKqZrvjXporgZcrQsEojkkGgSPrcGpP2gCUvDMbuFN87ltBofFInvgQ4/6k/ wv7QoluyjGUtxXvi3lB7W8X2fqrgTTyuGGdlsCZ4TeoqmTamJuVT00IsPP/xRl1CTfz8 pIUw== 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=2MEWw0TOf2llX+JcA1jWdyVc83XTEcrdml/g++oCPnQ=; b=vAIzESxLkqjhfeyCtAcyyQbJuoQg9Udbw9BVSuOEQQc5gUdU0agMhNcUAxmyPqaogs 5QBK4nbDvCfPFVztaUzJzm+cvmMLP+cRPzDEvgqVV5GuMjxfgm1I5BQOkaBEJJoltsq2 Cz1hiy6kLyPu0UabHKrnaVs/Vx9mwmBvyp7/hbjtOuY1943rK7GjNTnPuNkSk2Q0dJQH lYwnWdwngLDw7ldBQ+QAqqlY0ryEw7LE/dYyIh3DRom3yc74bA/166evE7xYbRql+BdJ Mn09moTQgDsz15skIfWb7Mx33+pPBK6+L2XRi+RFUcCC6eV1tPQE+NuFf+UuY44aGb8j SGwA== 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 a69-20020a1ffc48000000b0036bf187df71si494886vki.0.2022.06.21.06.39.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Jun 2022 06:39:49 -0700 (PDT) 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 localhost.localdomain (mm-222-67-120-178.brest.dynamic.pppoe.byfly.by [178.120.67.222]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 25LDd50l031134 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Jun 2022 15:39:43 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, Anton Mikanovich Subject: [PATCH v1 09/11] meta: update bitbake variables Date: Tue, 21 Jun 2022 16:38:54 +0300 Message-Id: <20220621133856.4673-10-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220621133856.4673-1-amikan@ilbers.de> References: <20220621133856.4673-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: RVkp8WRA+UT7 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 58f3e1a..834fbd5 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 e55e49b..7f5fa61 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -94,7 +94,7 @@ 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 \ @@ -103,14 +103,13 @@ BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH BBSERVER DL_DI BB_WORKERCONTEXT BB_LIMITEDDEPS DEPLOY_DIR BUILDCHROOT_DIR \ REPO_ISAR_DIR REPO_ISAR_DB_DIR REPO_BASE_DIR REPO_BASE_DB_DIR LAYERDIR_core \ SCRIPTSDIR TOPDIR" -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 ec8e437..046c332 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" -export BB_ENV_EXTRAWHITE +BB_ENV_PASSTHROUGH_ADDITIONS="BITBAKEDIR SCRIPTSDIR TESTSUITEDIR http_proxy https_proxy ftp_proxy no_proxy GNUPGHOME" +export BB_ENV_PASSTHROUGH_ADDITIONS -- 2.17.1