From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7205104225163935744 X-Received: by 2002:a2e:a378:0:b0:295:a82e:ec06 with SMTP id i24-20020a2ea378000000b00295a82eec06mr468733ljn.3.1677569054382; Mon, 27 Feb 2023 23:24:14 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:4024:b0:4dd:8403:13fe with SMTP id br36-20020a056512402400b004dd840313fels1802251lfb.3.-pod-prod-gmail; Mon, 27 Feb 2023 23:24:12 -0800 (PST) X-Google-Smtp-Source: AK7set9KzImqQuCdyZzYW2DycLl54euIFe/ULVBcDEDKOvd+ppjzWCl5HHnUiO35QePqETa+XBY9 X-Received: by 2002:ac2:51a6:0:b0:4b5:3621:7ecb with SMTP id f6-20020ac251a6000000b004b536217ecbmr338155lfk.63.1677569052509; Mon, 27 Feb 2023 23:24:12 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1677569052; cv=pass; d=google.com; s=arc-20160816; b=DtU5OTuKm9X0cot/rQKaMqUoL7L7P6JCkHta1gfiKiojNtSpn8imCnFbei6BW7YvU3 +kizDIQtQwx0E4nfAdQ3FcReZeOIsxN2hfb3kRaf+QMsSxNLtsxsZqAztVJz5Q02rdSr BnT1eBRaZA+6P2gU+RnoylFL6+uvezYpLn283sm/vDj76SHp0AUCsytSw91ZyFyQ+mvu MKbW1Cpm+D48wRCTI65ctyBoxisEPuhQGXLcdUR68ywHWemwmELrmMNADUf4AHBZJWYi SNdwwAo/Xg4vyLoU9iakykd8wwZ/NY/UHXeJasgit2zOnkiIAQQnLjuVKCnRql0qpI+b w6Og== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:cc:to:content-language :subject:from:user-agent:date:message-id:dkim-signature; bh=t4bhC/0PnNoT7j36JQmzrzk/lXuW13ScxcMXh3A6Zg4=; b=ifs2NAvQ8/dM9nYWH1/iV6dowNspHoAzckWLY5vjnDDTApQDiLSU164gX3gwudyrnd +QwwBQpmm+Mr3yu1+1CUaWsWmbWuZ6dKs/5dHP9IvEzYFZ9x6v39Iyot5h/+IKZZ4XRH 7vEB5WggJEfWOQmKwqsN83CRmk7dfAW+vM6aDQyUegEc7BSxzYMnXQrgPqmFBHNrBdla l7xl4MYgDbGLM8Ua7eS9Ym1qxHnrirpWTn6YQuJEXhalAMiGWCfVypBFByfnqbyiCWsS Q5Okni7ZJHXDrJ2pSKrS5l0UDg0Ny0eneJw7FjSZo0NhvNnLK4hEnT04kysxudql1Yv9 1bAw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=iIV4kSuV; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:7eaf::62a as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2062a.outbound.protection.outlook.com. [2a01:111:f400:7eaf::62a]) by gmr-mx.google.com with ESMTPS id w41-20020a0565120b2900b004dd84067a4asi386817lfu.4.2023.02.27.23.24.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Feb 2023 23:24:12 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:7eaf::62a as permitted sender) client-ip=2a01:111:f400:7eaf::62a; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=iIV4kSuV; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:7eaf::62a as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n03iZz2S8lNnztvev2lQnS1jw6Lt5xlj7uY0sJMQhIXFLr0uVtTtVRxfPjcbHJ3Sxb9ES5cXf+2rtiovMOWgjwHCnyVvJt1W7oeh9TQU9tioHIL1EosfryUwSvBqNSbg0AlWKapRbASLn4WrNHyTFi8yzHNv78Ikwux93Qc1T1xu3fSVKKgmkzwlzPxxITtmDf9WsT93eHkd5xRDIjemL4Xo5c6oELjxOVdC8xLxXWfMNcdFJkmAcVRnhQkKDTRf66WK/Mi6ygfH7Tuw4GwdbDCAklW5pEPfKbfyfHbBmYNaJjEdnYmrGV6xwum5Tjf85iHWe/Uzf7h0Go3gkuCYqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=t4bhC/0PnNoT7j36JQmzrzk/lXuW13ScxcMXh3A6Zg4=; b=nGQGCHAh1zuhlJ6OttuARwobsrSTcPdiz/qO9yBT18244PRhPfyOcZXpRTAK7OmZMLnsnjO4JssbJ8+gZikRdfCKtpM0+xfb9b2P9ldEys9lYy0iCOsYuzOie7FcZaByzXlXjm8eUMDfUrLXlBUiRV27n3R8YaovXIXTs/8xfJTL2Obqhfujo7inuHoLfDmcMCnjcf1cWldUTkvvXhqp7cOw8yh5IO2w+lTxMt74f9RJoAXIJXZvyXMs0Ov3DfQGov4adTBU3yg/BLDW0UaP8Ks7R3+jOjzRp5yqVzF1QiGRN/8qwljX4mCJ4a6Y5gMpk/2jtg1X/PV7H+7ofsiijg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=t4bhC/0PnNoT7j36JQmzrzk/lXuW13ScxcMXh3A6Zg4=; b=iIV4kSuVkrrVnFdvh9NjwOXETUjk6fWuv3LcnUcBOmU756Qk8q2NzBZK44YCBJEpAYgjTrleCNkvncd0iQ5N45IZyAf9pHqcIMyl2646g2NCtRQkt4Nb9Nnv3pp4e6rMnVDL3Djnpit46wuMrfG1KmakPAse7vYr7Xj1UhqcxfFcUo075wDWx/l0wAsOzBYbstoglwnmXSY3u9YXbKMcRV2BxqNsYk6Vl4tencSgp49gO44Zi+VDLspLlURIbLqN7sPqSEpMJs+o21bEWTiMfILD/2dl9RF6hclADJ/aqpDESl8KW/IF0EkFXF56IlNx8yiOLJm18GYAlhp9Ue1+LA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) by AS4PR10MB5248.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:4b7::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29; Tue, 28 Feb 2023 07:24:09 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::784b:e95b:b855:dcc5]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::784b:e95b:b855:dcc5%9]) with mapi id 15.20.6134.030; Tue, 28 Feb 2023 07:24:09 +0000 Message-ID: <2c213737-daca-5546-4d2a-d358d1dffbec@siemens.com> Date: Tue, 28 Feb 2023 08:24:07 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 From: Jan Kiszka Subject: [PATCH] Drop redundant expand=True parameter from getVar Content-Language: en-US To: isar-users Cc: Cedric Hombourger Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR2P281CA0066.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:93::10) To AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) Return-Path: jan.kiszka@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR10MB6181:EE_|AS4PR10MB5248:EE_ X-MS-Office365-Filtering-Correlation-Id: f399fae7-2ff0-4098-912e-08db195cc87c X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: klGWhmUemXv8CJpWNwjnOWX1VU9unQZfEVvM4BVTsK6/FU+xBSwqwIcR+5z5VIf+swc5ozM6wi+bacUQPEgpnZdeeObEd4lVDCECFdlQwiYX2ufivsby1dps8SIU2Jf9cMq9pOjMx5fiA03EgpBnUEl7iGC6sO+SghKaYkIb1WesDk/fAY6vjtnWi1SEwjRZyKVueBk+J93Z8NXajuVpVv1QG2PYzDLmINXiPaB2G/5AYV6yCldkHsy7MYa8T/m0gI6i6UodztNLJ9I5u5rMVYB2Ft9CGD1BOblFxVt/CHydIWUOdZwApGHaCzwqqHMN7LdTYtuGWEOS7T2t3SMv6Ms8niaUmGG5yNvXaph3nbEmVs30GoeCX4tU48W54Zyb14EDnxEk0xNXemS7MApmabhmxtVRkV7SE3+UFo+AJsEJ13EF0eKk2JbUp4imzYII+MOuHahd7Oou+ux4dp5KPltV3JbyoLFh7vJAUi/JsN/Pa5a1nM7dswbvgEUxHAoSeedmmx6ophfrkc1VRDRL+0fOwYnwpalwG+CDMZwQgZbequ/jnL9jb2mJKsF097EjFcVkLBlOlzXl1FMdk9SumbGYhYGEOY432cVq6NzjF+UiDpKyAVO1sKAO5slwItavLRqoVIr6EWcdgpmBLK3Va3qnuWAuc5T1nOCmUhSo9k4xylSGGbF9XmuHuF3P8PH6pLdbiqHYkS0EVooFIWS5++11a2ReECk7WH/1O5JeNl8E1fuEiXDOGtR4ODQzD1aOwe5kpUWoA6urzmPK/TcPglyouTtWamSKTW/SAaR4suM= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230025)(4636009)(136003)(396003)(39860400002)(376002)(366004)(346002)(451199018)(38100700002)(31686004)(2906002)(82960400001)(44832011)(66899018)(30864003)(5660300002)(83380400001)(8936002)(2616005)(316002)(86362001)(6486002)(66476007)(66556008)(6512007)(6916009)(26005)(66946007)(41300700001)(8676002)(4326008)(186003)(478600001)(31696002)(36756003)(6506007)(403724002)(45980500001)(43740500002)(473944003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ajZzM0ZkOW1iNTd0czdYSTM4Z3JzRmFIY0dDc0RZY1FrQWZVaTgwOS9ha3Zw?= =?utf-8?B?ZkY2NzJiYTJSSWliNGN5L00wWkZ4bzRMUTdRV3JFLy9IVW84MEVacDl4RzY3?= =?utf-8?B?ZGoyZVVGRXZ0SWpjZnpGSnRBSE5xSGcwTVdBcFVYa2s0STZnMkxPWWZnbjBK?= =?utf-8?B?bWZxMVNZMDNKVXArODVZY05uUzd3bWhvMUhDQWIvdEZkMGdKQ2VjeUJpcTF1?= =?utf-8?B?VkswbWtIcE5lUUZzaTU1OWovY1I2c25LLy93cFhLSHlVUDdpMklPMmpQV1hm?= =?utf-8?B?a2lMN3EzNnBLbEt5Ym5RbFhDRytnZHhNZHRLcSt1ajNPK1FlbktnUzAyRGpC?= =?utf-8?B?OVF5ZWFFUmc5ME9VT0xWcU5oUWJidTY3WnNxVlZYQlV2NGJiUEpKaUVQRUVC?= =?utf-8?B?YmIzRjAzb1hnQlVhblR5LzY0aU8wU3hRVjhQTzg4Z1N1NnR6NzlneVBmV2lE?= =?utf-8?B?eG5wZ2hFL2QwUVVQaXBLUWVvUnBlUXVNS3JaWFBvZjd1eGptVnd3bVJzRVpv?= =?utf-8?B?YVEvbDJQS2RqYmFSSks0K3hMUU1MVjNoR0VJSkkwVWsvNmtGVitBU2czUUw4?= =?utf-8?B?R0JnbU1lYncxUzR5WjZ4Tndldzl3bDJMa2RRRENva2tzRmVINERPQ3hYbkk2?= =?utf-8?B?NWIyK0pkMGZGSmJwNi9PZGFqMmgyLzhXbTI1Tk9VZHJLRFV2VnZQWC9lalMz?= =?utf-8?B?SDUyTWxqWG5yRzErdDVpdjRBVGVDUTFxbmxsemVKUFB1cVlZcGhvbzJrSFJJ?= =?utf-8?B?U0hPbGtuZEpGZ0ZiamNlZStHN1U4SU43MlpqMlE2bUZnMHhoc2FsVFRiZDlO?= =?utf-8?B?MTF3dWM4R1dGLzJWN1Jxb0YwSHh5eDA0aXRUTnNHNmZydWplTGE0R2dEcnFL?= =?utf-8?B?aW5HL3ZpOVdBbjFJWGJFYzdIV0NRSC9sSUpkQWNnL1M1RGF6RGtjbnZoUXY4?= =?utf-8?B?M3d5OGlnUElpdzNwcVFMNzgrVjZvam1NbUgrYUhnTjdTaUtSNUlxYXVlUUU3?= =?utf-8?B?ODZkZHBiaUpEQTRPdzUxNzljMityckVsTXVVWGl6M2FUd3h2Vzc4Ui9wTCtM?= =?utf-8?B?cHhiclQzNUZUblorNmwwRkIzQno2ZVd3UUVwZUZtbVg1SzRRSzNoOGtzWmww?= =?utf-8?B?WEtQQUhuelF4M3ZVYUZSdURTQU42cEJBQzRkRVdXOTVDNFRNa3lVc1J0Rmcx?= =?utf-8?B?NTFxeXNaSW9hVGJqOWdYeXNGOFoxazlJR3pZUG9qZXBxMDJyemI4dk13eEVt?= =?utf-8?B?ZkkrQWIrNUd0R0drWWhZZGMwenFLUENkMDRiUmdHelBBdWhZM01VTllXdXRH?= =?utf-8?B?d1dDcFNLTXV0VUQwN2hiZ214ckhBekNCcWlpZWFYeTZrNHRKcWx6b1JJZ280?= =?utf-8?B?akVFR01CMjAvTDNpSURub0VMck84VlpyTWsvV1VyZmY4THJGeEM1aXBkdWpk?= =?utf-8?B?QittYi90NUczb3Z3TTNSRnpPU2FwOXBaOW94TTRXZWVyaTNJUWoyd0dDM1Nj?= =?utf-8?B?VmxZcXQ2dTdyeTZMTC9yd3BGRWkyYkRsOXl1NW8yOGNldmViWlViUThxWnBD?= =?utf-8?B?NENUblR3bnRJWlRCekxkSkdqVTdPdzU0d2NRa1JGdEc1N09BQldyV2tPckVk?= =?utf-8?B?aFZPSG1LREV4alQxWFN0MDZVSG1pd203cTQ0SWQ0UGJia3dBWnFjYUV2U3R2?= =?utf-8?B?SVdlcEwrL21BVnVpVkM4YkY0MHlIcEZlZXllamNySFAveXhtbW9WRXlqTkRN?= =?utf-8?B?MjF4K0lyTVFnenNnVTZud1FxL2RPajNTY2t2SW9iM0xtZjdXTldHb05TcGN6?= =?utf-8?B?WTJXYnFNaGVWeFl1NGdGWmVMYWFoZzdzQS95Zzd6QTd0eHhva241cWNNQ01u?= =?utf-8?B?cityMi9GWkttbXhzdDYxZ0Q3LzJmencrZ3hCRDk1dDlkWGh0clo4OXBBUkk4?= =?utf-8?B?MDR1WE0raXZXN2wvUUQvK1ZDR0srV2gzVHJtK0dsOGxtSEt6Q3ZoT05JQy9T?= =?utf-8?B?bHFibG1oMy9UbGN1bTVmTDVwbU1qd2gxQ0V2NDVnNmpaOW9CTUwrMjZrWUZ5?= =?utf-8?B?Q21WbnVtM0l4MjZxK3RTbVBQOFh4OUFPVU9VSmd5NVlGUjVGM2NnMFB2UVpk?= =?utf-8?B?bHcxQ09odi8vYXdreXBJcVFaRE5LQmxZMVNHU1JXYjlZM3lRSVo2dTZObGlR?= =?utf-8?B?TWc9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: f399fae7-2ff0-4098-912e-08db195cc87c X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Feb 2023 07:24:09.5443 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: R2vLqGS3wNLNY/W1rLTyUZc/g0wIa7F325P2XDY71tlXW5sCd8rAcx0Y3mmptFU3NnzlDI7dZSlT9b1htaaCCw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR10MB5248 X-TUID: h2JWOQ+E+1Su From: Jan Kiszka It is long True by default, but people keep adding new cases of this redundancy. Fix at least the existing ones via for f in $(git ls-tree --name-only -r HEAD meta*); do sed -i "s/\(getVar([^,]*\), True)/\1)/g" $f; done Signed-off-by: Jan Kiszka --- Please double-check that I all conversions are correct and that I didn't touch any file that is supposed to stay in sync with OE (I don't think so). meta-isar/recipes-app/hello/hello.bb | 2 +- meta/classes/base.bbclass | 20 ++++++------- meta/classes/buildchroot.bbclass | 2 +- meta/classes/dpkg-base.bbclass | 20 ++++++------- meta/classes/dpkg.bbclass | 4 +-- meta/classes/image-account-extension.bbclass | 6 ++-- meta/classes/image-locales-extension.bbclass | 4 +-- meta/classes/image-tools-extension.bbclass | 2 +- meta/classes/image.bbclass | 10 +++---- meta/classes/imagetypes_wic.bbclass | 18 ++++++------ meta/classes/initramfs.bbclass | 2 +- meta/classes/isar-events.bbclass | 2 +- meta/classes/rootfs.bbclass | 4 +-- meta/classes/sbuild.bbclass | 2 +- meta/classes/sdk.bbclass | 6 ++-- meta/classes/template.bbclass | 8 +++--- .../isar-bootstrap/isar-bootstrap.inc | 28 +++++++++---------- meta/recipes-kernel/kselftest/kselftest.inc | 6 ++-- meta/recipes-kernel/linux/linux-custom.inc | 14 +++++----- meta/recipes-kernel/linux/linux-distro.bb | 10 +++---- 20 files changed, 85 insertions(+), 85 deletions(-) diff --git a/meta-isar/recipes-app/hello/hello.bb b/meta-isar/recipes-app/hello/hello.bb index 53d28e8f..acf8ed73 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', True) == '1' else '' }" +DEB_BUILD_OPTIONS += "${@ 'nocheck' if d.getVar('ISAR_CROSS_COMPILE') == '1' else '' }" do_prepare_build() { deb_add_changelog diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 88e173d8..53550ae2 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -18,7 +18,7 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -THISDIR = "${@os.path.dirname(d.getVar('FILE', True))}" +THISDIR = "${@os.path.dirname(d.getVar('FILE'))}" FILESPATH = "${@base_set_filespath(["${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}"], d)}" OE_IMPORTS += "os sys time oe.path oe.patch oe.sstatesig oe.utils" @@ -71,7 +71,7 @@ do_showdata[nostamp] = "1" python do_showdata() { for e in d.keys(): if d.getVarFlag(e, 'python'): - code = d.getVar(e, True) + code = d.getVar(e) if code.startswith("def"): bb.plain("\n" + code + "\n") else: @@ -103,9 +103,9 @@ python do_listtasks() { } root_cleandirs() { - ROOT_CLEANDIRS_DIRS_PY="${@d.getVar("ROOT_CLEANDIRS_DIRS", True) or ""}" + ROOT_CLEANDIRS_DIRS_PY="${@d.getVar("ROOT_CLEANDIRS_DIRS") or ""}" ROOT_CLEANDIRS_DIRS="${ROOT_CLEANDIRS_DIRS-${ROOT_CLEANDIRS_DIRS_PY}}" - TMPDIR_PY="${@d.getVar("TMPDIR", True) or ""}" + TMPDIR_PY="${@d.getVar("TMPDIR") or ""}" TMPDIR="${TMPDIR-${TMPDIR_PY}}" for i in $ROOT_CLEANDIRS_DIRS; do awk '{ print $2 }' /proc/mounts | grep -q "^${i}\(/\|\$\)" && \ @@ -125,7 +125,7 @@ python() { if flags and flags.get('task'): rcleandirs = flags.get('root_cleandirs') if rcleandirs: - tmpdir = os.path.normpath(d.getVar("TMPDIR", True)) + tmpdir = os.path.normpath(d.getVar("TMPDIR")) rcleandirs = list( os.path.normpath(d.expand(i)) for i in rcleandirs.split() ) @@ -187,7 +187,7 @@ do_fetch[network] = "${TASK_USE_NETWORK}" # Fetch package from the source link python do_fetch() { - src_uri = (d.getVar('SRC_URI', True) or "").split() + src_uri = (d.getVar('SRC_URI') or "").split() if len(src_uri) == 0: return @@ -204,11 +204,11 @@ do_unpack[dirs] = "${WORKDIR}" # Unpack package and put it into working directory python do_unpack() { - src_uri = (d.getVar('SRC_URI', True) or "").split() + src_uri = (d.getVar('SRC_URI') or "").split() if len(src_uri) == 0: return - rootdir = d.getVar('WORKDIR', True) + rootdir = d.getVar('WORKDIR') try: fetcher = bb.fetch2.Fetch(src_uri, d) @@ -236,7 +236,7 @@ python do_clean() { import subprocess import glob - for f in (d.getVar('CLEANFUNCS', True) or '').split(): + for f in (d.getVar('CLEANFUNCS') or '').split(): bb.build.exec_func(f, d) workdir = d.expand("${WORKDIR}") @@ -257,7 +257,7 @@ python do_cleansstate() { addtask cleanall after do_cleansstate do_cleanall[nostamp] = "1" python do_cleanall() { - src_uri = (d.getVar('SRC_URI', True) or "").split() + src_uri = (d.getVar('SRC_URI') or "").split() if len(src_uri) == 0: return diff --git a/meta/classes/buildchroot.bbclass b/meta/classes/buildchroot.bbclass index 5abd533b..048d3249 100644 --- a/meta/classes/buildchroot.bbclass +++ b/meta/classes/buildchroot.bbclass @@ -7,7 +7,7 @@ ISAR_CROSS_COMPILE ??= "0" # Choose the correct buildchroot: host or target python __anonymous() { - mode = d.getVar('ISAR_CROSS_COMPILE', True) + mode = d.getVar('ISAR_CROSS_COMPILE') distro_arch = d.getVar('DISTRO_ARCH') if mode == "0" or d.getVar('HOST_ARCH') == distro_arch: dep = "buildchroot-target:do_build" diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index ad28f7b3..44e2e694 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -13,7 +13,7 @@ inherit deb-dl-dir DEPENDS ?= "" RPROVIDES ?= "${PROVIDES}" -DEPENDS:append:riscv64 = "${@' crossbuild-essential-riscv64' if d.getVar('ISAR_CROSS_COMPILE', True) == '1' and d.getVar('PN') != 'crossbuild-essential-riscv64' else ''}" +DEPENDS:append:riscv64 = "${@' crossbuild-essential-riscv64' if d.getVar('ISAR_CROSS_COMPILE') == '1' and d.getVar('PN') != 'crossbuild-essential-riscv64' else ''}" DEB_BUILD_PROFILES ?= "" DEB_BUILD_OPTIONS ?= "" @@ -22,7 +22,7 @@ ISAR_APT_REPO ?= "deb [trusted=yes] file:///home/builder/${PN}/isar-apt/${DISTRO python do_adjust_git() { import subprocess - rootdir = d.getVar('WORKDIR', True) + rootdir = d.getVar('WORKDIR') git_link = os.path.join(d.getVar('GIT_DL_LINK_DIR'), '.git-downloads') dl_dir = d.getVar("DL_DIR") @@ -34,7 +34,7 @@ python do_adjust_git() { if not os.path.exists(git_link): os.symlink(git_dl, git_link) - for src_uri in (d.getVar("SRC_URI", True) or "").split(): + for src_uri in (d.getVar("SRC_URI") or "").split(): try: fetcher = bb.fetch2.Fetch([src_uri], d) ud = fetcher.ud[src_uri] @@ -161,8 +161,8 @@ do_cleanall_apt() { } def get_package_srcdir(d): - s = os.path.abspath(d.getVar("S", True)) - workdir = os.path.abspath(d.getVar("WORKDIR", True)) + s = os.path.abspath(d.getVar("S")) + workdir = os.path.abspath(d.getVar("WORKDIR")) if os.path.commonpath([s, workdir]) == workdir: if s == workdir: bb.warn('S is not a subdir of WORKDIR debian package operations' + @@ -202,13 +202,13 @@ dpkg_runbuild() { } def isar_deb_build_profiles(d): - deb_build_profiles = d.getVar('DEB_BUILD_PROFILES', True) - if d.getVar('ISAR_CROSS_COMPILE', True) == "1": + deb_build_profiles = d.getVar('DEB_BUILD_PROFILES') + if d.getVar('ISAR_CROSS_COMPILE') == "1": deb_build_profiles += ' cross' return deb_build_profiles.strip() def isar_deb_build_options(d): - deb_build_options = d.getVar('DEB_BUILD_OPTIONS', True) + deb_build_options = d.getVar('DEB_BUILD_OPTIONS') return deb_build_options.strip() # use with caution: might contaminate multiple tasks @@ -294,8 +294,8 @@ python do_devshell() { schroot = d.getVar('SBUILD_CHROOT') isar_apt = d.getVar('ISAR_APT_REPO') - pkg_arch = d.getVar('PACKAGE_ARCH', True) - build_arch = d.getVar('SBUILD_HOST_ARCH', True) + pkg_arch = d.getVar('PACKAGE_ARCH') + build_arch = d.getVar('SBUILD_HOST_ARCH') pp_pps = os.path.join(d.getVar('PP'), d.getVar('PPS')) debdistroname = d.getVar('DEBDISTRONAME') diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index d5285032..4d17cb4d 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -13,8 +13,8 @@ SBUILD_PASSTHROUGH_ADDITIONS ?= "" def expand_sbuild_pt_additions(d): cmds = '' - for var in d.getVar('SBUILD_PASSTHROUGH_ADDITIONS', True).split(): - varval = d.getVar(var, True) + for var in d.getVar('SBUILD_PASSTHROUGH_ADDITIONS').split(): + varval = d.getVar(var) if varval != None: cmds += 'sbuild_export ' + var + ' "' + varval + '"\n' return cmds diff --git a/meta/classes/image-account-extension.bbclass b/meta/classes/image-account-extension.bbclass index cbc20a25..1a1f704d 100644 --- a/meta/classes/image-account-extension.bbclass +++ b/meta/classes/image-account-extension.bbclass @@ -28,7 +28,7 @@ GROUPS ??= "" def gen_accounts_array(d, listname, entryname, flags, verb_flags=None): from itertools import chain - entries = (d.getVar(listname, True) or "").split() + entries = (d.getVar(listname) or "").split() return " ".join( ":".join( chain( @@ -62,7 +62,7 @@ ROOTFS_POSTPROCESS_COMMAND += "image_postprocess_accounts" image_postprocess_accounts() { # Create groups # Add space to the end of the list: - list='${@" ".join(d.getVar('IMAGE_ACCOUNTS_GROUPS', True).split())} ' + list='${@" ".join(d.getVar('IMAGE_ACCOUNTS_GROUPS').split())} ' while true; do # Pop first group entry: list_rest="${list#*:*:* }" @@ -125,7 +125,7 @@ image_postprocess_accounts() { done # Create users - list='${@" ".join(d.getVar('IMAGE_ACCOUNTS_USERS', True).split())} ' + list='${@" ".join(d.getVar('IMAGE_ACCOUNTS_USERS').split())} ' while true; do # Pop first user entry: list_rest="${list#*:*:*:*:*:*:*:*:*:*:* }" diff --git a/meta/classes/image-locales-extension.bbclass b/meta/classes/image-locales-extension.bbclass index 65b9ac80..b48bcec8 100644 --- a/meta/classes/image-locales-extension.bbclass +++ b/meta/classes/image-locales-extension.bbclass @@ -11,13 +11,13 @@ LOCALE_GEN ?= "en_US.UTF-8 UTF-8\n\ LOCALE_DEFAULT ?= "en_US.UTF-8" def get_locale_gen(d, sep='\n'): - locale_gen = d.getVar("LOCALE_GEN", True) or "" + locale_gen = d.getVar("LOCALE_GEN") or "" return sep.join(sorted(set(i.strip() for i in locale_gen.split('\\n') if i.strip()))) def get_nopurge(d): - locale_gen = d.getVar("LOCALE_GEN", True) or "" + locale_gen = d.getVar("LOCALE_GEN") or "" return '\n'.join(sorted(set(i.strip() for j in locale_gen.split('\\n') if j.strip() diff --git a/meta/classes/image-tools-extension.bbclass b/meta/classes/image-tools-extension.bbclass index 2d3dda4f..7c84505f 100644 --- a/meta/classes/image-tools-extension.bbclass +++ b/meta/classes/image-tools-extension.bbclass @@ -16,7 +16,7 @@ do_install_imager_deps[deptask] = "do_deploy_deb" do_install_imager_deps[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" do_install_imager_deps[network] = "${TASK_USE_NETWORK_AND_SUDO}" do_install_imager_deps() { - if [ -z "${@d.getVar("IMAGER_INSTALL", True).strip()}" ]; then + if [ -z "${@d.getVar("IMAGER_INSTALL").strip()}" ]; then exit fi diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index ef7d5a2a..8390cad0 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -10,10 +10,10 @@ STAMPCLEAN = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}/*-*" SSTATE_MANIFESTS = "${TMPDIR}/sstate-control/${MACHINE}-${DISTRO}-${DISTRO_ARCH}" IMAGE_INSTALL ?= "" -IMAGE_FSTYPES ?= "${@ d.getVar("IMAGE_TYPE", True) if d.getVar("IMAGE_TYPE", True) else "ext4"}" +IMAGE_FSTYPES ?= "${@ d.getVar("IMAGE_TYPE") if d.getVar("IMAGE_TYPE") else "ext4"}" IMAGE_ROOTFS ?= "${WORKDIR}/rootfs" -KERNEL_IMAGE_PKG ??= "${@ ("linux-image-" + d.getVar("KERNEL_NAME", True)) if d.getVar("KERNEL_NAME", True) else ""}" +KERNEL_IMAGE_PKG ??= "${@ ("linux-image-" + d.getVar("KERNEL_NAME")) if d.getVar("KERNEL_NAME") else ""}" IMAGE_INSTALL += "${KERNEL_IMAGE_PKG}" # Name of the image including distro&machine names @@ -56,7 +56,7 @@ python(){ } def cfg_script(d): - cf = d.getVar('DISTRO_CONFIG_SCRIPT', True) or '' + cf = d.getVar('DISTRO_CONFIG_SCRIPT') or '' if cf: return 'file://' + cf return '' @@ -100,10 +100,10 @@ ROOTFS_EXTRA ?= "64" def get_rootfs_size(d): import subprocess - rootfs_extra = int(d.getVar("ROOTFS_EXTRA", True)) + rootfs_extra = int(d.getVar("ROOTFS_EXTRA")) output = subprocess.check_output( - ["sudo", "du", "-xs", "--block-size=1k", d.getVar("IMAGE_ROOTFS", True)] + ["sudo", "du", "-xs", "--block-size=1k", d.getVar("IMAGE_ROOTFS")] ) base_size = int(output.split()[0]) diff --git a/meta/classes/imagetypes_wic.bbclass b/meta/classes/imagetypes_wic.bbclass index b0b27a9b..5be53f60 100644 --- a/meta/classes/imagetypes_wic.bbclass +++ b/meta/classes/imagetypes_wic.bbclass @@ -24,7 +24,7 @@ python () { wks_full_path = None - wks_file = d.getVar('WKS_FILE', True) + wks_file = d.getVar('WKS_FILE') if not wks_file: bb.fatal("WKS_FILE must be set") if not wks_file.endswith('.wks') and not wks_file.endswith('.wks.in'): @@ -34,10 +34,10 @@ python () { if os.path.exists(wks_file): wks_full_path = wks_file else: - bbpaths = d.getVar('BBPATH', True).split(':') + bbpaths = d.getVar('BBPATH').split(':') corebase_paths = bbpaths - corebase = d.getVar('COREBASE', True) + corebase = d.getVar('COREBASE') if corebase is not None: corebase_paths.append(corebase) @@ -110,24 +110,24 @@ WICVARS += "\ WICVARS += "DISTRO DISTRO_ARCH" python do_rootfs_wicenv () { - wicvars = d.getVar('WICVARS', True) + wicvars = d.getVar('WICVARS') if not wicvars: return - stdir = d.getVar('STAGING_DIR', True) - outdir = os.path.join(stdir, d.getVar('MACHINE', True), 'imgdata') + stdir = d.getVar('STAGING_DIR') + outdir = os.path.join(stdir, d.getVar('MACHINE'), 'imgdata') bb.utils.mkdirhier(outdir) - basename = d.getVar('IMAGE_BASENAME', True) + basename = d.getVar('IMAGE_BASENAME') with open(os.path.join(outdir, basename) + '.env', 'w') as envf: for var in wicvars.split(): - value = d.getVar(var, True) + value = d.getVar(var) if value: envf.write('{}="{}"\n'.format(var, value.strip())) # this part is stolen from OE ./meta/recipes-core/meta/wic-tools.bb with open(os.path.join(outdir, "wic-tools.env"), 'w') as envf: for var in ('RECIPE_SYSROOT_NATIVE', 'STAGING_DATADIR', 'STAGING_LIBDIR'): - envf.write('{}="{}"\n'.format(var, d.getVar(var, True).strip())) + envf.write('{}="{}"\n'.format(var, d.getVar(var).strip())) } diff --git a/meta/classes/initramfs.bbclass b/meta/classes/initramfs.bbclass index a5141a53..460ae652 100644 --- a/meta/classes/initramfs.bbclass +++ b/meta/classes/initramfs.bbclass @@ -14,7 +14,7 @@ INITRAMFS_ROOTFS ?= "${WORKDIR}/rootfs" INITRAMFS_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${INITRAMFS_FULLNAME}.initrd.img" # Install proper kernel -INITRAMFS_INSTALL += "${@ ("linux-image-" + d.getVar("KERNEL_NAME", True)) if d.getVar("KERNEL_NAME", True) else ""}" +INITRAMFS_INSTALL += "${@ ("linux-image-" + d.getVar("KERNEL_NAME")) if d.getVar("KERNEL_NAME") else ""}" # Name of the initramfs including distro&machine names INITRAMFS_FULLNAME = "${PN}-${DISTRO}-${MACHINE}" diff --git a/meta/classes/isar-events.bbclass b/meta/classes/isar-events.bbclass index f52b2349..4f3c87dd 100644 --- a/meta/classes/isar-events.bbclass +++ b/meta/classes/isar-events.bbclass @@ -45,7 +45,7 @@ addhandler build_completed python build_completed() { import subprocess - tmpdir = d.getVar('TMPDIR', True) + tmpdir = d.getVar('TMPDIR') if not tmpdir: return diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index 0eed3d02..784793b5 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -182,8 +182,8 @@ do_rootfs_install[depends] = "isar-bootstrap-${@'target' if d.getVar('ROOTFS_ARC do_rootfs_install[recrdeptask] = "do_deploy_deb" do_rootfs_install[network] = "${TASK_USE_SUDO}" python do_rootfs_install() { - configure_cmds = (d.getVar("ROOTFS_CONFIGURE_COMMAND", True) or "").split() - install_cmds = (d.getVar("ROOTFS_INSTALL_COMMAND", True) or "").split() + configure_cmds = (d.getVar("ROOTFS_CONFIGURE_COMMAND") or "").split() + install_cmds = (d.getVar("ROOTFS_INSTALL_COMMAND") or "").split() # Mount after configure commands, so that they have time to copy # 'isar-apt' (sdkchroot): diff --git a/meta/classes/sbuild.bbclass b/meta/classes/sbuild.bbclass index 6e3c790c..5ea58775 100644 --- a/meta/classes/sbuild.bbclass +++ b/meta/classes/sbuild.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', True) + mode = d.getVar('ISAR_CROSS_COMPILE') distro_arch = d.getVar('DISTRO_ARCH') if mode == "0" or d.getVar('HOST_ARCH') == distro_arch: d.setVar('SBUILD_HOST_ARCH', distro_arch) diff --git a/meta/classes/sdk.bbclass b/meta/classes/sdk.bbclass index 01eb3a67..faf1efbd 100644 --- a/meta/classes/sdk.bbclass +++ b/meta/classes/sdk.bbclass @@ -44,13 +44,13 @@ SDK_PREINSTALL += " \ # Choose the correct toolchain: cross or native python __anonymous() { - mode = d.getVar('ISAR_CROSS_COMPILE', True) + mode = d.getVar('ISAR_CROSS_COMPILE') distro_arch = d.getVar('DISTRO_ARCH') if mode == "0" or d.getVar('HOST_ARCH') == distro_arch or distro_arch == None: toolchain = "build-essential" else: toolchain = "crossbuild-essential-" + distro_arch - if d.getVar('ISAR_ENABLE_COMPAT_ARCH', True) == "1": + if d.getVar('ISAR_ENABLE_COMPAT_ARCH') == "1": toolchain += " crossbuild-essential-" + d.getVar('COMPAT_DISTRO_ARCH') d.setVar('TOOLCHAIN', toolchain) } @@ -67,7 +67,7 @@ IMAGE_FSTYPES:class-sdk = "${SDK_FORMATS}" # bitbake dependencies SDKDEPENDS += "sdk-files ${SDK_INSTALL}" -SDKDEPENDS:append:riscv64 = "${@' crossbuild-essential-riscv64' if d.getVar('ISAR_CROSS_COMPILE', True) == '1' and d.getVar('PN') != 'crossbuild-essential-riscv64' else ''}" +SDKDEPENDS:append:riscv64 = "${@' crossbuild-essential-riscv64' if d.getVar('ISAR_CROSS_COMPILE') == '1' and d.getVar('PN') != 'crossbuild-essential-riscv64' else ''}" DEPENDS:class-sdk = "${SDKDEPENDS}" SDKROOTFSDEPENDS = "" diff --git a/meta/classes/template.bbclass b/meta/classes/template.bbclass index e6bcc362..1f4cedbd 100644 --- a/meta/classes/template.bbclass +++ b/meta/classes/template.bbclass @@ -10,13 +10,13 @@ do_transform_template[vardeps] = "TEMPLATE_FILES ${TEMPLATE_VARS}" python do_transform_template() { import subprocess, contextlib, shutil - workdir = os.path.normpath(d.getVar('WORKDIR', True)) + workdir = os.path.normpath(d.getVar('WORKDIR')) - template_vars = (d.getVar('TEMPLATE_VARS', True) or "").split() + template_vars = (d.getVar('TEMPLATE_VARS') or "").split() if len(template_vars) == 0: return - template_files = (d.getVar('TEMPLATE_FILES', True) or "").split() + template_files = (d.getVar('TEMPLATE_FILES') or "").split() if len(template_files) == 0: return @@ -27,7 +27,7 @@ python do_transform_template() { # from bitbake data store: env = os.environ.copy() for varname in template_vars: - value = d.getVar(varname, True) + value = d.getVar(varname) if value: env.update({varname: value}) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 99d75e21..f4c088e8 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -36,7 +36,7 @@ inherit deb-dl-dir python () { distro_bootstrap_keys = (d.getVar("DISTRO_BOOTSTRAP_KEYS") or "").split() third_party_apt_keys = (d.getVar("THIRD_PARTY_APT_KEYS") or "").split() - topdir = d.getVar("TOPDIR", True) + topdir = d.getVar("TOPDIR") # The cached repo key can be both for bootstrapping and apt package # installation afterwards. However, debootstrap will include the key into @@ -59,11 +59,11 @@ python () { filename = os.path.relpath(fetcher.localpath(key), topdir) d.appendVar("THIRD_PARTY_APT_KEYFILES", " ${TOPDIR}/%s" % filename) - distro_apt_sources = d.getVar(d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_SOURCES", True) or "" + distro_apt_sources = d.getVar(d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_SOURCES") or "" for file in distro_apt_sources.split(): d.appendVar("SRC_URI", " file://%s" % file) - distro_apt_preferences = d.getVar(d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_PREFERENCES", True) or "" + distro_apt_preferences = d.getVar(d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_PREFERENCES") or "" for file in distro_apt_preferences.split(): d.appendVar("SRC_URI", " file://%s" % file) } @@ -113,7 +113,7 @@ def get_apt_source_mirror(d, aptsources_entry_list): if bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')): premirrors = "\S* file://${REPO_BASE_DIR}/${BOOTSTRAP_BASE_DISTRO}\n" else: - premirrors = d.getVar('DISTRO_APT_PREMIRRORS', True) or "" + premirrors = d.getVar('DISTRO_APT_PREMIRRORS') or "" mirror_list = [entry.split() for entry in premirrors.split('\\n') if any(entry)] @@ -150,7 +150,7 @@ def aggregate_aptsources_list(d, file_list, file_out): def get_aptsources_list(d): import errno apt_sources_var = d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_SOURCES" - list = (d.getVar(apt_sources_var, True) or "").split() + list = (d.getVar(apt_sources_var) or "").split() ret = [] for p in list: try: @@ -218,14 +218,14 @@ do_generate_keyrings[dirs] = "${DL_DIR}" do_generate_keyrings[vardeps] += "DISTRO_BOOTSTRAP_KEYS THIRD_PARTY_APT_KEYS" do_generate_keyrings[network] = "${TASK_USE_SUDO}" do_generate_keyrings() { - if [ -n "${@d.getVar("THIRD_PARTY_APT_KEYFILES", True) or ""}" ]; then + if [ -n "${@d.getVar("THIRD_PARTY_APT_KEYFILES") or ""}" ]; then chmod 777 "${APT_KEYS_DIR}" - for keyfile in ${@d.getVar("THIRD_PARTY_APT_KEYFILES", True)}; do + for keyfile in ${@d.getVar("THIRD_PARTY_APT_KEYFILES")}; do cp "$keyfile" "${APT_KEYS_DIR}"/"$(basename "$keyfile")" done fi - if [ -n "${@d.getVar("DISTRO_BOOTSTRAP_KEYFILES", True) or ""}" ]; then - for keyfile in ${@d.getVar("DISTRO_BOOTSTRAP_KEYFILES", True)}; do + if [ -n "${@d.getVar("DISTRO_BOOTSTRAP_KEYFILES") or ""}" ]; then + for keyfile in ${@d.getVar("DISTRO_BOOTSTRAP_KEYFILES")}; do sudo apt-key --keyring "${DISTRO_BOOTSTRAP_KEYRING}" add $keyfile cp "$keyfile" "${APT_KEYS_DIR}"/"$(basename "$keyfile")" done @@ -243,16 +243,16 @@ do_apt_config_prepare[vardeps] += " \ DEPLOY_ISAR_BOOTSTRAP \ " python do_apt_config_prepare() { - apt_preferences_out = d.getVar("APTPREFS", True) + apt_preferences_out = d.getVar("APTPREFS") apt_preferences_list = ( - d.getVar(d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_PREFERENCES", True) or "" + d.getVar(d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_PREFERENCES") or "" ).split() aggregate_files(d, apt_preferences_list, apt_preferences_out) - apt_sources_out = d.getVar("APTSRCS", True) - apt_sources_init_out = d.getVar("APTSRCS_INIT", True) + apt_sources_out = d.getVar("APTSRCS") + apt_sources_init_out = d.getVar("APTSRCS_INIT") apt_sources_list = ( - d.getVar(d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_SOURCES", True) or "" + d.getVar(d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_SOURCES") or "" ).split() aggregate_files(d, apt_sources_list, apt_sources_init_out) diff --git a/meta/recipes-kernel/kselftest/kselftest.inc b/meta/recipes-kernel/kselftest/kselftest.inc index 03f37f12..eb61582e 100644 --- a/meta/recipes-kernel/kselftest/kselftest.inc +++ b/meta/recipes-kernel/kselftest/kselftest.inc @@ -43,9 +43,9 @@ KSELFTEST_TARGETS ?= "" KSELFTEST_SKIP_TARGETS ?= "" KSELFTEST_FORCE_TARGETS ?= "0" -KSELFTEST_ARGS = "${@ "TARGETS=\"${KSELFTEST_TARGETS}\"" if d.getVar('KSELFTEST_TARGETS', True) else ''}" -KSELFTEST_ARGS .= "${@ " FORCE_TARGETS=1" if d.getVar('KSELFTEST_FORCE_TARGETS', True) == '1' else ''}" -KSELFTEST_ARGS .= "${@ " SKIP_TARGETS=\"${KSELFTEST_SKIP_TARGETS}\"" if d.getVar('KSELFTEST_SKIP_TARGETS', True) else ''}" +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 .= "${@ " SKIP_TARGETS=\"${KSELFTEST_SKIP_TARGETS}\"" if d.getVar('KSELFTEST_SKIP_TARGETS') else ''}" do_prepare_build[cleandirs] += "${S}/debian" do_prepare_build() { diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc index 2b71dd8c..42501342 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc +++ b/meta/recipes-kernel/linux/linux-custom.inc @@ -90,11 +90,11 @@ inherit template KCFLAGS ?= "-fdebug-prefix-map=${CURDIR}=." # Derive name of the kernel packages from the name of this recipe -KERNEL_NAME_PROVIDED ?= "${@ d.getVar('PN', True).partition('linux-')[2]}" +KERNEL_NAME_PROVIDED ?= "${@ d.getVar('PN').partition('linux-')[2]}" # Make bitbake know we will be producing linux-image and linux-headers packages python() { - kernel_name = d.getVar("KERNEL_NAME_PROVIDED", True) + kernel_name = d.getVar("KERNEL_NAME_PROVIDED") d.setVar('PROVIDES', 'linux-image-' + kernel_name + ' ' + \ 'linux-headers-' + kernel_name) } @@ -131,8 +131,8 @@ def config_fragments(d): return fragments def get_additional_build_profiles(d): - profiles = d.getVar('BASE_DISTRO', True) - if d.getVar('KERNEL_LIBC_DEV_DEPLOY', True) != '1': + profiles = d.getVar('BASE_DISTRO') + if d.getVar('KERNEL_LIBC_DEV_DEPLOY') != '1': profiles += ' nolibcdev' return profiles @@ -160,12 +160,12 @@ do_prepare_build:prepend() { KERNEL_BUILD_DIR = "build-full" def get_kernel_config_target(d): - kernel_defconfig = d.getVar('KERNEL_DEFCONFIG', True) + kernel_defconfig = d.getVar('KERNEL_DEFCONFIG') config_target = kernel_defconfig if kernel_defconfig: - workdir=d.getVar('WORKDIR', True) + workdir=d.getVar('WORKDIR') if os.path.isfile(workdir + "/" + kernel_defconfig): config_target = "olddefconfig" else: @@ -179,7 +179,7 @@ def get_kernel_config_fragments(d): src_frags = " ".join(config_fragments(d)) out_frags = " ".join(map(lambda frag: 'debian/fragments/' + frag, config_fragments(d))) - linux_version_extension = d.getVar('LINUX_VERSION_EXTENSION', True) + linux_version_extension = d.getVar('LINUX_VERSION_EXTENSION') if linux_version_extension: out_frags += " debian/isar/version.cfg" diff --git a/meta/recipes-kernel/linux/linux-distro.bb b/meta/recipes-kernel/linux/linux-distro.bb index bfc8be9f..bc43528c 100644 --- a/meta/recipes-kernel/linux/linux-distro.bb +++ b/meta/recipes-kernel/linux/linux-distro.bb @@ -6,12 +6,12 @@ # SPDX-License-Identifier: MIT python() { - distro_kernels = d.getVar('DISTRO_KERNELS', True) or "" + distro_kernels = d.getVar('DISTRO_KERNELS') or "" for kernel in distro_kernels.split(): d.appendVar('PROVIDES', ' linux-image-' + kernel) d.appendVar('PROVIDES', ' linux-headers-' + kernel) - if d.getVar('KERNEL_IMAGE_PKG', True): - d.appendVar('PROVIDES', ' ' + d.getVar('KERNEL_IMAGE_PKG', True)) - if d.getVar('KERNEL_HEADERS_PKG', True): - d.appendVar('PROVIDES', ' ' + d.getVar('KERNEL_HEADERS_PKG', True)) + if d.getVar('KERNEL_IMAGE_PKG'): + d.appendVar('PROVIDES', ' ' + d.getVar('KERNEL_IMAGE_PKG')) + if d.getVar('KERNEL_HEADERS_PKG'): + d.appendVar('PROVIDES', ' ' + d.getVar('KERNEL_HEADERS_PKG')) } -- 2.35.3