From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7201062888117633024 X-Received: by 2002:aed:27c8:0:b0:3bd:1b22:799b with SMTP id m8-20020aed27c8000000b003bd1b22799bmr177785qtg.4.1676634912530; Fri, 17 Feb 2023 03:55:12 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac8:4982:0:b0:3b0:98a4:96b8 with SMTP id f2-20020ac84982000000b003b098a496b8ls777282qtq.8.-pod-prod-gmail; Fri, 17 Feb 2023 03:55:11 -0800 (PST) X-Google-Smtp-Source: AK7set/Q2WBhe7sBPCcBlFTXC3MUwrEZtn1I3SaKIE4Ccffzma7ODUcJkRgeIitw4CRJYSd8E1DE X-Received: by 2002:ac8:5a81:0:b0:3b8:6a3b:3bfc with SMTP id c1-20020ac85a81000000b003b86a3b3bfcmr16628808qtc.24.1676634911820; Fri, 17 Feb 2023 03:55:11 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1676634911; cv=pass; d=google.com; s=arc-20160816; b=I19kYaq97l4piIzTDbrXZv264GCBjH0Y+KLG/h02mJl0wV1l5jWIcjThGOGIb+KZpr 9mEzg4B9M0ebaV5yUDwxQOcBvaWGkq80z3nYZyW5+D/kaox/UDVli/xDW2B9yzu6AQ2N wd2zie79LoKm1j1Vc6ZwPiDVM/tphmg1EnR6D960WilmGIV9D+GEuzAj2yYhQdKB4TXE t//pOIEutwglr6KKuGHkIN1Y0gLRcWsSOs+Z+XCg0S7eSg//cXzr6Oc1p4DtP0l+lVId Hp0DVGDHx9cfa1Bal02GOf1N28rTune38WuZS/NOFcovznCwDYOgBoOkimr0K1wuVfxs ML6Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:in-reply-to:from:references :cc:to:content-language:subject:user-agent:date:message-id :dkim-signature; bh=E347dT9yZ1iEGn1xG94ADp4U89d0Vl8kj2alMq80GDI=; b=A42BXjLjJ6VIxx11U03mpWtTvmly3hI3B+bMa45QHybexRCOl1aEQoWejYEg/tBeX9 1EmXzR7GXFAopDDZulrITEWRVlR5jaZ61w9c8kZMwntUD+c6VectG7NqSZ0f/SQCLb3K 1XuSfuj4MIFw5o2DPXkRxISUv2hlxYImqC1gMufzhY91+ENJORbcofg/92dx0dagVKnc KXPE7pkLLCbHEEcANAGURA98LWY8pgBXlz1cPawC5iWuPtS3fUHzTBwOtdxwV7Co2aHB n4s8+KajuiD7xPlYqSxFSmWTObBzsoupg7oaSN4QAKcG8SFuOi0R++rq54wmPrM3pacl YFaA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=wKIg7Z71; 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:fe0c::608 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 EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on0608.outbound.protection.outlook.com. [2a01:111:f400:fe0c::608]) by gmr-mx.google.com with ESMTPS id u11-20020ac858cb000000b003b83629a0a2si285779qta.5.2023.02.17.03.55.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Feb 2023 03:55:11 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe0c::608 as permitted sender) client-ip=2a01:111:f400:fe0c::608; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=wKIg7Z71; 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:fe0c::608 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=gdn5C7gTvNcl3QBfVtXRFxZEPeBKe9/3wKvHUXMCw6rfe59PUuN2Ywip6suICAJgUbfYmKub8OQ5MJvYen/ozu2hE7gubsQYqY5x7L6Je8/tFOuKVtADeN+4aj15BU8t8cV6X2+btt3ij11R50YGPzrDtwPrWBSWLjDWVE/wlLFn63+CDexqKHtGYa1FbFO0S+oXamSkVW6i1E+1zVfvgFBVOt+WME3KDKrx4qpky9XB39bzkVCYAJNUMjmiyerVkYviCHxyBOd1GtAk2AIFBwdImvqFhLsHTMQxcRGkln3N/Ni18pgj/CQXjoo/oPsJ530oTuTuznUGRTN5g4syqg== 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=E347dT9yZ1iEGn1xG94ADp4U89d0Vl8kj2alMq80GDI=; b=R9n5rtzqweUif5gSPoLZ0hYRvwcJJdroC+m6vQaE6/b7g65hB+n3LN2cqLZgNB6JcnoZoAvHZEvN4GenzKAasbh2m/gxufrS/0yrygxFLElbmZCffdoI3AEITQvun2dZ1COAiTMsH7K8ydrSJJ81H+FRFksxol9bUb0TiLykjKuEETzbSn28LgNDvr1CVoWO9jMrc0q5igQu4GSR69g13MOMygbRP33DdfdmT1n/udptyfFJ2u4eNqp2BTej1MVvhrRKLzr8Z3zmxE+pok+H6ojSYo1b1hfmPqtyakwkx1LEuzmjcCrrxYEzn/F03OiyFaE5jbUec+IgdxU1NBy2Gw== 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=E347dT9yZ1iEGn1xG94ADp4U89d0Vl8kj2alMq80GDI=; b=wKIg7Z71O0KI/K8Bxa/gz/EMSNaT/UQxxuLcNdQ1XoyUZYOcEbGtUyrVg6uGKxgIuWG8PnRGDM5MNXpgK9mIeQzIEhXPLdCWUxhRkDkcQM2gfNJywXPyzZMzkTMoqZ26ZBJ0qcwU2HbmStTzbWhXKdzYFOzdMlND/fCUQ+mSnTGuM4PwwIIYRJkB8agR9mpRjda90WXmijtoIYIyr81/PkJ3wL9uEwCx5UY7rnQzr26Pr0Fw7Zxw7cciAE9Dggde6xil+ATcR2bvv8KnU0BLHTaX1BeHwz/JEHGXv2DJqtxmF99XZF6Ui8sUIaWWRBKWAlzVWYyfwC7dy+Sc6tNscg== 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 AS8PR10MB6556.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:565::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.15; Fri, 17 Feb 2023 11:55:06 +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.6086.026; Fri, 17 Feb 2023 11:55:06 +0000 Message-ID: Date: Fri, 17 Feb 2023 12:55:04 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Subject: Re: [PATCH 3/3] fix race-cond between default and custom initrd Content-Language: en-US To: Felix Moessbauer , isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com References: <20230217100118.2912985-1-felix.moessbauer@siemens.com> <20230217100118.2912985-4-felix.moessbauer@siemens.com> From: Jan Kiszka In-Reply-To: <20230217100118.2912985-4-felix.moessbauer@siemens.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR3P281CA0110.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a3::7) 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_|AS8PR10MB6556:EE_ X-MS-Office365-Filtering-Correlation-Id: c553b5ff-eb10-4d30-f070-08db10ddcfb1 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: L83PP7ATH18NyOsTBPBqFkUhdrbFpgYHZo/xnQbOZt58lpxRupKSTYGmy0jfk6JrIP8FZS7L/WNk1naDRyeGKTNpI/ceFRbNClWdMWyOZ8EZEPLw3i8ldkGLX0WCcYOoif1k4EPQDb/uMun5MeRUlr69qjlZsbwrt4dvwjeFagW/cNDnNbXZ9NP4qNLIYl2xiFtw3CX0FwTvQLQ79sOMskpp7f+D3sDdSDJUoXvO355OUYusR40NjZK6TBIvvoG6XI7729lauoU8N5AxXcJxiIUDKQnpqQhEctnfYY2pVIKYxQzvIFT407bJDIuZOgOG19PDRKe6MDdnmmhqJhTZC0fT2180jxvHNHyCbAcMUGqEOWWx/INNA8jVE3s6j28Ez4LVtJ9p9V0R2LxfnIZC2+hn2MxSNTwZzYNiD+JherVsZG6XeZB0K+67UI65ufcuSbEF+d9mJuJipsKIdfbxhufVIveddsr7WVBw1iOyeECPR5/eWK3vQtkm3d29JzbW0ej/wEx2XJWQDTnR0mYw59UPbqc6/073f6WSZLEU5OexQ7gLaynWAdfvVPquPz9g0t+/4VZLe/aqDgroUh4iO5VYsHuMA4bOT/N/bizvgms4pMRYV+AOwmEk41yISgHtudUOvzadiIrY5093zGQrtTSKanMk+yFDjYTC+SxLkfawthp+Mlay9JLEbPTk1duNyQNO1uUMC7xygLDp0Q5jWokh3Bpq1A1Rszm8ewFU5O2cSC0scN7/W2t3hXZrYkFXy7YEMjz6ac7mcXFx1XaV3Q== 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)(366004)(376002)(396003)(346002)(39860400002)(451199018)(41300700001)(83380400001)(66476007)(66946007)(8676002)(66556008)(316002)(4326008)(8936002)(5660300002)(107886003)(2616005)(53546011)(6512007)(6506007)(186003)(26005)(478600001)(6486002)(36756003)(31696002)(86362001)(2906002)(82960400001)(44832011)(38100700002)(31686004)(403724002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?d2paaEhTM3hBb21WYWlNQmtBSDNpZ0FTUVFsZ1RzRVozaURpcGZpRTI1NmE2?= =?utf-8?B?RGptbytvLzVMdjROSytFVGp2bHNYMXFXc1BBVVJpZ0p1b080YUh3VURrRSs3?= =?utf-8?B?TkI1d0VFdmJ5WlZMNWRDZnJHTlhIUmhiSXdzclpsd0J2KzhDMzBqTlVHYU51?= =?utf-8?B?dWo3UzZQR2xDTmZkNEd5Skd2ZThUZncxQm1RRHh6T25yUE51YzB3b0MwZGds?= =?utf-8?B?ZTF5akp2ZUE0UWs0b0VOSElscW9iRGdJNitMZ0hwa09PNG1vTTloWmVvUHpn?= =?utf-8?B?bXlFUFdWWlFVM2ttUFlyUC9UWUV3cUxMeC95Smc3OGEvcGZpWnpnUlFnOUhQ?= =?utf-8?B?NnpkTHFMUC9rSjUvcG1yZkRaR0gyMHZGTlBTSlppUkM0cWlZbVdpWjFuZno5?= =?utf-8?B?bExZTGVwQk1pVkRsRmdVUm4xQVp2bVc4WFl6ZU5wOXlUUkdxWC9KNXAvcGtM?= =?utf-8?B?NE9CMzk5dy80dFpCUldOREw5ZnNPck5DNFZmRStLbmxlUWJ4RGVmN3VyVnNO?= =?utf-8?B?cStrRzZFNHl4MUlGNHc4S3U0OE81K0syaFl1d1g4T29mbEUwOE8rSXhBNE1w?= =?utf-8?B?Qmo1SFBMUm45UmEwaEV2Rm14bURsTzExS3UvZ0tNaWF2dDJZemxWakJRem5V?= =?utf-8?B?UDBpRG9FeXljTGlZd0dXQzE4ZXlFVXVGKzZ1NEdtQlI4aGhmT0s1Q2hXN2FE?= =?utf-8?B?SUZpMFZGQkJCRDZtMzNWeHBXd2FrcTU0UFdvUDJHazJmaU9tbGl2NFJ4eVov?= =?utf-8?B?MkdaTHJjMEZ3aTlLUisrSkNCcmtPWEtmK1JhOWdDTmdDK1pmU1Z3MHZ1VWFa?= =?utf-8?B?WTRHRDFxTmZJZ0l3dmpobENnMTVkNEYwWERKM2FwMlViUVZ3SE5Oc1h5UUxa?= =?utf-8?B?alJVcXo4K2taZnZSRjdaWCs0akpvUWFFNXozSVkzMWcyQjk2Z1NnbmVHVmRR?= =?utf-8?B?eFVEc0VhNFdFVkZCTzkrcXR3U3Y4WnN5RXdWeVpHQ3hzTmtmQlh5OWJ2SDVy?= =?utf-8?B?OGNFR0poTjRRUTRzTW8vOXB5ZHM4MXRWOTU2V3pkZFVPS2RjcEpVLzdHd3V1?= =?utf-8?B?aGhSNGVJdGRPTG5SNng0QVorZlZIRnk1MUVGM3lySXdoTENibzB2NXNaN1hE?= =?utf-8?B?ajJ1QmV6NGVWTkRzYkJCODgvaHRCckxxWkM2UTRPR2UveVBEdUF0c2F5TUJW?= =?utf-8?B?RUdDM3dqMVlrZkdFRnp4NFZNeldJR0ZKVjBPRFBDd3RUYnZqbjUwNkl5bGJW?= =?utf-8?B?Z1BiNHJHRXo5bjl5aS9aMzEweWowQnhYaHRPTTg3NTYyblJMYit1OTFFRUJa?= =?utf-8?B?MUlHKzdrOEdLZjYxTE5WOUJLZXZ1RU9HY3pQN3FBUnVsUURJQThKWHN6d0Rn?= =?utf-8?B?Y0llNzJncjVwMXFzRDd1Q1lJSmlKem5wNzFjVGdQY2hXRGMyZUFMamVObkRl?= =?utf-8?B?VDd4SncyUkNxb1VLYUxISlRrb0xadTczbkZ5Z0lRQlQ1dXB2dDJTcXArMjF1?= =?utf-8?B?ODEwMGtQNHJaNTFBYXJRVS96QWY3MmlyS1Nrd3ZBbWRyTlpkWWQwK2pwbzJn?= =?utf-8?B?dFNOMHVlTElPSmRDSUwrZ0ticisySk0yV09LTytnUTN3akRwQ3QvTCtSVXNS?= =?utf-8?B?Ui9ma0NGZUFvOUlNZHpjaXp0eVVpbnQ3VU0vVlZScEZIWFZ6SHNESkEvd1ZQ?= =?utf-8?B?aTA2eWtjRkdpVzZiQXN0TVV0emlBREd3dHliZW1OelhkYUVqbE5VU1k2Vmh0?= =?utf-8?B?U2xNQmpCV0tOK3NIaDdQdEtBVzFMeHVIeXBnUUVocnI3RVllUW5VRHk0azN2?= =?utf-8?B?SlV1SEwxdDFKSGhpTXk3TWUyaVlBbk1RK1Q5S3RZM210WFhvMTU1dmtnZE9n?= =?utf-8?B?ejdTd1BiYnAzN2c4ZVNxZ2djN1p5LzI4NzlCcWlkRnFSTmNEMlhrM3dlVVAx?= =?utf-8?B?Y1NDbFU5VXF0ZHRqbXVRV1BvZllLNHdkZWdoVS9FM3p3dEFieU5BRDNmdmxS?= =?utf-8?B?OHg0WkdGK3o4UWJReGlyWnhMTWhxdU14ODQreWFoYUJzNmdCMGZsWlM0ZnhL?= =?utf-8?B?R09VS21TSWRJQ0E4SmtITVUzZFI2dnByYXhCWmUvOVhXaWhFSmlDaG4vanN3?= =?utf-8?B?NUg5cHlUajVFb2NRd3B2QXN4MXJ5SWVOKzVJZ1BOaXlLMWt5dURyQkZOc0Vz?= =?utf-8?B?Umc9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: c553b5ff-eb10-4d30-f070-08db10ddcfb1 X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2023 11:55:06.2825 (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: fLs+pKnA8rE2Bt0Qu3e26qAwiNcS7KJOx7o0oZETiOkHUILLeCf+WZ3ezBJG7qqpzR+RbJU0WvZmEcD5e5DCCQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB6556 X-TUID: zA2tPzf9e2kC On 17.02.23 11:01, Felix Moessbauer wrote: > This patch fixes a data race happening when building a custom initrd. > Previously, both custom and default initrds were deployed to the image > deploy dir. The race is fixed by conditionally deploying either the > custom or the default one. For that, we introduce a new variable > INITRD_DEPLOY_FILE which provides the name of the initrd in the deploy > directory. The existing INITRD_IMAGE variable is defaulted to the empty > string and used to control if a custom initrd is requrested. Only if > this variable is empty, the default one is deployed. > So, if I understand this correctly, the whole change comes effectively without a change visible at recipe level IF users already overwrote INITRD_IMAGE (like isar-cip-core did). Still, this nicely enhanced or clarified semantic of INITRD_IMAGE should be documented as recipe-api change. And then we are lacking an in-tree test case for such a scenario. Some WIC image that consumes a custom initramfs. We only have mc:qemuamd64-bullseye:isar-initramfs in the test cases. Not a must-have to move forward with this improvements, but likely an important follow-up topic. Jan > Signed-off-by: Felix Moessbauer > --- > meta/classes/image.bbclass | 24 ++++++++++++++---------- > scripts/start_vm | 4 ++-- > testsuite/start_vm.py | 2 +- > 3 files changed, 17 insertions(+), 13 deletions(-) > > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass > index e799d1d4..0d5a521e 100644 > --- a/meta/classes/image.bbclass > +++ b/meta/classes/image.bbclass > @@ -3,7 +3,7 @@ > > # Make workdir and stamps machine-specific without changing common PN target > WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}/${PV}-${PR}" > -DEPLOYDIR = "${WORKDIR}/deploy-${PN}" > +DEPLOYDIR = "${WORKDIR}/deploy" > STAMP = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}/${PV}-${PR}" > STAMPCLEAN = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}/*-*" > > @@ -22,8 +22,9 @@ IMAGE_INSTALL += "${KERNEL_IMAGE_PKG}" > IMAGE_FULLNAME = "${PN}-${DISTRO}-${MACHINE}" > > # These variables are used by wic and start_vm > -KERNEL_IMAGE ?= "${IMAGE_FULLNAME}-${KERNEL_FILE}" > -INITRD_IMAGE ?= "${IMAGE_FULLNAME}-initrd.img" > +KERNEL_IMAGE = "${IMAGE_FULLNAME}-${KERNEL_FILE}" > +INITRD_IMAGE ?= "" > +INITRD_DEPLOY_FILE = "${@d.getVar('INITRD_IMAGE') or '${IMAGE_FULLNAME}-initrd.img')" > > # This defines the deployed dtbs for reuse by imagers > DTB_FILES ?= "" > @@ -353,7 +354,7 @@ EOF > > # Default kernel, initrd and dtb image deploy paths (inside imager) > KERNEL_IMG = "${PP_DEPLOY}/${KERNEL_IMAGE}" > -INITRD_IMG = "${PP_DEPLOY}/${INITRD_IMAGE}" > +INITRD_IMG = "${PP_DEPLOY}/${INITRD_DEPLOY_FILE}" > # only one dtb file supported, pick the first > DTB_IMG = "${PP_DEPLOY}/${@(d.getVar('DTB_FILES').split() or [''])[0]}" > > @@ -370,12 +371,15 @@ do_copy_boot_files() { > sudo cat "$kernel" > "${DEPLOYDIR}/${KERNEL_IMAGE}" > fi > > - initrd="$(realpath -q '${IMAGE_ROOTFS}/initrd.img')" > - if [ ! -f "$initrd" ]; then > - initrd="$(realpath -q '${IMAGE_ROOTFS}/boot/initrd.img')" > - fi > - if [ -f "$initrd" ]; then > - cp -f "$initrd" '${DEPLOYDIR}/${INITRD_IMAGE}' > + # deploy default initrd if no custom one is build > + if [ -e "${INITRD_IMAGE}" ]; then > + initrd="$(realpath -q '${IMAGE_ROOTFS}/initrd.img')" > + if [ ! -f "$initrd" ]; then > + initrd="$(realpath -q '${IMAGE_ROOTFS}/boot/initrd.img')" > + fi > + if [ -f "$initrd" ]; then > + cp -f "$initrd" '${DEPLOYDIR}/${INITRD_DEPLOY_FILE}' > + fi > fi > > for file in ${DTB_FILES}; do > diff --git a/scripts/start_vm b/scripts/start_vm > index 17091d72..8c696a4a 100755 > --- a/scripts/start_vm > +++ b/scripts/start_vm > @@ -125,10 +125,10 @@ case "$IMAGE_FSTYPES" in > readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.ext4 > > eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "^KERNEL_IMAGE=") > - eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "^INITRD_IMAGE=") > + eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "^INITRD_DEPLOY_FILE=") > QKERNEL=$IMAGE_DIR/${KERNEL_IMAGE} > QINITRD=/dev/null > - [ -n "$INITRD_IMAGE" ] && QINITRD=$IMAGE_DIR/${INITRD_IMAGE} > + [ -n "$INITRD_DEPLOY_FILE" ] && QINITRD=$IMAGE_DIR/${INITRD_DEPLOY_FILE} > if [ "$ARCH" = "riscv64" ]; then > EXTRA_ARGS="$EXTRA_ARGS -device loader,file=$QKERNEL,addr=0x80200000" > QKERNEL="/usr/lib/riscv64-linux-gnu/opensbi/qemu/virt/fw_jump.elf" > diff --git a/testsuite/start_vm.py b/testsuite/start_vm.py > index 82ecc17d..ba1ba127 100755 > --- a/testsuite/start_vm.py > +++ b/testsuite/start_vm.py > @@ -35,7 +35,7 @@ def format_qemu_cmdline(arch, build, distro, out, pid, enforce_pcbios=False): > if image_type == 'ext4': > rootfs_image = 'isar-image-base-' + base + '-' + distro + '-qemu' + arch + '.ext4' > kernel_image = deploy_dir_image + '/' + get_bitbake_var(bb_output, 'KERNEL_IMAGE') > - initrd_image = get_bitbake_var(bb_output, 'INITRD_IMAGE') > + initrd_image = get_bitbake_var(bb_output, 'INITRD_DEPLOY_FILE') > > if not initrd_image: > initrd_image = '/dev/null' -- Siemens AG, Technology Competence Center Embedded Linux