From patchwork Wed Feb 21 09:33:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 3366 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 21 Feb 2024 10:34:24 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-oo1-f55.google.com (mail-oo1-f55.google.com [209.85.161.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 41L9YFoD024031 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 21 Feb 2024 10:34:16 +0100 Received: by mail-oo1-f55.google.com with SMTP id 006d021491bc7-59fd9a831fdsf502865eaf.0 for ; Wed, 21 Feb 2024 01:34:15 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708508049; cv=pass; d=google.com; s=arc-20160816; b=XR28siOzvTa/Y1wDBMGvXJMaobzxgKUGHfNbENVkiP+PYch6Vghx73Xkgq/DsY3BYp giLNXYOjDSWNmmnFVLHVEYLQ6VU81BzTN5mAG0V9rQ9TmDsbU+b49aoVieRJTF7Kpn0b 9iKsQbQofxsCI6wW6bPyHVbrTWRsl+b7LX/r1dZeVJ993I1Mt6U3e4KnmLw0S2NnH4/c oaSqSalDDoAxb3MopmMoIJfreu+S1WRP04qxEx6VBhekkhpruc61a6IIW6PPE9Qll5Rc mFDsBuyjm6+r7x+4qQk5WxCzCzWVK8dFNBkignUPEf7u7I/mwiSBbaU27uHrlmgysy1E ZuUQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=sMGP3lYaJsPhPulncgWvY5oN/3qSvNsWY2iPtyP2WHc=; fh=+vbVgLYEv3zhqARzsfl4jE5VpdA5BYm159POb9w0XVY=; b=TVRJed4TH0SsP8WcBcfwz3ZKNJ16NS5distTf7f72LqPwnMaH+I+qiIAGZ9HvNqbPV 5X7QF2lughthyfH1UWtBIY4V0++/DbH0kUZXbMXBqSdKEPT0rUCi68UG6WQLgsckWjcJ W9U0aKb3U1e1JULroKMSyCsZVpB3nCowY6HEMvlCk2u/BS8XcS2mfY5w2/y83hSTdwft tY389VhC4MzMvzHZAONxOLX2McAxDPZBd6Zr8Cmw6F5b0ywWcjUWL2sHWXr2TAcupGg4 /jB8PrAnJC6EBqEf1eXr4hloSzIBAdL2qJxTl+b+PGCdOPTARfBg/cUnzncSaZEVxBgj oEsA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=C1P0DToi; spf=pass (google.com: domain of fm-1321639-202402210934063da11d5b73b1a61f5b-7aubsu@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-1321639-202402210934063da11d5b73b1a61f5b-7AubSU@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1708508049; x=1709112849; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=sMGP3lYaJsPhPulncgWvY5oN/3qSvNsWY2iPtyP2WHc=; b=kpkY0STU7rBe4ITauxybSn1Riyya7nooQeXgAQZ2N6e8WIo4DnW2zFyVAwl5mLIzQo 6LTXAbNYDvzkTqWFf4GgZFJRK48SGBt9By6A93RKkej8sRMjX9MipYpDFyPIo8Z6ZJAL fyS3zdc5mYGVbTvcYEJR4vFdm1HgOZo+RRdejg7CdD3Udi2ZPuvJIfFHt2EnGho78IMN r2jH/7lG7nysWSd3eRsN9/jhh6k/CEgudfbkoP2z5lB0SwaECy7HalFuzg8boHGQ58Ks uOMMJ5aA7hTrNDsVizBle6X1Dz52N9UTMfoA2l+tfumsnQJfOui4jUrdgn6GwJ7K5dt7 HNww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708508049; x=1709112849; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:cc:to:from:x-beenthere :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=sMGP3lYaJsPhPulncgWvY5oN/3qSvNsWY2iPtyP2WHc=; b=LiBBi2VOV+ehvnlqjYoFzUohed1LfXRttgU3jmxjZ/OahDzwLEP8w+u8V8NBdU87WX BQB3WOAwJqr22cI0uVv55Lh9tQHMLPhA+zvySvJi38Dsf3qj0dxL6uFiQPBBEG8xmnnM vAwz34Ko4P83LlZo80mord0qG5aA9q1gCwLdx3JbpulaQiovyWtpnleQIYQBpYLa+Vlq jUOoDlkjMN2njnhSg9mFnsSfPxmeYlkW1OKYpLD619L8gtbZQAVgj+wym1VtlG7ECq1G Xu1BQ3l2gRp+PO/Ydp3dzGK4M1ZmTpfCO3N3mLVfZlcQx+GI3q5fPA6clqDogtuM3Mu6 37Ow== X-Forwarded-Encrypted: i=2; AJvYcCUm2phjMbBSuylBluRgAZKchr4W//FWCkrLv5gLuJwEXn6Sb1c4UDkr1xX5fKVq+qsoNmFL/HS71iugXlqwytCcYaeP5gg= X-Gm-Message-State: AOJu0Yw191JrFWo+WrU3LLn0kOQy48fWN9Yg+hVJQ7ICtd48rYXBKvhB 6PtALgZVu7dpTX0LN9UPCk4lIY3hUNwICXAtvMuNx+8pV6Hi5xJD X-Google-Smtp-Source: AGHT+IEfakBgauO8gApGc/Iat3e227pzA4fCpcQHSRKFmSApmvZrSOl6RngSpIA4ryyu2tRkDV188g== X-Received: by 2002:a4a:924c:0:b0:59d:95eb:15a9 with SMTP id g12-20020a4a924c000000b0059d95eb15a9mr15939307ooh.2.1708508049588; Wed, 21 Feb 2024 01:34:09 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a4a:55d7:0:b0:59c:8811:7841 with SMTP id e206-20020a4a55d7000000b0059c88117841ls5516318oob.2.-pod-prod-05-us; Wed, 21 Feb 2024 01:34:08 -0800 (PST) X-Received: by 2002:a4a:b78b:0:b0:59f:8466:5748 with SMTP id a11-20020a4ab78b000000b0059f84665748mr15389488oop.0.1708508048615; Wed, 21 Feb 2024 01:34:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708508048; cv=none; d=google.com; s=arc-20160816; b=GNmP93nC1Hks9CtuG2yXIRS5i6bbK72rnL/TSgr9fUMT98+664L2LOpKgZKjzxIe0X 3NoWTMtgjBUgKEBIEtyZYSC3illE2RsWWI0NgVgx5UufPas+e/rZnYSnzszP3JuJSoC7 8GFEIH9lCV8D0psj5LJt21szKEEkxXHSJvnZZNK/8WtBYcWVXPeKoMJKIi6KbkzZncK6 C+6BEhE2haIK8CI4M60HscjCfI31g82TjrvJnKqz8mQWsI09XFAhvRLtKaghiYvI9iS4 a/JZRpQQQ/fnkot+msYP+6uWYA08F2TorRMW7/ikpC60DKl5Jk+HGuwQi0GF2IspVA/0 y0Jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:message-id:date :subject:cc:to:from:dkim-signature; bh=UnuLy5PcWRwpiRE0wEcghxLGQFTbs6sMdCVY/ZIygbs=; fh=zL/EebwNdE5BBfZVbopN1yW8at8mU+pAd7TGX5NIkEs=; b=CXtYUyQ8nZRCngYDyFHVVM40psTSkfjOZbB/Sbt4lKFQCkUzVnb4Hp3hWOA7QWKUwt yw4hK+0/ZLfZvM+pWucaLDJjpjTLOWOVBeS7+Fyl8ImUEe5bpuGwfGDLmIB5kRGzn61F 8vEpOKBU+JoxDc72XXTC14cg0y2x7IzGk2scvYFqd0vESnDW6As72FtIOFhgzWSbosNe uRHVZ17qh1ofQRkf8Z33by2LRD2HD+j9OgpYo02heohOhRE95JGYtnAFZBs4FAJ9O8wH 4ZYJsFcMx6fys21HLxj0RUMYURe62CQbbPVTZR3IJlVnvcsp+6vInI9jI74ozmpJMwH1 rTZA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=C1P0DToi; spf=pass (google.com: domain of fm-1321639-202402210934063da11d5b73b1a61f5b-7aubsu@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-1321639-202402210934063da11d5b73b1a61f5b-7AubSU@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id f205-20020a4a58d6000000b0059d6fb96189si1129488oob.0.2024.02.21.01.34.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Feb 2024 01:34:08 -0800 (PST) Received-SPF: pass (google.com: domain of fm-1321639-202402210934063da11d5b73b1a61f5b-7aubsu@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 202402210934063da11d5b73b1a61f5b for ; Wed, 21 Feb 2024 10:34:06 +0100 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: "MOESSBAUER, Felix" To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH 1/1] refactor: use to_boolean when comparing boolean vars Date: Wed, 21 Feb 2024 10:33:54 +0100 Message-Id: <20240221093354.67929-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1321639:519-21489:flowmailer X-Original-Sender: felix.moessbauer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=C1P0DToi; spf=pass (google.com: domain of fm-1321639-202402210934063da11d5b73b1a61f5b-7aubsu@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-1321639-202402210934063da11d5b73b1a61f5b-7AubSU@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Felix Moessbauer Reply-To: Felix Moessbauer Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= When comparing user-defined boolean variables (e.g. ENABLE_), a comparison against the string "0" or "1" is error-prone, as the user might use other strings which also denote True / False. For that, bitbake offers the bb.utils.to_boolean function. This patch refactors all these patterns which are in scope of ISAR. The parts which are copied from OE are not touched, as well as the WIC plugins. Signed-off-by: Felix Moessbauer --- meta-isar/recipes-app/hello/hello.bb | 2 +- meta/classes/base.bbclass | 6 +++--- meta/classes/compat.bbclass | 2 +- meta/classes/crossvars.bbclass | 4 ++-- meta/classes/dpkg-base.bbclass | 6 +++--- meta/classes/imagetypes_container.bbclass | 2 +- meta/classes/imagetypes_wic.bbclass | 4 ++-- meta/classes/multiarch.bbclass | 2 +- meta/classes/patch.bbclass | 4 ++-- meta/classes/sdk.bbclass | 6 +++--- meta/conf/bitbake.conf | 2 +- meta/recipes-bsp/u-boot/u-boot-custom.inc | 4 ++-- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 6 +++--- meta/recipes-devtools/sbuild-chroot/sbuild-chroot-target.bb | 2 +- meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc | 4 ++-- meta/recipes-kernel/kselftest/kselftest.inc | 2 +- meta/recipes-kernel/linux/linux-custom.inc | 2 +- 17 files changed, 30 insertions(+), 30 deletions(-) diff --git a/meta-isar/recipes-app/hello/hello.bb b/meta-isar/recipes-app/hello/hello.bb index acf8ed73..6efb50de 100644 --- a/meta-isar/recipes-app/hello/hello.bb +++ b/meta-isar/recipes-app/hello/hello.bb @@ -15,7 +15,7 @@ SRC_URI = "apt://${PN}" MAINTAINER = "isar-users " CHANGELOG_V = "+isar" -DEB_BUILD_OPTIONS += "${@ 'nocheck' if d.getVar('ISAR_CROSS_COMPILE') == '1' else '' }" +DEB_BUILD_OPTIONS += "${@ 'nocheck' if bb.utils.to_boolean(d.getVar('ISAR_CROSS_COMPILE')) else '' }" do_prepare_build() { deb_add_changelog diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 88004120..529811af 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -181,7 +181,7 @@ def isar_export_proxies(d): variables = ['http_proxy', 'HTTP_PROXY', 'https_proxy', 'HTTPS_PROXY', 'ftp_proxy', 'FTP_PROXY' ] - if d.getVar('BB_NO_NETWORK') == "1": + if bb.utils.to_boolean(d.getVar('BB_NO_NETWORK')): for v in variables: d.setVar(v, deadend_proxy) for v in [ 'no_proxy', 'NO_PROXY' ]: @@ -190,10 +190,10 @@ def isar_export_proxies(d): return bb.utils.export_proxies(d) def isar_export_ccache(d): - if d.getVar('USE_CCACHE') == '1': + if bb.utils.to_boolean(d.getVar('USE_CCACHE')): os.environ['CCACHE_DIR'] = '/ccache' os.environ['PATH_PREPEND'] = '/usr/lib/ccache' - if d.getVar('CCACHE_DEBUG') == '1': + if bb.utils.to_boolean(d.getVar('CCACHE_DEBUG')): os.environ['CCACHE_DEBUG'] = '1' os.environ['CCACHE_DEBUGDIR'] = '/ccache/debug' else: diff --git a/meta/classes/compat.bbclass b/meta/classes/compat.bbclass index f0a23b6b..907c3ce2 100644 --- a/meta/classes/compat.bbclass +++ b/meta/classes/compat.bbclass @@ -31,7 +31,7 @@ python() { def isar_can_build_compat(d): return (d.getVar('COMPAT_DISTRO_ARCH') is not None and - d.getVar('ISAR_ENABLE_COMPAT_ARCH') == '1') + bb.utils.to_boolean(d.getVar('ISAR_ENABLE_COMPAT_ARCH'))) ################################################################################ # package recipe modifications when building *-compat: diff --git a/meta/classes/crossvars.bbclass b/meta/classes/crossvars.bbclass index 828afe46..00326c9a 100644 --- a/meta/classes/crossvars.bbclass +++ b/meta/classes/crossvars.bbclass @@ -9,7 +9,7 @@ python __anonymous() { import pwd d.setVar('SCHROOT_USER', pwd.getpwuid(os.geteuid()).pw_name) - mode = d.getVar('ISAR_CROSS_COMPILE') + mode = bb.utils.to_boolean(d.getVar('ISAR_CROSS_COMPILE')) # support derived schroots flavor = d.getVar('SBUILD_FLAVOR') @@ -22,7 +22,7 @@ python __anonymous() { if distro_arch != host_arch and \ (package_arch == host_arch or \ - (package_arch in [distro_arch, compat_arch, '${BUILD_ARCH}'] and mode == "1")): + (package_arch in [distro_arch, compat_arch, '${BUILD_ARCH}'] and mode)): d.setVar('BUILD_ARCH', host_arch) schroot_dir = d.getVar('SCHROOT_HOST_DIR', False) sbuild_dep = "sbuild-chroot-host" + flavor_suffix + ":do_build" diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index a8263046..43ff0d85 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -15,7 +15,7 @@ inherit essential DEPENDS ?= "" RPROVIDES ?= "${PROVIDES}" -DEPENDS:append:riscv64 = "${@' crossbuild-essential-riscv64' if d.getVar('ISAR_CROSS_COMPILE') == '1' and d.getVar('PN') != 'crossbuild-essential-riscv64' else ''}" +DEPENDS:append:riscv64 = "${@' crossbuild-essential-riscv64' if bb.utils.to_boolean(d.getVar('ISAR_CROSS_COMPILE')) and d.getVar('PN') != 'crossbuild-essential-riscv64' else ''}" DEB_BUILD_PROFILES ?= "" DEB_BUILD_OPTIONS ?= "" @@ -218,7 +218,7 @@ dpkg_runbuild() { def isar_deb_build_profiles(d): deb_build_profiles = d.getVar('DEB_BUILD_PROFILES') - if d.getVar('ISAR_CROSS_COMPILE') == "1": + if bb.utils.to_boolean(d.getVar('ISAR_CROSS_COMPILE')): deb_build_profiles += ' cross' return deb_build_profiles.strip() @@ -313,7 +313,7 @@ python do_devshell() { isar_export_proxies(d) isar_export_ccache(d) isar_export_build_settings(d) - if d.getVar('USE_CCACHE') == '1': + if bb.utils.to_boolean(d.getVar('USE_CCACHE')): bb.build.exec_func('schroot_configure_ccache', d) schroot = d.getVar('SBUILD_CHROOT') diff --git a/meta/classes/imagetypes_container.bbclass b/meta/classes/imagetypes_container.bbclass index c2e84809..7c44350c 100644 --- a/meta/classes/imagetypes_container.bbclass +++ b/meta/classes/imagetypes_container.bbclass @@ -13,7 +13,7 @@ CONTAINER_IMAGE_NAME ?= "${PN}-${DISTRO}-${DISTRO_ARCH}" CONTAINER_IMAGE_TAG ?= "${PV}-${PR}" python() { - if not d.getVar('USING_CONTAINER') == '1': + if not bb.utils.to_boolean(d.getVar('USING_CONTAINER')): return for t in d.getVar('CONTAINER_TYPES').split(): t_clean = t.replace('-', '_').replace('.', '_') diff --git a/meta/classes/imagetypes_wic.bbclass b/meta/classes/imagetypes_wic.bbclass index 4c74f166..bce881ed 100644 --- a/meta/classes/imagetypes_wic.bbclass +++ b/meta/classes/imagetypes_wic.bbclass @@ -5,7 +5,7 @@ # USING_WIC = "${@bb.utils.contains('IMAGE_BASETYPES', 'wic', '1', '0', d)}" -WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if d.getVar('USING_WIC') == '1' else ''}" +WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if bb.utils.to_boolean(d.getVar('USING_WIC')) else ''}" WKS_FILE ??= "sdimage-efi" @@ -16,7 +16,7 @@ do_copy_wks_template () { } python () { - if not d.getVar('USING_WIC') == '1': + if not bb.utils.to_boolean(d.getVar('USING_WIC')): return if d.getVar('WIC_IMAGER_INSTALL'): diff --git a/meta/classes/multiarch.bbclass b/meta/classes/multiarch.bbclass index 48cec9ab..f82e2502 100644 --- a/meta/classes/multiarch.bbclass +++ b/meta/classes/multiarch.bbclass @@ -26,7 +26,7 @@ python() { # and not for the builder architecture depends = d.getVar('DEPENDS') if depends is not None and d.getVar('HOST_ARCH') != d.getVar('DISTRO_ARCH') \ - and d.getVar('ISAR_CROSS_COMPILE') != '1': + and not bb.utils.to_boolean(d.getVar('ISAR_CROSS_COMPILE')): new_deps = [] for dep in depends.split(): if dep.endswith('-native'): diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass index 2337693d..1fa9b1aa 100644 --- a/meta/classes/patch.bbclass +++ b/meta/classes/patch.bbclass @@ -16,7 +16,7 @@ PATCH_GIT_USER_EMAIL ?= "isar.patch@isar" inherit terminal python () { - if d.getVar('PATCHTOOL') == 'git' and d.getVar('PATCH_COMMIT_FUNCTIONS') == '1': + if d.getVar('PATCHTOOL') == 'git' and bb.utils.to_boolean(d.getVar('PATCH_COMMIT_FUNCTIONS')): extratasks = bb.build.tasksbetween('do_unpack', 'do_patch', d) try: extratasks.remove('do_unpack') @@ -65,7 +65,7 @@ python patch_task_postfunc() { if os.path.exists(srcsubdir): if func == 'do_patch': - haspatches = (d.getVar('PATCH_HAS_PATCHES_DIR') == '1') + haspatches = bb.utils.to_boolean(d.getVar('PATCH_HAS_PATCHES_DIR')) patchdir = os.path.join(srcsubdir, 'patches') if os.path.exists(patchdir): shutil.rmtree(patchdir) diff --git a/meta/classes/sdk.bbclass b/meta/classes/sdk.bbclass index 52c3bec5..74c0acb9 100644 --- a/meta/classes/sdk.bbclass +++ b/meta/classes/sdk.bbclass @@ -57,7 +57,7 @@ TAR_TRANSFORM:class-sdk = " --transform='s|rootfs|${IMAGE_FULLNAME}|'" # bitbake dependencies SDKDEPENDS += "sdk-files ${SDK_INSTALL}" -SDKDEPENDS:append:riscv64 = "${@' crossbuild-essential-riscv64' if d.getVar('ISAR_CROSS_COMPILE') == '1' and d.getVar('PN') != 'crossbuild-essential-riscv64' else ''}" +SDKDEPENDS:append:riscv64 = "${@' crossbuild-essential-riscv64' if bb.utils.to_boolean(d.getVar('ISAR_CROSS_COMPILE')) and d.getVar('PN') != 'crossbuild-essential-riscv64' else ''}" DEPENDS:class-sdk = "${SDKDEPENDS}" SDKROOTFSDEPENDS = "" @@ -68,10 +68,10 @@ SDKROOTFSVARDEPS = "" SDKROOTFSVARDEPS:class-sdk = "SDK_INCLUDE_ISAR_APT" do_rootfs_install[vardeps] += "${SDKROOTFSVARDEPS}" -ROOTFS_POSTPROCESS_COMMAND:remove = "${@'rootfs_cleanup_isar_apt' if d.getVar('SDK_INCLUDE_ISAR_APT') == '1' else ''}" +ROOTFS_POSTPROCESS_COMMAND:remove = "${@'rootfs_cleanup_isar_apt' if bb.utils.to_boolean(d.getVar('SDK_INCLUDE_ISAR_APT')) else ''}" # additional SDK steps -ROOTFS_CONFIGURE_COMMAND:append:class-sdk = " ${@'rootfs_configure_isar_apt_dir' if d.getVar('SDK_INCLUDE_ISAR_APT') == '1' else ''}" +ROOTFS_CONFIGURE_COMMAND:append:class-sdk = " ${@'rootfs_configure_isar_apt_dir' if bb.utils.to_boolean(d.getVar('SDK_INCLUDE_ISAR_APT')) else ''}" rootfs_configure_isar_apt_dir() { # Copy isar-apt instead of mounting: sudo cp -Trpfx --reflink=auto ${REPO_ISAR_DIR}/${DISTRO} ${ROOTFSDIR}/isar-apt diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 80dc01c7..91c5c815 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -158,7 +158,7 @@ INHERIT += "isar-events sstate" # Buildstats requires IMAGE_ROOTFS to be always defined IMAGE_ROOTFS ??= "${WORKDIR}/rootfs" -INHERIT += "${@'buildstats' if d.getVar('USE_BUILDSTATS') == '1' else ''}" +INHERIT += "${@'buildstats' if bb.utils.to_boolean(d.getVar('USE_BUILDSTATS')) else ''}" # Default values for ccache USE_CCACHE ??= "0" diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc index f16906ce..25f0e1ef 100644 --- a/meta/recipes-bsp/u-boot/u-boot-custom.inc +++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc @@ -10,9 +10,9 @@ FILESPATH:append := ":${FILE_DIRNAME}/files" DESCRIPTION ?= "Custom U-Boot" PROVIDES += "u-boot-${MACHINE} u-boot-${MACHINE}-dev" -PROVIDES += "${@'u-boot-tools' if d.getVar('U_BOOT_TOOLS_PACKAGE') == '1' else ''}" +PROVIDES += "${@'u-boot-tools' if bb.utils.to_boolean(d.getVar('U_BOOT_TOOLS_PACKAGE')) else ''}" PROVIDES += "${@('u-boot-config u-boot-' + d.getVar('MACHINE') + '-config') \ - if d.getVar('U_BOOT_CONFIG_PACKAGE') == '1' else ''}" + if bb.utils.to_boolean(d.getVar('U_BOOT_CONFIG_PACKAGE')) else ''}" inherit dpkg diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 3477c2fb..4b69332e 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -26,9 +26,9 @@ DEPLOY_ISAR_BOOTSTRAP ?= "" DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales" DISTRO_BOOTSTRAP_BASE_PACKAGES:append:gnupg = ",gnupg" DISTRO_BOOTSTRAP_BASE_PACKAGES:append:https-support = ",ca-certificates" -DISTRO_VARS_PREFIX ?= "${@'HOST_' if d.getVar('BOOTSTRAP_FOR_HOST') == '1' else ''}" -BOOTSTRAP_DISTRO = "${@d.getVar('HOST_DISTRO' if d.getVar('BOOTSTRAP_FOR_HOST') == '1' else 'DISTRO')}" -BOOTSTRAP_BASE_DISTRO = "${@d.getVar('HOST_BASE_DISTRO' if d.getVar('BOOTSTRAP_FOR_HOST') == '1' else 'BASE_DISTRO')}" +DISTRO_VARS_PREFIX ?= "${@'HOST_' if bb.utils.to_boolean(d.getVar('BOOTSTRAP_FOR_HOST')) else ''}" +BOOTSTRAP_DISTRO = "${@d.getVar('HOST_DISTRO' if bb.utils.to_boolean(d.getVar('BOOTSTRAP_FOR_HOST')) else 'DISTRO')}" +BOOTSTRAP_BASE_DISTRO = "${@d.getVar('HOST_BASE_DISTRO' if bb.utils.to_boolean(d.getVar('BOOTSTRAP_FOR_HOST')) else 'BASE_DISTRO')}" FILESEXTRAPATHS:append = ":${BBPATH}" inherit deb-dl-dir diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-target.bb b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-target.bb index ce985df2..1d1bcc5f 100644 --- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-target.bb +++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-target.bb @@ -11,5 +11,5 @@ require sbuild-chroot.inc SBUILD_CHROOT_PREINSTALL ?= " \ ${SBUILD_CHROOT_PREINSTALL_COMMON} \ - ${@' apt-utils' if d.getVar('ISAR_ENABLE_COMPAT_ARCH') == '1' else ''} \ + ${@' apt-utils' if bb.utils.to_boolean(d.getVar('ISAR_ENABLE_COMPAT_ARCH')) else ''} \ " diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc index 2f07de82..d794c6fd 100644 --- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc +++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc @@ -27,7 +27,7 @@ python() { d.appendVar('SBUILD_CHROOT_PREINSTALL_COMMON', ' libstdc++-{}-dev:{}'.format(distro_gcc, distro_arch)) - if d.getVar('ISAR_ENABLE_COMPAT_ARCH') == '1': + if bb.utils.to_boolean(d.getVar('ISAR_ENABLE_COMPAT_ARCH')): compat_arch = d.getVar('COMPAT_DISTRO_ARCH') d.appendVar('SBUILD_CHROOT_COMPAT_PREINSTALL', ' libc6-dev:{}'.format(compat_arch)) @@ -47,7 +47,7 @@ SBUILD_CHROOT_PREINSTALL_COMMON = " \ fakeroot \ build-essential \ debhelper \ - ${@ 'ccache' if d.getVar('USE_CCACHE') == '1' else ''} \ + ${@ 'ccache' if bb.utils.to_boolean(d.getVar('USE_CCACHE')) else ''} \ devscripts \ equivs \ " diff --git a/meta/recipes-kernel/kselftest/kselftest.inc b/meta/recipes-kernel/kselftest/kselftest.inc index 8e961e72..6196f825 100644 --- a/meta/recipes-kernel/kselftest/kselftest.inc +++ b/meta/recipes-kernel/kselftest/kselftest.inc @@ -44,7 +44,7 @@ KSELFTEST_SKIP_TARGETS ?= "" KSELFTEST_FORCE_TARGETS ?= "0" KSELFTEST_ARGS = "${@ "TARGETS=\"${KSELFTEST_TARGETS}\"" if d.getVar('KSELFTEST_TARGETS') else ''}" -KSELFTEST_ARGS .= "${@ " FORCE_TARGETS=1" if d.getVar('KSELFTEST_FORCE_TARGETS') == '1' else ''}" +KSELFTEST_ARGS .= "${@ " FORCE_TARGETS=1" if bb.utils.to_boolean(d.getVar('KSELFTEST_FORCE_TARGETS')) else ''}" KSELFTEST_ARGS .= "${@ " SKIP_TARGETS=\"${KSELFTEST_SKIP_TARGETS}\"" if d.getVar('KSELFTEST_SKIP_TARGETS') else ''}" do_prepare_build[cleandirs] += "${S}/debian" diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc index 876397c3..91e9b5ff 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc +++ b/meta/recipes-kernel/linux/linux-custom.inc @@ -139,7 +139,7 @@ def config_fragments(d): def get_additional_build_profiles(d): profiles = d.getVar('BASE_DISTRO') - if d.getVar('KERNEL_LIBC_DEV_DEPLOY') != '1': + if not bb.utils.to_boolean(d.getVar('KERNEL_LIBC_DEV_DEPLOY')): profiles += ' nolibcdev' return profiles