From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7155069296107847680 X-Received: by 2002:a05:600c:4f0f:b0:3b4:c09b:37c5 with SMTP id l15-20020a05600c4f0f00b003b4c09b37c5mr6419041wmq.181.1665993940439; Mon, 17 Oct 2022 01:05:40 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:231:b0:22c:d34e:768c with SMTP id l17-20020a056000023100b0022cd34e768cls134774wrz.0.-pod-prod-gmail; Mon, 17 Oct 2022 01:05:39 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5QTLyJqMzzwTJMke3nShrtrmr31L/u1LaQ7edcULrvznhvfjfO/ffok386gRJChwzLaBl4 X-Received: by 2002:a5d:4150:0:b0:22f:f9f6:cca1 with SMTP id c16-20020a5d4150000000b0022ff9f6cca1mr5619664wrq.510.1665993939379; Mon, 17 Oct 2022 01:05:39 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1665993939; cv=pass; d=google.com; s=arc-20160816; b=ouVNZ3uaTLrLrlkgX9DGNrS9Sl9aeZLLL2AM4Y2UvqOf4/5n+0q43Pv1lilrStP7mr bNZfxwpFcGWzKHm9ETIHhPggOH58YYIOPwsXZe4gQFbUCPeEwtqVNmYD6P79kU61/Hpl QDceVe5zkFG3P8WlmMMC0zj+CsVpU9VKhr5ngAC3IDRX/MZKMbznrdgEVQRElYl7LXdE EKp01giS8tJBvP2cPseVmwv14rKdnQhbMRqC1mh/M878DR4gpSU/KsM72am5K0jLnRRp tWe5Kf77s0sAVd41CUTd2Q1NsKHxOFFF/JNZcR/dLZWHfZKtbVEvwDDYhwn5W1EaBX5A 11Aw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:subject:cc:to:from:date:dkim-signature; bh=/BQUCTAX482soQOQmQcjcn4ksQEDzVjBM49XDhsxJxI=; b=tO9/Tz1ph5RE4usQbrA2rrVTL/T7hhD3WpIDS3NLpovwXGLGPX3oO0rox9bkgzKaRM g2kuGEleGidNpIDcgneRNO152kIAFZM1Jsy9/Oqgol0poGTiLZGD3D0B3qzx5I/MAiyg ZLwjHhx+9MmgN3m3EVFkAPwFn1gDR6x0Qmz5IimUoR8gr87v8e2Bgzf4U5LJ8h4u+ItM tbmtZHop5T1nD7VTRPu6AhzjAS9/ZQfLnPB0a6wXVyemPVo0Y7QzKhIGexso/uzBfMoQ aOJGfchGNT4UCpyY7lFw7CM4IbFNedoFnY+5vSovUUYCOcSIKiLaCdEkadrd2Lp/F5DX kD9g== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=BaZn6y3q; 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 henning.schild@siemens.com designates 40.107.6.73 as permitted sender) smtp.mailfrom=henning.schild@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-eopbgr60073.outbound.protection.outlook.com. [40.107.6.73]) by gmr-mx.google.com with ESMTPS id ay38-20020a05600c1e2600b003c4e7ae1ed6si444711wmb.0.2022.10.17.01.05.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Oct 2022 01:05:39 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.6.73 as permitted sender) client-ip=40.107.6.73; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=BaZn6y3q; 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 henning.schild@siemens.com designates 40.107.6.73 as permitted sender) smtp.mailfrom=henning.schild@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=bEQLztShyaxbj2e6XvohPb3icTAL2efBpKlRzx5zSMRrX1rN3m/zngYDdyQ8uuK1MIe40k7h5CeleEzNHuh2xsOcY3MJW8fUKXyI0YZK3/7J7bTobAzT6lHaft9tZ6TXP6iORjntNU+WIMbN5Kmrv7HtSBK7glzUy+WrKryl7ZjxnL8Q6PaSICuT/W1MfEfFlkq44lB4IumNSj4lXOLDJMm/XrsninGh0N3inPLWdN9Gv89VlG8zIXPa/E6kWpeDpKj13hSxnU4c1OuAOVYzMkGl/MRgIrtWc2Pjc3W1y/F1zBka6wNlJ6EGXokrTveHL6f51/wNRlH4aRyl5otycw== 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=/BQUCTAX482soQOQmQcjcn4ksQEDzVjBM49XDhsxJxI=; b=GNSwE4kG4vFGKD5mpjrJaLckxZnwZU8HC2WmdLBUj2yzKDIHSVTZA9sD+95o20HfIz9WWp94GA7uyTX/8MfEIjYHcuGd4mvmYYbl/tFdmDfQaox8ZvSl+/ox61TzP8LkIfBt+sCJjeq2CF4KZXp7Hk+BhdOFSub7P8DDt0H2zk/HzBLXMpBAsJv6FuGWXioXOz0jyq5+LhnssZgUbe3mlM4Yobcj/CBxDLIxKeTpOn06uAzKUKpHZgnnsjhe4ie3vg/WhqDbZGCs7s9/bIqncEUBZ0XHLm50am40c5ya1Wx1v7L2SrRSuvlE9NbUuYXE7D+fWzo4FB36lBBKkxks8g== 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=/BQUCTAX482soQOQmQcjcn4ksQEDzVjBM49XDhsxJxI=; b=BaZn6y3qxG2DXHgxNBd5ykMp9FmAU1sSZurHLL3nGVkg6rKEcVd4+iXqp+7EypiIiKZ13NzTOGNgBnXWPAAVyVMmA7n52p4wObD+libCWUlWZmBo5mad8VRZmiumpgxFHIrLQWbLafTaqZE7jh6UmTgIMX1o3c6doisgF46FmnDqi35JjGGMvoFqipqREPbyA6Bu3HZ2vb+qE0tDl8sg5zuzOZUzxvuIm7BxLkUd9T1O+JBOz1+aCBnArULXkWAAyZn4IsNudWyQhWm3jc3eXyGcAfIgng7/PwgwV61/Dkd2G4qidI3HW7LW2vtMpbnurwZRQIg59g7iQJQGS3do4Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) by PAXPR10MB5351.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:282::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Mon, 17 Oct 2022 08:05:38 +0000 Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::1cd8:9066:48b1:b1c2]) by PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::1cd8:9066:48b1:b1c2%9]) with mapi id 15.20.5723.033; Mon, 17 Oct 2022 08:05:38 +0000 Date: Mon, 17 Oct 2022 10:05:22 +0200 From: Henning Schild To: Jan Kiszka Cc: isar-users Subject: Re: [PATCH] wic: Fix non-existing initrd case Message-ID: <20221017100522.5ff1cd81@md1za8fc.ad001.siemens.net> In-Reply-To: <9bbc8c30-7ca7-25cb-0f5a-786028fa939f@siemens.com> References: <20221017094944.1eb72c20@md1za8fc.ad001.siemens.net> <9bbc8c30-7ca7-25cb-0f5a-786028fa939f@siemens.com> X-Mailer: Claws Mail 4.1.0 (GTK 3.24.34; x86_64-pc-linux-gnu) Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-ClientProxiedBy: CH0PR04CA0027.namprd04.prod.outlook.com (2603:10b6:610:76::32) To PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) Return-Path: henning.schild@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PA4PR10MB5780:EE_|PAXPR10MB5351:EE_ X-MS-Office365-Filtering-Correlation-Id: b0b2647f-3e54-4afd-6cdf-08dab016609c 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: sl3bouBMyk0fWgk2tyie6f2plOJ5VJv4ku/CuxiNAKi/x23glflQybqzh1AP4MRJ/F57BNmJrFvFNoApVZV0NRLnmIvSV1BDNMCdZTRZ5MPrO08tz0JcvL6XiPzSh7wSC80mPdTkjvd5ZRFfwDLHufcVWFsPQ8OhKuGdC8tJ0U/gxtW6HZIKLo/JFOEJihF3b6Dp9xL5G0zjYTQK+Oj6QszRr0bOtylB9DsdxBvTP6yKC5bH1IZnrtlayXMIzTOAy7U2iCoXaoKQXQV1ZOThRKdCSe4O60Ej/3d2+fbKrKP/2kM7pIMqH2ADdIm3AdfvGcXsk4QDeleHXGurXUAKcHA8agN0nYKALkxo1bWkDg5z6zq/ZSVwkz8HIRnmxwoEShlAzDRlz7YLkm8Ge2QkEVmsveb2e2IM4ue0jFy5sDLdZS9PBvHdOCWbV1TmQFYi00SKDbxiueezhQ03N3JVicTh+aMGPaWfOprm3LjZ5p+pwy1Aj6UStmrOszIkdPIOvUiqMxWjJXpdrhbWf54ZmA7sPrLwbFSMW8bGyHJwAIgZYSQ0DbeOOBnbUSAcmoPcuQ+YbniokqrNKCD5aEpDAIx0gr09CeW5Ih/ny9R9tcNZY2tgkPg7YuyLeIHXICgN/LaMt1kt7jP0dgx6PVjO8jIe3VHokoBBsrm8j1xGsv/S+gso4TjS6wafVHt4b/R4y6ekXkOvd1AUftkQvlj+og== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230022)(4636009)(346002)(396003)(376002)(39860400002)(136003)(366004)(451199015)(316002)(2906002)(1076003)(186003)(83380400001)(82960400001)(86362001)(38100700002)(6486002)(478600001)(6636002)(41300700001)(6862004)(53546011)(44832011)(6506007)(8936002)(5660300002)(26005)(66556008)(9686003)(6512007)(4326008)(66476007)(66946007)(8676002)(6666004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?rFDYeCkxHTOhzDEftMJhbFDwtYg5+VcJenikfWUoWzQFjsZN9q1tjKuAYogf?= =?us-ascii?Q?QEugOkCxXkke0RFTEDw3K2UH35A8GEqUCp6Pocfru/tryY4pQD/cYh9Umm6W?= =?us-ascii?Q?0aiy9hbw/yY+AXt1R0egOD/1C5aWjrere+/xgUALuW62qLyXCOllUlFuX/zR?= =?us-ascii?Q?ab/URJj2iTrvWNAQbC540liqq2+j/fRj9CRndzxY8cU24d1elsxN8yl5TfDk?= =?us-ascii?Q?FrjcVLYboYa1XCOqy41cWuAe5mKlcsqHLsXYdfjhrK7GYVPR9VA15cLsgRHL?= =?us-ascii?Q?+7cOi2fZM9escgmm3M7jtB6K8T+mD86NGMX+L1vrLSHfEHx58pWlWtmey/zN?= =?us-ascii?Q?jF1pqO8N8HFG2ZsCbnJh117/RsX1ysfCHOS5TSBvgwtccjHVOAaq74/lGq2S?= =?us-ascii?Q?orzIjGRc69a+sOmSP3SlbM/4wb11Lh0mJPFIfJD3nvbIcfyfI4LpGlh3kfFy?= =?us-ascii?Q?sUuqkGGTcZyN9dy0Yr/vrvTS+Qy7drBnaKKzdtDV+b6MVi99X9RLo6zYI97U?= =?us-ascii?Q?mJKjgNWAwDhS/8MkPK72kOuOskQ8HFpiEqGDKp6gCxbn++ahKI4BNivKEXR4?= =?us-ascii?Q?1hSyRrImazvYraq36TERwGwXAm11RoZwFYAPyF9DqHAgynfRFp8ViNS0VGq/?= =?us-ascii?Q?hhFEV1Lh6WdPo6WulYa8fiYfIEOd8RbXjD0/wLljICmfZUMK5eVSxKUn+OP8?= =?us-ascii?Q?raF/c1m8Fpt1nrO5uFaBR6lfG8o8BX86oPV+5xZd6irry8+btUJG0M0MCJhk?= =?us-ascii?Q?nIkrN0X4pcYVAUOhhl0OqLMMs0UKf0VZGLvukQQwspdrZGk75OZpNpLpUhLo?= =?us-ascii?Q?GECXR+qV/8NmfHoudTekcoSCTj8tHEWuMNu+WmUBz+342/LqzLxoR+o4EtnD?= =?us-ascii?Q?yaw08znEOx8hwGE4A5be9A4HcIhmps5sNN+tcivVyVou64AnXNo4pg/EC6dG?= =?us-ascii?Q?vd7OfT5F0DbHcJbmRRU3P7ZKfTIrkZ3v2MxmtApeMlFnEF+rv82uRshGqev+?= =?us-ascii?Q?/cdMZx+1tqedTnWbRhLTZ5su6+2HjZjiik9usaVc07LOHlTVELvQ8wOvnIF1?= =?us-ascii?Q?yxS3qjxfSi+9rTuKwWPU7NY1AZhcBsv0BxAO1CbolAFPdUBBynhW61kO+Jau?= =?us-ascii?Q?1UmUTcZs7+EHD1hBqBCL6U0h0+J3NkEZcT0QCRdCNAO3XkoPWtexOFX/SLbZ?= =?us-ascii?Q?ISn4yteESriaw9ca8JG9yhMFdAOELQir2dkLzMa/x1ZbWzJlTlMHbQg5uF/2?= =?us-ascii?Q?Zla7Zg1MdKMJH6OdS+JpdB8byYQyg33kmRCSiBnwgxNENYINXxmvT5p9XMTY?= =?us-ascii?Q?4xjUtVoWeV5ZilVIwyKn/hq3zzdGidGMnm7RMDPtcrAY/ZWO8R2C5NaFAXhz?= =?us-ascii?Q?jAKoofMBavJO6AblFB7B/89BvGjT56UIazYJd/vwgmKM6jAXqhxNcxG3o9f5?= =?us-ascii?Q?xzwARM+rKECsG6MkpGmhRze9X/5lUqIjBXOTtnNy2Dtv6RdRpujGxST3bbgi?= =?us-ascii?Q?yrz4911hM1do7Ti2QOYVbt6bddzRLa09kWjCmaG3+mRNPSaJZlZ6fG0fqXKt?= =?us-ascii?Q?45dmP3KKqRm12KwbvIVkS+ZKUdllp9cN16Fkh+YntW5A8uWM+vAUNq5g+1b1?= =?us-ascii?Q?EA=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: b0b2647f-3e54-4afd-6cdf-08dab016609c X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2022 08:05:38.3917 (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: IFgrGxPd7DIQV2G18yZYdVBqqCIFW+4AyW1dpwTtCEnYIuEl9+kReqYN/lHrbvHt4YZiH8TbsX4bz9Y5PRce4fF7F80osZsmtKlOeDXaJyM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR10MB5351 X-TUID: EHgQ/j67RNOp Am Mon, 17 Oct 2022 09:55:36 +0200 schrieb Jan Kiszka : > On 17.10.22 09:49, Henning Schild wrote: > > Am Sun, 16 Oct 2022 13:22:52 +0200 > > schrieb Jan Kiszka : > > > >> From: Jan Kiszka > >> > >> An initrd is optional, and most callers of isar_get_filenames are > >> taking this into acount already. Adjust the last one and stop > >> bailing out from the helper if there is no initrd file. > >> > >> Signed-off-by: Jan Kiszka > >> --- > >> meta/scripts/lib/wic/plugins/isarpluginbase.py | 2 +- > >> .../scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py | 8 > >> +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) > >> > >> diff --git a/meta/scripts/lib/wic/plugins/isarpluginbase.py > >> b/meta/scripts/lib/wic/plugins/isarpluginbase.py index > >> 68af2208..99e552e0 100644 --- > >> a/meta/scripts/lib/wic/plugins/isarpluginbase.py +++ > >> b/meta/scripts/lib/wic/plugins/isarpluginbase.py @@ -36,6 +36,6 @@ > >> def isar_get_filenames(rootfs_dir): if not > >> os.path.isfile(os.path.join(rootfs_dir, "boot", kernel)): raise > >> WicError("kernel %s not found" % (os.path.join(rootfs_dir, "boot", > >> kernel))) if not os.path.isfile(os.path.join(rootfs_dir, "boot", > >> initrd)): > >> - raise WicError("initrd %s not found" % > >> (os.path.join(rootfs_dir, "boot", initrd))) > >> + initrd = None > >> > >> return kernel, initrd > >> diff --git > >> a/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py > >> b/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py index > >> 7fb0f2a8..43f4bec4 100644 --- > >> a/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py +++ > >> b/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py @@ > >> -141,9 +141,11 @@ class BootimgPcbiosIsarPlugin(SourcePlugin): > >> syslinux_conf += "APPEND label=boot root=%s %s\n" % \ > >> (creator.rootdev, bootloader.append) > >> - # we are using an initrd, smuggle it in > >> - syslinux_conf = syslinux_conf.replace(" root=%s " % > >> (creator.rootdev), > >> - " root=%s > >> initrd=%s " % (creator.rootdev, initrd)) > >> + # if we are using an initrd, smuggle it in > >> + if initrd: > >> + syslinux_conf = syslinux_conf.replace( > >> + " root=%s " % (creator.rootdev), > >> + " root=%s initrd=%s " % (creator.rootdev, > >> initrd)) > > > > I did not check but am pretty sure this is forking patch we should > > rather get applied in OE first. > > > > Forking -isar in OE core??? Hard to believe ;) The -isar files contain _minimal_ changes specific to Isar only. Every change on them should be questioned carefully of whether it is Isar-only. The lines you touch are in fact Isar-only, so it is OK. diff -Nru scripts/lib/wic/plugins/source/bootimg-pcbios.py meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py d7c435d27acb9 Henning > Jan >