From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7107574654634557440 X-Received: by 2002:a17:902:ebd1:b0:162:224f:abbb with SMTP id p17-20020a170902ebd100b00162224fabbbmr56824274plg.160.1655107841438; Mon, 13 Jun 2022 01:10:41 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:902:f54b:b0:163:f358:d4b4 with SMTP id h11-20020a170902f54b00b00163f358d4b4ls3148714plf.7.gmail; Mon, 13 Jun 2022 01:10:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwm+KXXvI3+GcKEraCCTXxX8eQFgaM0Kx8JV149BPI9WhITVLa2HZtqM/hfbzi+HUPYTAH8 X-Received: by 2002:a17:90b:1b05:b0:1e2:a053:2fad with SMTP id nu5-20020a17090b1b0500b001e2a0532fadmr14449562pjb.209.1655107840578; Mon, 13 Jun 2022 01:10:40 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1655107840; cv=pass; d=google.com; s=arc-20160816; b=Xp2purzca1MfPrpk/573Qgdj7xuRemZQP33YlrOyT3PdFW3FO8OLnYFOKTfVOpRB7i PozA1VOikLCx5VDZRD+Et7h1xcRMe1/ezdIotLqL2fpR8sYlQ644zBHdSpdrzqjQQpS3 KmBCMKNZLM2TMbSKrImf3rI5F/TiJTSJVAx8S2kOkxKBHkjEPCwCQQeSse3f/51u1JeM 3c+rgq6kwMmiHwIX2EMy2UBDz8tT5gYEihgYaHOroBiZVxGHKbgp8l09w7a3b2Hs5Usp q3ggcuobHxUUC6/+364mPV2Ib/QDJ7V5Hu9Kqoc7EMhQ6HDzphimvkW8DwTZOU2ncTTF /iTA== 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=Dku6VhTTTOXZo7/eSnoRHLEM0ytQ+rhDEKFVRlDmbKw=; b=wCdGLU8mXv250ErW0SDAj3TBjnRG7CGdHgNT3O8+xj05YqlxGXbQiguQeSuMQj4pLh v8Sg3P+Ci8Sr0qC8G5osucwNUUd8TN/eIgCrkdqAn6k5KYLy0kupLQJM6CQ2bG7RxyQp OPN6+xRKEtbzYpVz2VprBf+2kZfBmiQmhcr6J52+lpHNEuceDcUrwp0jZquczgj+EF0o 4i2NbAuMZGAYvIDgq74QUf7n42K+Aw3T9UiNrhIZ0o8tWObhpigiVJhX0QeX6hMwUQev aBgBk4KX3r48MKeUOFhK1Cqnel4PsA1Cu6LSwpmIKePHNhKsA5ghI5sV5EB42o3SV5ZZ fZgQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=tHhT2RBe; 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 2a01:111:f400:fe0e::617 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-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0617.outbound.protection.outlook.com. [2a01:111:f400:fe0e::617]) by gmr-mx.google.com with ESMTPS id o135-20020a62cd8d000000b004e1a39c4e87si287627pfg.0.2022.06.13.01.10.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Jun 2022 01:10:40 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0e::617 as permitted sender) client-ip=2a01:111:f400:fe0e::617; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=tHhT2RBe; 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 2a01:111:f400:fe0e::617 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=mNkGssSjscUts1B65YRWTa1MYs+4qPe1e/11lSr/Y/AADqGEx7AjZW3GcpNIMNW6yEcAGolUx07sUBZzv8gnhhW9ZCU8+GwsCtr9Mj4PWhxHmR4HzFycOduGLSCZWPvDhfwfBUbUzPJR+eE359LBtcK8Usts8svNePSvjHuHUhJ43GGOJuInXUuH2mKbxC7H6C5QYeTmHBcU9HaYSfbLn3UqRLWUeaQGXcjgQ3OHH+CLe4msB4SzjF4ddpW/QbzxoHI4647iA458ONJ0KLzsTsRO8S8OBkA1U3/zzk0XmlY3oRyn7YmHmf8+eG+vc8bLFlZp9cMrvBqPf3i0z1J5DQ== 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=Dku6VhTTTOXZo7/eSnoRHLEM0ytQ+rhDEKFVRlDmbKw=; b=ToXz7kPDTbAi4BK1fYnRwVr1ovRkG15NPX3LOJ+Me+YGgfwrjTCRpidmVcCvH+MQ0U2AYbNddaNUK0i5U50Wm+qCAYTWevfk8juo5sQCBjvrI+CDAnUtsEXYiodOBhsbiAOA5eNUh6rDf8Y54SjAq44N7t23dHeuesE5uiaPiUjhb2qE1Ckqx+J/ctR5gLxlGdEBBGr/yMUS4u7spcFKEox+DJbv2dzC3RddeOj7BcD4bhHLq90JQZi75eX8vwRj7S5fldLhHBjATtWq9h+RMXf8GgQbGD4pDYYDQqaU5ao0sYqTqr6hBkSJUGTF1g7oXr/xzqTRkVsuJFmqZZ5WKQ== 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=Dku6VhTTTOXZo7/eSnoRHLEM0ytQ+rhDEKFVRlDmbKw=; b=tHhT2RBeb/nKtkW/oREHFUVU2+qxykS4A3Wvut2YkFkRgjlm40gy6Ei676qcbeYV5cYhYxTCGdOHYapKfANC7dqTHdFmBLvbckhJ2kbMf7wtpvdqD5wBSe2aMdDs00RXz0htGy1hcrVPaqWJFnrucVg0L5iQqwp5RKwlyedpgy6zKOrRZsLmKkW1AOdKS7X13mj2pwtAtT2PgjRpcf5IoZqQ8i2+4L1kM/R8VEgpTfVUQ669srdMANQhYj6d7gbkS71nSUMEvGtU32pTI14GW/UWkp1mrA0Zw35+kTZO5L1RDH7a0Rndg7vBSlOU/S+55FtyeE1qWHss6syj+/yN4w== 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 GVXPR10MB5864.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:6::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.20; Mon, 13 Jun 2022 08:10:37 +0000 Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::b925:3d3d:8f5f:c4d9]) by PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::b925:3d3d:8f5f:c4d9%7]) with mapi id 15.20.5332.017; Mon, 13 Jun 2022 08:10:37 +0000 Date: Mon, 13 Jun 2022 10:10:35 +0200 From: Henning Schild To: Vijai Kumar K Cc: , Subject: Re: [PATCH 1/2] meta-isar/wks: prepare wks for wic uprev Message-ID: <20220613101035.0f39fdd9@md1za8fc.ad001.siemens.net> In-Reply-To: <20220610113919.2051302-2-Vijaikumar_Kanagarajan@mentor.com> References: <20220610113919.2051302-1-Vijaikumar_Kanagarajan@mentor.com> <20220610113919.2051302-2-Vijaikumar_Kanagarajan@mentor.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: AS9PR0301CA0009.eurprd03.prod.outlook.com (2603:10a6:20b:468::16) 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-Office365-Filtering-Correlation-Id: a1e430ed-ec95-4c6e-6bda-08da4d14328e X-MS-TrafficTypeDiagnostic: GVXPR10MB5864:EE_ X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JYNZKFAO0KcRU1oRGmIz/4ST4g+ClHb+XF71TF4Ocl7lg9Zl8aA+bMnepeO+tvvNxX461OOlX7E3/LuLBPUyfGpYMhUlaVfRMcWe5WhACE3tWarRAcN1vq3tB0zCNHMeNBegMn3PWlN1l+LY3RTqNDBwSPpDoIzQO+cPtMvolvPVt0RmxOxR5NlsH2d1EaghBAIMZqZP5eVPUC5BQtRJyP+ZZFyT9b2u8/45giDpTuRsvuuN867Oq2JjqvEu72oiz7sYZG8z19AYNpBLQ/Yp10D2DibJ36mHqiDVp0geerrBDO3tuXq2tzva6pS+EQ0QUg71dC8zMmeNkSrvpaC0YsN37QQTr7/FUnwJQ9NMPlSVJyDMtpL654dPUXv0erseKEJ3natUtlPAhKPvJp7tW6qb3c6wj0engUdOL1WH+umJxlbMLJHKqHVo2GjYffthzhofZLbqrjDRywYPAh7APNDBeKwsxm6qYuPv3xOQh6fh9+gfjPATm7Ex6WlSpClEAAyeDz21zkIIBfrR4Iz84usRt0QSX6dz66TPMF7Ak3U7kj53ESIoZod9IBstt6BtMFH5zL1j6lzOLAWiSmu/cht06UfgAWu26MAUu1AW8WOWJ6gLWJXLL2dkiuhKf40NAtQ9LaE86YHlElt7K3i9yw== 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:(13230016)(4636009)(366004)(38100700002)(4326008)(2906002)(66556008)(8676002)(66476007)(66946007)(82960400001)(83380400001)(8936002)(508600001)(6486002)(316002)(6916009)(6506007)(54906003)(9686003)(6512007)(5660300002)(26005)(107886003)(1076003)(86362001)(186003)(30864003)(44832011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?aIvBHj7JfwXSaTKkH7PZ4Zfm14tCzrbtd6d2a4HUh84ziDTUyXReadfs8ua7?= =?us-ascii?Q?kKr5MvOobNgn24kATu7icZV52FvT36xKNaz+itTFghinp6+P5snYfG1xKx0A?= =?us-ascii?Q?Aakucz+LO4RV3uj/K64hTphnby2bHU4gMrSVJFhTIP3v8TACCVz5qFtoggT/?= =?us-ascii?Q?27lLHTxn9w7ShFJfLBiiw1nEbOpEeGAOA0/pIFWQP/NLWGqjMdlivjKjy4w4?= =?us-ascii?Q?5rfxVWK94z6fA+gqNd4ED+EVI0Zt8/Wf6cmev5kl2y6syNwDsmxuGRY+2QtU?= =?us-ascii?Q?oX7I4B+jvEB3XPSC9NYMcYVrL8eu9+MM0mDj2P9hcllR3x3HLMbPpM06ko4g?= =?us-ascii?Q?Xe3uT1m8xBBgiU67xO2w9r5+hnRg58AbxTllPFG6eYVw9H+YylsxXEzOHXbt?= =?us-ascii?Q?FDk9i2J+WdstBBToyfHNKmCHx1IbBnhSWlJ3/iVYNE9WXq9VkfWy8pcdAS7W?= =?us-ascii?Q?SsbYyALpfu1BbDIkgQ4BP3ptNPHi800v/eTWuD8vF4iKJTM4//oucvgUFTlS?= =?us-ascii?Q?OIjmljktDV3ZWQceii27XXmIoa3ufO6XvsIT8JwGZoPuHOy288J6iETOegCz?= =?us-ascii?Q?hlEGsPzx1XRu04/v66NP9tqu+IVO4dWdTl50cQmg3uE/Q/N74+TmWXd5u3bj?= =?us-ascii?Q?0Z8uvXHB6S4vJRXRa6xSL/+UgykUkwtxMPcBzt+lPGCPBWLc3UhCXOKUibzg?= =?us-ascii?Q?Wdcis2GEHJn4GUPMioXHVg+KBx+BOA8xhiWE0FSIc3KQsu+P8ItTDPXWM+Rt?= =?us-ascii?Q?1SkcIYVBRv36oWn+YLFaAR4ay/XWxqEB/O9TIk/ZOPkVqoD4tVvr6jn1H2uv?= =?us-ascii?Q?7jh+8hv93jAnRrdR+Zh3kmsK1Tv9CFCqoZ9wxqzDWWpPKKQ83hK1R9hv/E5I?= =?us-ascii?Q?A9/Ynnf78ys8DOosD+OfIy2YbWzK//73yiEVyXa2LsLGz6nUJT2qQIC+7HbF?= =?us-ascii?Q?KQd5ab0nGV2AdBPCks7My5etXboHShXLtXiNYmGK5ZZ/YalLHIwjWpbcD5WM?= =?us-ascii?Q?+feSHBMK8dBr7YQ04qtm18kwouuvffvp2Q+9SKPN+Q72PLiOZNClrYYHjtmF?= =?us-ascii?Q?tcMjorlg+7BZ1Mf2RPudFdCC9MW1VQqgFK1A+D1JYN9FgQiI4+SmWysK+d3G?= =?us-ascii?Q?V1pivp+vxjD3VyMTethPRfBeWetslXabQvIq9g8a6sIu2XspBPCEv8NaUA0V?= =?us-ascii?Q?vd4Gl20V/CpmYRo4Vgj/ra8qin3+YY4RjZPS3XB/cGvYhagVmb9gzxsjtoL2?= =?us-ascii?Q?Yv+uGXKqgf/MYj8nNuw/3wBhJ07faxlHSaX1cFqfijKxnrHr0lj4jOIIpl6j?= =?us-ascii?Q?CiYPkNVIOcCNmPSit658bcCpYpVNdWZNgApCfo89Eqb1Gv5ZVKov34fdE56w?= =?us-ascii?Q?NYc4cSCV0G6/Z9CURWeU/RHjXlJze4rzefGx65sHd1eYWR4rauk0rj88+I83?= =?us-ascii?Q?lvSv5IyHVbJL3Z+5XfkhknzY3g3311Rp2X7bK6IqkZaoRmnTsZKZ/udkG7Cp?= =?us-ascii?Q?9VttNIMA/GbCNK15NQUctm1jXcNYECN2wW0kglh+uRovXEd847eoEbEYz7MT?= =?us-ascii?Q?YB7vxfVm4QNFZyPaNYhwgbU7I2qOVTGHlm96DrjN44g7rMJ4fWYCCV3x3CTm?= =?us-ascii?Q?y3osS0wagQ0vEOd0blP2kFgpNILxpFwqALn1dF8DgOmd+uGTFWIjPCC1dYrV?= =?us-ascii?Q?/0I9Na8jk41x331TvijzHjvWupKTyYhD4r4XoF25jkKgDrZYeialAzJ/YBAe?= =?us-ascii?Q?m23VaxzENGsSwh5t5oZdVEkiyynnXfs=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: a1e430ed-ec95-4c6e-6bda-08da4d14328e X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2022 08:10:37.0320 (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: acCKK3FAnL+UxdOQtJe1Hm43ItUpzNoCB/XYTyIQGsbe5ekrT1beNctXGnEJjgU5Fadp6VVOQ5lrDB0CV8sFqHuZuExPNlGES1WldNxYfJ4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR10MB5864 X-TUID: cQNV0Aum/Esx Am Fri, 10 Jun 2022 17:09:18 +0530 schrieb Vijai Kumar K : > In the current version of wic we use, "/" mount points are ignored and > their entries are not added to fstab. > > But in the latest version of wic available in oe-core, this is not > the case. "/" mountpoints are respected and are added to fstab. > > ISAR already creates the necessary fstab. With the new version we will > end up with 2 entries for "/". One from ISAR's image_configure_fstab > and the other one appended by wic. > > Explicitly drop "/" mountpoint args in wks files to avoid this. I would not do that, at least not for the wks files we have as forks, like "common-isar.wks.inc". That second fstab line should win and if we really dislike the duplication we should remove the first one from the rootfs configure function. Henning > Signed-off-by: Vijai Kumar K > --- > meta-isar/scripts/lib/wic/canned-wks/common-isar.wks.inc | 2 +- > meta-isar/scripts/lib/wic/canned-wks/de0-nano-soc.wks.in | 2 +- > meta-isar/scripts/lib/wic/canned-wks/efi-plus-pcbios.wks | 2 +- > meta-isar/scripts/lib/wic/canned-wks/hikey.wks | 2 +- > meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks | 2 +- > meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in | 2 +- > meta-isar/scripts/lib/wic/canned-wks/rpi-sdimg.wks | 2 +- > meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks | 2 +- > meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks | 2 +- > meta-isar/scripts/lib/wic/canned-wks/sifive-fu540.wks | 2 +- > meta-isar/scripts/lib/wic/canned-wks/stm32mp15x.wks.in | 2 +- > 11 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/meta-isar/scripts/lib/wic/canned-wks/common-isar.wks.inc > b/meta-isar/scripts/lib/wic/canned-wks/common-isar.wks.inc index > fe028b5..32a358e 100644 --- > a/meta-isar/scripts/lib/wic/canned-wks/common-isar.wks.inc +++ > b/meta-isar/scripts/lib/wic/canned-wks/common-isar.wks.inc @@ -1,3 > +1,3 @@ # This file is included into 3 canned wks files from this > directory part /boot --source bootimg-pcbios-isar --ondisk sda > --label boot --active --align 1024 -part / --source rootfs --use-uuid > --fstype=ext4 --label platform --align 1024 --exclude-path=boot > --mkfs-extraopts "-T default" +part --source rootfs --use-uuid > --fstype=ext4 --label platform --align 1024 --exclude-path=boot > --mkfs-extraopts "-T default" diff --git > a/meta-isar/scripts/lib/wic/canned-wks/de0-nano-soc.wks.in > b/meta-isar/scripts/lib/wic/canned-wks/de0-nano-soc.wks.in index > 0794a2f..15dab79 100644 --- > a/meta-isar/scripts/lib/wic/canned-wks/de0-nano-soc.wks.in +++ > b/meta-isar/scripts/lib/wic/canned-wks/de0-nano-soc.wks.in @@ -5,6 > +5,6 @@ part --source rawcopy --sourceparams > "file=/usr/lib/u-boot/${MACHINE}/${U_BOOT_BIN}" --system-id 0xa2 > --align 1 -part / --source rootfs-u-boot --ondisk mmcblk0 --fstype > ext4 --mkfs-extraopts "-T default" --label platform --align 1024 > --active +part --source rootfs-u-boot --ondisk mmcblk0 --fstype ext4 > --mkfs-extraopts "-T default" --label platform --align 1024 --active > bootloader --append "rw rootwait" diff --git > a/meta-isar/scripts/lib/wic/canned-wks/efi-plus-pcbios.wks > b/meta-isar/scripts/lib/wic/canned-wks/efi-plus-pcbios.wks index > 0392891..9bff6aa 100644 --- > a/meta-isar/scripts/lib/wic/canned-wks/efi-plus-pcbios.wks +++ > b/meta-isar/scripts/lib/wic/canned-wks/efi-plus-pcbios.wks @@ -1,6 > +1,6 @@ # Example to show how to create an efi + pcbios image # Note, > that the loader argument is mandatory. But systemd-boot also works. > part /boot --source bootimg-biosplusefi-isar > --sourceparams="loader=grub-efi" --label boot --active --align 1024 > -part / --source rootfs --ondisk sda --fstype=ext4 --mkfs-extraopts > "-T default" --label platform --align 1024 --exclude-path=boot +part > --source rootfs --ondisk sda --fstype=ext4 --mkfs-extraopts "-T > default" --label platform --align 1024 --exclude-path=boot bootloader > --ptable gpt --timeout 3 --append "rootwait console=ttyS0,115200 > console=tty0" diff --git > a/meta-isar/scripts/lib/wic/canned-wks/hikey.wks > b/meta-isar/scripts/lib/wic/canned-wks/hikey.wks index > 0c966e6..28bfa22 100644 --- > a/meta-isar/scripts/lib/wic/canned-wks/hikey.wks +++ > b/meta-isar/scripts/lib/wic/canned-wks/hikey.wks @@ -5,6 +5,6 @@ part > /boot --source bootimg-efi-isar --sourceparams "loader=grub-efi" > --ondisk mmcblk1 --label efi --part-type EF00 --align 1024 -part / > --source rootfs --ondisk mmcblk1 --fstype ext4 --mkfs-extraopts "-T > default" --label platform --align 1024 --use-uuid --exclude-path > boot/ +part --source rootfs --ondisk mmcblk1 --fstype ext4 > --mkfs-extraopts "-T default" --label platform --align 1024 > --use-uuid --exclude-path boot/ bootloader --ptable gpt --timeout=3 > diff --git a/meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks > b/meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks index > b3abb3d..3f524d5 100644 --- > a/meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks +++ > b/meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks @@ -1,7 +1,7 > @@ # Example showing how to split a single rootfs across partitions > part /boot --ondisk sda --source bootimg-efi-isar > --sourceparams="loader=grub-efi" --label boot --active --align 1024 # > when excluding paths, just specify --exclude-path once and separate > paths using spaces -part / --ondisk sda --source rootfs > --fstype=ext4 --mkfs-extraopts "-T default" --label platform --align > 1024 --exclude-path boot home --extra-space 1G +part --ondisk sda > --source rootfs --fstype=ext4 --mkfs-extraopts "-T default" --label > platform --align 1024 --exclude-path boot home --extra-space 1G # put > home last to support auto-expand of this partition part /home > --ondisk sda --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home > --fstype=ext4 --mkfs-extraopts "-T default" --label platform --align > 1024 diff --git > a/meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in > b/meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in index > de1c92c..7df6ae8 100644 --- > a/meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in +++ > b/meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in @@ -5,6 +5,6 > @@ part u-boot --source rawcopy --sourceparams > "file=/usr/lib/u-boot/nanopi_neo/u-boot-sunxi-with-spl.bin" > --no-table --align 8 -part / --source rootfs-u-boot --ondisk mmcblk0 > --fstype ext4 --mkfs-extraopts "-T default" --label platform --align > 1024 --active +part --source rootfs-u-boot --ondisk mmcblk0 --fstype > ext4 --mkfs-extraopts "-T default" --label platform --align 1024 > --active bootloader --append "rw rootwait" diff --git > a/meta-isar/scripts/lib/wic/canned-wks/rpi-sdimg.wks > b/meta-isar/scripts/lib/wic/canned-wks/rpi-sdimg.wks index > e5a3668..c76013f 100644 --- > a/meta-isar/scripts/lib/wic/canned-wks/rpi-sdimg.wks +++ > b/meta-isar/scripts/lib/wic/canned-wks/rpi-sdimg.wks @@ -1,5 +1,5 @@ > part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat > --label boot --active --align 4096 --size 10 -part / --source rootfs > --ondisk mmcblk0 --fstype=ext4 --mkfs-extraopts "-T default" --label > root --align 4096 --exclude-path=boot +part --source rootfs --ondisk > mmcblk0 --fstype=ext4 --mkfs-extraopts "-T default" --label root > --align 4096 --exclude-path=boot bootloader diff --git > a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks > b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks index > 754fbc4..43e6dc1 100644 --- > a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks +++ > b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks @@ -4,6 > +4,6 @@ part /boot --source bootimg-efi-isar --sourceparams > "loader=systemd-boot" --ondisk sda --label efi --part-type EF00 > --align 1024 -part / --source rootfs --ondisk sda --fstype ext4 > --mkfs-extraopts "-T default" --label platform --align 1024 > --use-uuid --exclude-path boot/ +part --source rootfs --ondisk sda > --fstype ext4 --mkfs-extraopts "-T default" --label platform --align > 1024 --use-uuid --exclude-path boot/ bootloader --ptable gpt > --timeout 3 --append "rootwait console=ttyS0,115200 console=tty0" > diff --git a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks > b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks index > f3addbc..530304f 100644 --- > a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks +++ > b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks @@ -4,6 +4,6 > @@ part /boot --source bootimg-efi-isar --sourceparams > "loader=grub-efi" --ondisk sda --label efi --part-type EF00 --align > 1024 -part / --source rootfs --ondisk sda --fstype ext4 > --mkfs-extraopts "-T default" --label platform --align 1024 > --use-uuid --exclude-path boot/ +part --source rootfs --ondisk sda > --fstype ext4 --mkfs-extraopts "-T default" --label platform --align > 1024 --use-uuid --exclude-path boot/ bootloader --ptable gpt > --timeout 3 --append "rootwait console=ttyS0,115200 console=tty0" > diff --git a/meta-isar/scripts/lib/wic/canned-wks/sifive-fu540.wks > b/meta-isar/scripts/lib/wic/canned-wks/sifive-fu540.wks index > 9cd0e66..f63b06a 100644 --- > a/meta-isar/scripts/lib/wic/canned-wks/sifive-fu540.wks +++ > b/meta-isar/scripts/lib/wic/canned-wks/sifive-fu540.wks @@ -5,6 +5,6 > @@ part --source rawcopy --sourceparams > "file=/usr/lib/opensbi/sifive-fu540/fw_payload.bin" --ondisk mmcblk0 > --fixed-size 8M --align 1 --part-type > 2e54b353-1271-4842-806f-e436d6af6985 -part / --source rootfs-u-boot > --ondisk mmcblk0 --fstype ext4 --mkfs-extraopts "-T default" --label > platform --active --align 1024 --sourceparams > "no_initrd=yes,script_prepend=setenv fdtfile > sifive/hifive-unleashed-a00.dtb" +part --source rootfs-u-boot > --ondisk mmcblk0 --fstype ext4 --mkfs-extraopts "-T default" --label > platform --active --align 1024 --sourceparams > "no_initrd=yes,script_prepend=setenv fdtfile > sifive/hifive-unleashed-a00.dtb" bootloader --ptable gpt --append > "rootwait" diff --git > a/meta-isar/scripts/lib/wic/canned-wks/stm32mp15x.wks.in > b/meta-isar/scripts/lib/wic/canned-wks/stm32mp15x.wks.in index > 4ed4ee8..2fa8ebf 100644 --- > a/meta-isar/scripts/lib/wic/canned-wks/stm32mp15x.wks.in +++ > b/meta-isar/scripts/lib/wic/canned-wks/stm32mp15x.wks.in @@ -11,6 > +11,6 @@ part teeh --part-name teeh --source rawcopy --sourceparams > "file=/usr/lib/optee- part teed --part-name teed --source rawcopy > --sourceparams > "file=/usr/lib/optee-os/${MACHINE}/tee-pageable_v2.stm32" > --fstype=ext4 --fsoptions "noauto" --part-type 0x8301 --fixed-size > 512K part teex --part-name teex --source rawcopy --sourceparams > "file=/usr/lib/optee-os/${MACHINE}/tee-pager_v2.stm32" --fstype=ext4 > --fsoptions "noauto" --part-type 0x8301 --fixed-size 256K -part / > --source rootfs-u-boot --fstype ext4 --mkfs-extraopts "-T default" > --label root --align 1024 --active --use-uuid +part --source > rootfs-u-boot --fstype ext4 --mkfs-extraopts "-T default" --label > root --align 1024 --active --use-uuid bootloader --ptable gpt > --append="rootwait rw console=ttySTM0,115200"