From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7120476383164235776 X-Received: by 2002:a17:902:dac4:b0:16c:34a3:e46f with SMTP id q4-20020a170902dac400b0016c34a3e46fmr11950236plx.61.1657865111920; Thu, 14 Jul 2022 23:05:11 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:902:f604:b0:168:9a69:49b1 with SMTP id n4-20020a170902f60400b001689a6949b1ls6473401plg.6.gmail; Thu, 14 Jul 2022 23:05:11 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u4wi1OdgL7tfFW7HDoIRoVpjdROL0q8ZLbij/oEIhviUbJdDFp9VbnMZQTmYFRTRDgdNKl X-Received: by 2002:a17:90b:33ce:b0:1ef:e5f4:f8e2 with SMTP id lk14-20020a17090b33ce00b001efe5f4f8e2mr20856208pjb.70.1657865111050; Thu, 14 Jul 2022 23:05:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657865111; cv=none; d=google.com; s=arc-20160816; b=0LGCG+1o0dtmz/3EPiMrK7iELwqVMEAOnAdGeDUD5WETlAFMmYQwFfh/qTHmXllY2M dmPhHPeyVl5xosfX+/6XzkXVK5wROQNm/ONyLbDCiTw3oXA6C1g+8GD+Yh7vNU87WjEv OVhujmCieYdd/na9eOR6TBAR722PurxmRIwM2GIkMFuk1/8ra0VrEOWWIEdAEuOmgC9s 9mldXRnPTTPtMC12HuYVXmCRbbq1ZrKsdfWhCZtu9VwHckRRARvgvUROzmMF9UacW2Vo RazrBbibc6cGLySSQy+Tjt2K06CruTT/EvEWWa/DhCjoFGSBr7IX81VChffwZr4O3NcC Lpng== 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=p55pBNcvCtADLSeJlUxP6FE4X3XfkoHBwhM3RaeqTpA=; b=0VL1v7apWKsi2axCfzK0U1IaV9kYkjG6Hdbo17bciasOZG/udeZ6xyLP/GsYvs+c3m xAuW+DfO8mJybVE3gxkPymsWzwgcOq0djYJSYgMaELTDNob0DzWFP3ZtctaBBiPX/dRi AAwiEfhkrIUbe24bKyfL0pOABVzKPby3RqExpN19RoysBmBT06qUczpjJG7y/Tn8LzR4 gbWDaoBD03XuRkuq77EXtkBcq02YeOtsDz5r7eU0FOa+5cSdYI4vFdBgbwMOZ1zRL60P krvz0ZIB31l1+n43EfNj49moYjHc7tjVHqMU7RqqGIXkb6uamT+yKHf4m96mu3Wsubai U81g== 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 y188-20020a6264c5000000b0051c55b05eaesi129196pfb.5.2022.07.14.23.05.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Jul 2022 23:05:10 -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 alena-nb.promwad.com (mm-137-75-214-37.mgts.dynamic.pppoe.byfly.by [37.214.75.137] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 26F64pL9026837 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 15 Jul 2022 08:05:08 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 08/18] meta: update bitbake variables Date: Fri, 15 Jul 2022 09:04:32 +0300 Message-Id: <20220715060442.18063-9-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220715060442.18063-1-amikan@ilbers.de> References: <20220715060442.18063-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: mn4HMhtYQcql 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 1a35e20..ffaf100 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -96,7 +96,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 \ @@ -105,14 +105,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