From patchwork Thu Dec 7 15:41:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: venkata.pyla@toshiba-tsip.com X-Patchwork-Id: 3228 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 07 Dec 2023 16:41:31 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-oo1-f56.google.com (mail-oo1-f56.google.com [209.85.161.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 3B7FfTQc030709 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 7 Dec 2023 16:41:30 +0100 Received: by mail-oo1-f56.google.com with SMTP id 006d021491bc7-58aa86278e1sf1022350eaf.0 for ; Thu, 07 Dec 2023 07:41:30 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1701963684; cv=pass; d=google.com; s=arc-20160816; b=UXZeWmvzG0azKuesIWJhNWFbsm3XJ7uSY5XxdM0oNN2qq9lsSecHyVjlykHHRH5PUr oSgj0p85KWIl2+ls9FLKxaCniPdXyX7w2KLWUfM48g79XBUkDZ7V/CaKCDDhEeNUkJeo 6Hi6HGs3GYpMbwOcWWWBoiPIX3kRx8qvUPxDEaDCy2ylQ6A5AS/SoAwzDlEn2SHCIsfe PkBWOZnHMcr6KmIYvD8VktDMjG7Fq8fbKDXsiM+Slu2XJkAQfVOiH0GwmI99p/uHpH83 y9LIJC0osBdU6RGYPQ/23OH1cufeZY0cnuAUwTOs36cXxF9Iinu+RakYNbRM8IPV4Wm2 SSxQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:sender:dkim-signature; bh=zcmoY+FrqIga4gIfrOAAyHKRNpRbCNJEV6aMCMt8QbM=; fh=0lUGB2344BCNlOMKgxbVcIhrk5SvZVfMXmxQVZJT4o8=; b=E4AI1RooFxMozxm0SeQNOWD3tDpVW5Wm0XhmmsjDZY4Nl/KBxIzoh7BddavnHj+fIY OSjN4A6pwxKW5OJ4OhTqZAUrxj/DQWQt2HUR/nnGEtNhqqdIBIgQbqk/lqOizCEKUmrh PFecjyIG8yR5Bwh1BVPkRugkmnD7kV+0LUXNitzaNRBWTLg/uTpUR3KaZvr2AVDCZW0J bo96vmULhrIY3taI3mD7Kuo0HXS5N6tRJAV+/oIvA9TK2jHcaknxUWPx5fdz5RTuWdK8 1jImEuf9YmUz3m1VlT4cpaZcHL3cIykzDGVunddQ7CJJ0V3ND5WW8k8WOBPYtINOK6db piVw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of venkata.pyla@toshiba-tsip.com designates 210.130.202.135 as permitted sender) smtp.mailfrom=venkata.pyla@toshiba-tsip.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1701963684; x=1702568484; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender:from:to:cc :subject:date:message-id:reply-to; bh=zcmoY+FrqIga4gIfrOAAyHKRNpRbCNJEV6aMCMt8QbM=; b=lFgc/d00PMXnH+R5quMZ2NUCQwRRHf3kciZ4u77oE1x1IOy/h+RUf/VFWdft2DPTtO mz1M212BPqI56KF6T4iFSzawu3wVbPFohfd6BkHRWBV9aUS84itVH/KXXhq0+j5qBxjy MjmsVPEdlOAJi/Ipv0wa1Krs/vzJtodvnWNVrhsbR2ttHBeySHgVmRE01yNCUoy2kHXP TnOWNJAhR8jjt/QPWvZY8EFdgNU5Jr3liHzU91fzML2hNuZc2QSpILrJOfRbXX3/dtEQ jdruwHwF0bDOXHJPmUBj8j5Kw07Uc4iLjrL7NQmOQqjM4Ag2mxFQnSS11Q9LsXa1vruo w8zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701963684; x=1702568484; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :sender:from:to:cc:subject:date:message-id:reply-to; bh=zcmoY+FrqIga4gIfrOAAyHKRNpRbCNJEV6aMCMt8QbM=; b=KYUaxxCgWWjoODpYw0zNANw9NpA6g0FztkHonBuoLjqL/rOeABuOZZNDIlhUGpIn5f NAN07WJSaxtRmCxfb8ECFxk+/VP2/rixon+9fPpALFeRvIT1orCiYuhrUIlKVIw3spq/ kD1jF1/atCjZvnm5P/zmRxkITGoYPErv5CPYokGZXIkhAM9WMUx0lKoWbnXQ452INRrn MVc4vehWfnp2SeCXvh/GVJMlSUk5jBIFEVrvgOCwvt4VIOv3K4eUs0SBrrROf6gewKiX VYwBYifOSQ5q0F1vkekWSToa/+OwrU91YRpZE5ESeIATr8P19EcTmHDt37jTA52I9sdV 122A== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOJu0YwcbZv3xg4+yvgzKUke5gq1/imwoFNlHTBo7FiDVROLVCzts0LP DFEfMDFiQH95+mTjTPstrOs= X-Google-Smtp-Source: AGHT+IE3HW6L+iMIT2IUotSPZJVrMIoZtRYQKjPPpvhD31+Mt2HCfwu15ilnW6mfZ+0oaw+9B+YmIg== X-Received: by 2002:a05:6820:229f:b0:590:1b40:4aeb with SMTP id ck31-20020a056820229f00b005901b404aebmr3148650oob.10.1701963684131; Thu, 07 Dec 2023 07:41:24 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6820:602:b0:58d:582d:7ff1 with SMTP id e2-20020a056820060200b0058d582d7ff1ls1305740oow.0.-pod-prod-04-us; Thu, 07 Dec 2023 07:41:23 -0800 (PST) X-Received: by 2002:a05:6830:448:b0:6d6:4c4f:34cc with SMTP id d8-20020a056830044800b006d64c4f34ccmr3250023otc.37.1701963683279; Thu, 07 Dec 2023 07:41:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701963683; cv=none; d=google.com; s=arc-20160816; b=Z84VCPJNexjuuwo7kiS5gSpK5IfEscU/4wU2tO4deGv0tuudL2f6LZi0k4D81dHaxC uCG+FZb9e1yGxr5yjpQOAgijERtMR7iy7HVd8VZdW2vZlP4/Yr8R1Ev99eofFcNSnoPu 7U+YpQUKpPmE2WAPdKd7BSgY0S+npytph6ZhNcOLeWukt3l1qJVRlqDZ7zgt+Utl5nQe eElGKEiE39+GBwjjGn9JsY3d/4VVlCrKvn8o9IiH64uMhZN5W7xfhrv2M3FISDyHOz0b t021xKAhByBDk8EbnWLfOngnnWDJpwf8l53lb8+b2UD9nP+wA4h/MltEZC0aBhZZpbwH XtwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=WhzI2UiTUxMAr+jQdDzioqrhZ/Cp/+nMlDku8onuA9M=; fh=0lUGB2344BCNlOMKgxbVcIhrk5SvZVfMXmxQVZJT4o8=; b=XBmyZ4x/CkCc0w2eGKWdQrrkKl5WxhELJ+JPE5Abr5xpGuCe44OSOp82ktT53Eekob HBz5oI0E8cUrpCHIqfr/rjx1YQJSxezSgp3n6XFF1HbY+0/F8dkV/TkiO7FL7Vf0Ip0k D9/y/PXXKFnLqX1Tuzks4dw7kWbdNoVf1aaOvzOF0GyFVV7g5H3UFxBOHnY3tYuevWfy brNH/tmzLkI5wOJzprfbi5HMtAWY+dw4m2g7F+Sc/b5rIU314wUlrcwdtmH7yIrTjwd6 px1esAybw9w/m5uL+/MO3KkLlJteu3PGkrodf9u+jn9chH5f1ECpsObaBXGmsJNOvcUH 779A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of venkata.pyla@toshiba-tsip.com designates 210.130.202.135 as permitted sender) smtp.mailfrom=venkata.pyla@toshiba-tsip.com Received: from mo-csw.securemx.jp (mo-csw1801.securemx.jp. [210.130.202.135]) by gmr-mx.google.com with ESMTPS id s26-20020a05683004da00b006d84d3144e4si2683otd.4.2023.12.07.07.41.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 07:41:22 -0800 (PST) Received-SPF: pass (google.com: domain of venkata.pyla@toshiba-tsip.com designates 210.130.202.135 as permitted sender) client-ip=210.130.202.135; Received: by mo-csw.securemx.jp (mx-mo-csw1801) id 3B7FfKrX065375; Fri, 8 Dec 2023 00:41:20 +0900 X-Iguazu-Qid: 2yAbPDmovHUXDo1nV2 X-Iguazu-QSIG: v=2; s=0; t=1701963680; q=2yAbPDmovHUXDo1nV2; m=crRH21V0rauP1vyK72eRRDUGRBDyj+ib58flcSzuQ24= Received: from imx2-a.toshiba.co.jp (imx2-a.toshiba.co.jp [106.186.93.35]) by relay.securemx.jp (mx-mr1800) id 3B7FfJ3r1172085 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Fri, 8 Dec 2023 00:41:19 +0900 From: venkata.pyla@toshiba-tsip.com To: isar-users@googlegroups.com Cc: venkata pyla , jan.kiszka@siemens.com, kazuhiro3.hayashi@toshiba.co.jp, dinesh.kumar@toshiba-tsip.com, felix.moessbauer@siemens.com Subject: [PATCH 2/5] wic: Set file system uuid to ext4 partitions Date: Thu, 7 Dec 2023 21:11:11 +0530 X-TSB-HOP2: ON Message-Id: <20231207154114.20400-3-venkata.pyla@toshiba-tsip.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20231207154114.20400-1-venkata.pyla@toshiba-tsip.com> References: <20231207154114.20400-1-venkata.pyla@toshiba-tsip.com> MIME-Version: 1.0 X-OriginalArrivalTime: 07 Dec 2023 15:41:14.0574 (UTC) FILETIME=[CFAE1EE0:01DA2923] X-Original-Sender: venkata.pyla@toshiba-tsip.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of venkata.pyla@toshiba-tsip.com designates 210.130.202.135 as permitted sender) smtp.mailfrom=venkata.pyla@toshiba-tsip.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: venkata pyla Adding pre configured UUID's to the file systems will helps to build reproducible images. Signed-off-by: venkata pyla --- 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 | 4 ++-- meta-isar/scripts/lib/wic/canned-wks/nanopi-neo-efi.wks.in | 2 +- meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in | 2 +- meta-isar/scripts/lib/wic/canned-wks/rpi-sdimg.wks | 2 +- .../scripts/lib/wic/canned-wks/sdimage-efi-sb-debian.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 +- .../scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in | 2 +- meta-isar/scripts/lib/wic/canned-wks/stm32mp15x.wks.in | 2 +- 14 files changed, 15 insertions(+), 15 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 fe028b50..71885cb4 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" --fsuuid 1f55d66a-40d8-11ee-be56-0242ac120002 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 0794a2f3..06154e01 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 --fsuuid 1f55d66a-40d8-11ee-be56-0242ac120002 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 03928915..321be10b 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 --fsuuid 1f55d66a-40d8-11ee-be56-0242ac120002 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 0c966e65..27447e2d 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/ --fsuuid 1f55d66a-40d8-11ee-be56-0242ac120002 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 b3abb3d0..ac8ebea9 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks +++ b/meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks @@ -1,8 +1,8 @@ # 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 --fsuuid 1f55d66a-40d8-11ee-be56-0242ac120002 # 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 +part /home --ondisk sda --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home --fstype=ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --fsuuid 1f55d66a-40d8-11ee-be56-0242ac120004 bootloader --ptable gpt --timeout 3 --append "rootwait console=ttyS0,115200 console=tty0" diff --git a/meta-isar/scripts/lib/wic/canned-wks/nanopi-neo-efi.wks.in b/meta-isar/scripts/lib/wic/canned-wks/nanopi-neo-efi.wks.in index 7171a23e..4baf0642 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/nanopi-neo-efi.wks.in +++ b/meta-isar/scripts/lib/wic/canned-wks/nanopi-neo-efi.wks.in @@ -10,6 +10,6 @@ part u-boot --source rawcopy --sourceparams "file=/usr/lib/u-boot/nanopi_neo/u-boot-sunxi-with-spl.bin" --no-table --align 128 part /boot --use-uuid --source bootimg-efi-isar --sourceparams="loader=systemd-boot" --label efi --part-type EF00 --align 1024 -part / --use-uuid --source rootfs --fstype=ext4 --mkfs-extraopts "-T default" --label platform --active --align 1024 --exclude-path boot +part / --use-uuid --source rootfs --fstype=ext4 --mkfs-extraopts "-T default" --label platform --active --align 1024 --exclude-path boot --fsuuid 1f55d66a-40d8-11ee-be56-0242ac120002 bootloader --ptable gpt --timeout 0 --append "rootwait" 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 af5b6f08..cfad430e 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 mmcblk2 --fstype ext4 --mkfs-extraopts "-T default" --sourceparams "builtin_dt=yes" --label platform --align 1024 --active +part / --source rootfs-u-boot --ondisk mmcblk2 --fstype ext4 --mkfs-extraopts "-T default" --sourceparams "builtin_dt=yes" --label platform --align 1024 --active --fsuuid 1f55d66a-40d8-11ee-be56-0242ac120002 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 e5a3668b..de1b742e 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 --fsuuid 1f55d66a-40d8-11ee-be56-0242ac120002 bootloader diff --git a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sb-debian.wks b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sb-debian.wks index cd99ebca..bb2da5ac 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sb-debian.wks +++ b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sb-debian.wks @@ -5,6 +5,6 @@ part /boot --source bootimg-efi-isar --sourceparams "loader=grub-efi,use-debian-sb-stub=true" --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/ --fsuuid 1f55d66a-40d8-11ee-be56-0242ac120002 bootloader --ptable gpt --timeout 3 --append "rootwait console=ttyS0,115200 console=tty0" 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 7fe2953f..6dc9c6c4 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,7 +4,7 @@ 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/ --fsuuid 1f55d66a-40d8-11ee-be56-0242ac120002 include expand-padding.wks.inc 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 80c3a535..8c864f2f 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks +++ b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks @@ -4,7 +4,7 @@ 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/ --fsuuid 1f55d66a-40d8-11ee-be56-0242ac120002 include expand-padding.wks.inc 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 9cd0e662..ef99edd7 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" --fsuuid 1f55d66a-40d8-11ee-be56-0242ac120002 bootloader --ptable gpt --append "rootwait" diff --git a/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in b/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in index 0f3d76a9..c265c752 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in +++ b/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in @@ -18,6 +18,6 @@ part --source rawcopy --sourceparams "file=/usr/share/visionfive2-u-boot-firmwar # EFI part /boot --source bootimg-efi-isar --sourceparams "loader=systemd-boot" --use-uuid --label efi --part-type EF00 --align 1024 # rootfs -part / --source rootfs --use-uuid --fstype ext4 --mkfs-extraopts "-T default" --label image --active --align 1024 --exclude-path=boot/ +part / --source rootfs --use-uuid --fstype ext4 --mkfs-extraopts "-T default" --label image --active --align 1024 --exclude-path=boot/ --fsuuid 1f55d66a-40d8-11ee-be56-0242ac120002 bootloader --ptable gpt --timeout=0 --append "console=tty0 console=ttyS0,115200 earlycon 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 5d96f65f..6e651292 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 1024K 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 --fsuuid 1f55d66a-40d8-11ee-be56-0242ac120002 bootloader --ptable gpt --append="rootwait rw console=ttySTM0,115200"