From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7155069296107847680 X-Received: by 2002:a2e:2e05:0:b0:26f:c234:3335 with SMTP id u5-20020a2e2e05000000b0026fc2343335mr3566604lju.76.1665993356127; Mon, 17 Oct 2022 00:55:56 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:bc29:0:b0:26f:8b88:ccbf with SMTP id b41-20020a2ebc29000000b0026f8b88ccbfls1950337ljf.1.-pod-prod-gmail; Mon, 17 Oct 2022 00:55:54 -0700 (PDT) X-Google-Smtp-Source: AMsMyM64B397FZShKYUql4t19SYYkaJgMOB5E6516MSsUYhS416iv8EvdGWlBLB8G65vAs6pk9j9 X-Received: by 2002:a2e:a807:0:b0:26d:ffc7:33e7 with SMTP id l7-20020a2ea807000000b0026dffc733e7mr3842268ljq.484.1665993354658; Mon, 17 Oct 2022 00:55:54 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1665993354; cv=pass; d=google.com; s=arc-20160816; b=PecZFFRiTSfl8U0W3FsRGxrlvAmGCiIOAxAJ+sr3atpldb8KlshVdJ/jZj5trWdVpe hN7yfBwJL/0F1BB0amqqHCRS6akcL2dnfGuNS3+SCcV8Pm8LW/DtfeKX7xEEBZcS0Lfz IO7IJ0qmwese2h0F9Uj4/4IGkph+pTxWNQOqi/+CYIzdjY2qYug5rIP3FtWzP9dWDXFY +ugCm4l2l3C7lgZZBzZ+lHCFKxUi20jR87YaYyORBgtxOhAkik0acjI2vLOF4XA8GC0Q geYm9zJJ0cdVwS821Ua+V7qYInGPxoXkSe3Wg/8vF2kLC4JIcz9733wWzvcMYKqMoJR1 5jww== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :dkim-signature; bh=qGJ2xekeqb807sI0pbt3Phnbos/eFv9zHeZ42O3z1Ic=; b=Z1JUDHcN5sZ+eQZLDR96kRRjX3VqZQC+XtSt4l1AFPX9uuTrp5nz//p3x4TJNtKoOE 40r5GuMLAkazsnkj+AklIr1xBEyeTk3+NQc5loYI2EHB7VQzifQbyfNtaJC2TgYJ7thr AvkfQrR5GN++qmd9Ep63gsP0p1tVcqo7wVrMlhfduCzVnqk/wRAfdMmNe45iXLh6cBQa mkieTB4FzulLU++w8aDe48/SinbrmZSESpkjAxuZMmXYkE+gDgou03f8edNLpkR4bK82 Upj2LzlmK6KDC2xB/uBKw+/z0kkqje0s7Su/GOGm/UwJWSwsaeTZa9rV0tfhbxnJMBeo v62g== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=HmFacOQR; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 40.107.22.64 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 EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2064.outbound.protection.outlook.com. [40.107.22.64]) by gmr-mx.google.com with ESMTPS id bd21-20020a05651c169500b0026fb9b63793si438359ljb.0.2022.10.17.00.55.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Oct 2022 00:55:54 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 40.107.22.64 as permitted sender) client-ip=40.107.22.64; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=HmFacOQR; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 40.107.22.64 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=KIp9kE4eAC0v5nd8D/D8ZmsOJxHyWoSkId1ufK8EgHYH4YBndQgeBopTJ+phnB5rah0nmvaNeCfeVGIHOxuo1UGnUUpyTr3s8aEAhiGTckul1hWlwCyTQ/ynWQUDg6SeahdRrSrVcwFtWzhGrm4rTqmlzZF+aL/Y2bqpjmkIhEINffmibSsAnaqDNKHnz+Vo/RowsFeg0vXLHfvs961+jW4e74D7aCRrA0jwxMKNi+0OMjP5s42jzH5SsLdNFwYPasOp8VXAVpYl9FrecE+5lHqJyBexMkHPxnpxbf+p0zqkmoUvKdWGjSpPe3CJVF9cDbtYbCLi+7bB5l1mDvva7A== 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=qGJ2xekeqb807sI0pbt3Phnbos/eFv9zHeZ42O3z1Ic=; b=oHyDo0G3S8LVOxBpl2HDmXbi3RtcEudvXwdxnTTeJIXDYfLc2JrvAtGQD2b3ncvdqoJlYsP6Jmhs8w2P5DCTrkBiKgw+nbPiS1u2cDmbqCetuy5d2+DKbnvM1RedfYdmnWP0GISQzIlkOOuQlvK6YwYw3ggzCDMxvmse0SMdzRnOkldhZEVF+gE3QmwcFcGIhVaobRpC98mTEmFdmJJDdA6rZDusSYVrxej1aY5keYffE7PqDZKZUodxqBlKyAdiIC1wi4dLOqweRv+ViHi2JJqaQWBzQLwu3fjU3srcEkdQX5uyXZy+HWW/c2HPAt9d316iY2EHTv4wcBSCqjsY9w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.74) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); 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=qGJ2xekeqb807sI0pbt3Phnbos/eFv9zHeZ42O3z1Ic=; b=HmFacOQRhKvvsEv/cFz/9tHpZ10KTKEJC8kUQbTm7jS0l1u5b7KTAPtByHF0SSLeZPP9puqzGnJ6EIcPF9GdzyZKjpJTigaemC8SwFC4tiWuwrztj2/K/aBUbI1e9m3oeZO27v0QJE6slkTACuOkV6zJKhnTUifOPv6quWhZoj8gNiTfo3z27/mUeoRlD375WXHcxkU/Fs6Z+lm8iiVg3FuibjauUFC5qtxbvtZlBoo+HzWVPYM75FRmA8di2u6v6LTc9LCAI121HgOYmJof+iR9t5lClG57w8uJy+zs68uwakNIsdeY1KUzH6UqCdVcb/l25/rKi37iMvmA3PRI/w== Received: from GV3P280CA0010.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:b::11) by VI1PR10MB3198.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:132::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.32; Mon, 17 Oct 2022 07:55:53 +0000 Received: from HE1EUR01FT081.eop-EUR01.prod.protection.outlook.com (2603:10a6:150:b:cafe::89) by GV3P280CA0010.outlook.office365.com (2603:10a6:150:b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.30 via Frontend Transport; Mon, 17 Oct 2022 07:55:52 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.74) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.74 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.74; helo=hybrid.siemens.com; pr=C Received: from hybrid.siemens.com (194.138.21.74) by HE1EUR01FT081.mail.protection.outlook.com (10.152.1.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.20 via Frontend Transport; Mon, 17 Oct 2022 07:55:52 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC8VQA.ad011.siemens.net (194.138.21.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.12; Mon, 17 Oct 2022 09:55:49 +0200 Received: from [139.22.133.53] (139.22.133.53) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.12; Mon, 17 Oct 2022 09:55:49 +0200 Message-ID: <9bbc8c30-7ca7-25cb-0f5a-786028fa939f@siemens.com> Date: Mon, 17 Oct 2022 09:55:36 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.3.0 Subject: Re: [PATCH] wic: Fix non-existing initrd case Content-Language: en-US To: Henning Schild CC: isar-users References: <20221017094944.1eb72c20@md1za8fc.ad001.siemens.net> From: Jan Kiszka In-Reply-To: <20221017094944.1eb72c20@md1za8fc.ad001.siemens.net> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-Path: jan.kiszka@siemens.com X-Originating-IP: [139.22.133.53] X-ClientProxiedBy: DEMCHDC8WBA.ad011.siemens.net (139.25.226.105) To DEMCHDC89XA.ad011.siemens.net (139.25.226.103) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--13.819500-8.000000 X-TMASE-MatchedRID: 8xNMUprDHac5QaOxwNGfvo9bHfxDWoibW6eKzKKCgnNweJDozYf4K215 iJF8eE6rvLL0od1HqmDJ/xZIRP3JckqQBTXuA1Ce0I0xE7y3y0XEQS2ecfkpF2vOwg12ikVSP6T ki+9nU3+2ZO4LLn5VSmSSWxIg3If8vTFNo8PUukg25ztIijgyPgnbQnr9fWNSec1y1wrvN8UEa8 g1x8eqF/n6214PlHOFYG32ZLukpVN6ipWzVkuu8DN360kR9zHUXHEPHmpuRH05f9Xw/xqKXVkMv WAuahr8+gD2vYtOFhgqtq5d3cxkNdcOPVDgA8uF40N49yalU3b170mhggOen3iRqee0VMHVCRra r+7pxYg= X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--13.819500-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 357CDE838063D14998B6D1313BF469CE98AEAC8E495A6AB46F9096E3FE2935D62000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1EUR01FT081:EE_|VI1PR10MB3198:EE_ X-MS-Office365-Filtering-Correlation-Id: e0b88793-7ca3-4733-e611-08dab015039d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gXD/qn2KSC6oeMrF8zPRx/oUnEpzexcNYawqW+KlVBPU2dUs1YX0IxOXWxRb49jPaJcCbvuyUSvcwmSJewdviBEESJjhgU+pAJlCfbDpGkhdF6MRf69L1lBDUKmn7jiC7fbUf5FxcBKwN2qDkS5+9ZGn/E8kR+fyZGlJ+CCjUnS4MxVEyzVKVRRTqJs2vIjtFLEU04Fj9HvKXhdcC1WToqDr0vaGZAXN7p/tgV6O3KJkP8FyGLwRQmTtr0jfwFtWJsVla8f6fJfbLK4g6YBKLMF+cD074xg2f9H1HpZh4H51vsV2ujGEnf/qpxm2om6HVJ+IQby374NDRgEiSTjGqdpF9NNFOGFnUNVM5wGcaOonszT0IpsyliaJTdfA7JwcHOKLw4HN3UK4cx1HM0I98+aaV0AqqH5P46Hh1uMWCBui/GE6eQ67u4nIcWQplqwKpIIj4ph+9mC/eRaWl0MfEWcCKhO4pic+APlalQ2iYtPaW2meGWkOE5e/GGuEep54Df49NBpqAfchfT514Hhj2NQT20eYAw0N7LRBGf90gORNILhm1hYF6Q+XgM3TJ5xRAMkLv/dPtTkM845KI8icaeJdPDfIhRJQhsnGlXBe1YCKuw8Aifb/IFhw/I5HfH5AuiL3p+bC2AoYPErdCHHgGybwQGp9y1qdOaaevZYkl3YQePO1ei3j0D7y29LZtGmTGvfq0k59kNThSzCCCiJsfAKluHyIFsqQFAe5YAKT0T8cGW642YIr9jileK1AJnBlS+CsGRHA4ikLLbfuRxEVRJ4az4NeYavdWqvGLF1+EpiWeh8G1iOsSUUZuFrhL9f6uWxOMAyUTBHoQSxEYc24D7YdYrhnvwziCA/REgt2QiA= X-Forefront-Antispam-Report: CIP:194.138.21.74;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:hybrid.siemens.com;CAT:NONE;SFS:(13230022)(4636009)(346002)(136003)(396003)(39860400002)(376002)(451199015)(40470700004)(36840700001)(46966006)(37006003)(2616005)(956004)(16526019)(47076005)(186003)(34020700004)(83380400001)(7636003)(336012)(356005)(7596003)(31696002)(86362001)(36860700001)(82960400001)(82740400003)(5660300002)(2906002)(44832011)(41300700001)(8936002)(4326008)(6706004)(6666004)(82310400005)(6862004)(40480700001)(8676002)(40460700003)(478600001)(16576012)(26005)(53546011)(316002)(70206006)(70586007)(6636002)(36756003)(31686004)(3940600001)(43740500002);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2022 07:55:52.6890 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e0b88793-7ca3-4733-e611-08dab015039d X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.74];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT081.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB3198 X-TUID: A2Td8RW4PR42 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 ;) Jan -- Siemens AG, Technology Competence Center Embedded Linux