From: Jan Kiszka <[email protected]>

As we are generating minimal images, their rootfs sizes may be below the
threshold that requires 256-byte or larger inodes. But those are
required to carry 64-bit time values, needed to avoid the y2038 problem.
Latest wic warns about this, so account for it.

Signed-off-by: Jan Kiszka <[email protected]>
---
 wic/espressobin.wks   | 2 +-
 wic/hikey620.wks      | 2 +-
 wic/ipc127e.wks       | 2 +-
 wic/macchiatobin.wks  | 2 +-
 wic/nuc6cay.wks       | 2 +-
 wic/orangepi-zero.wks | 2 +-
 wic/pine64-plus.wks   | 2 +-
 wic/rpi4.wks          | 2 +-
 wic/ultra96.wks       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/wic/espressobin.wks b/wic/espressobin.wks
index 330d70f..3b2ca07 100644
--- a/wic/espressobin.wks
+++ b/wic/espressobin.wks
@@ -9,6 +9,6 @@
 # SPDX-License-Identifier: MIT
 #
 
-part / --source rootfs-u-boot --ondisk mmcblk0 --fstype ext4 --label platform 
--align 1024 --sourceparams "no_initrd=yes,script_prepend=setenv devtype 
mmc;setenv devnum 0;setenv distro_bootpart 1;setenv fdt_addr_r 0x4f00000;setenv 
fdtfile marvell/armada-3720-espressobin.dtb;setenv kernel_addr_r 0x5000000"
+part / --source rootfs-u-boot --ondisk mmcblk0 --fstype ext4 --mkfs-extraopts 
"-T default" --label platform --align 1024 --sourceparams 
"no_initrd=yes,script_prepend=setenv devtype mmc;setenv devnum 0;setenv 
distro_bootpart 1;setenv fdt_addr_r 0x4f00000;setenv fdtfile 
marvell/armada-3720-espressobin.dtb;setenv kernel_addr_r 0x5000000"
 
 bootloader --append "rw rootwait mem=768M"
diff --git a/wic/hikey620.wks b/wic/hikey620.wks
index e91fd99..9fe9e70 100644
--- a/wic/hikey620.wks
+++ b/wic/hikey620.wks
@@ -11,6 +11,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 --label platform --align 
1024 --use-uuid
+part / --source rootfs --ondisk mmcblk1 --fstype ext4 --mkfs-extraopts "-T 
default" --label platform --align 1024 --use-uuid
 
 bootloader --ptable gpt --timeout=3 --append "mem=1820M"
diff --git a/wic/ipc127e.wks b/wic/ipc127e.wks
index c11f9d1..777d446 100644
--- a/wic/ipc127e.wks
+++ b/wic/ipc127e.wks
@@ -11,6 +11,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 --label platform --align 
1024 --use-uuid
+part / --source rootfs --ondisk sda --fstype ext4 --mkfs-extraopts "-T 
default" --label platform --align 1024 --use-uuid
 
 bootloader --ptable gpt --timeout 3 --append "intel_iommu=off 
memmap=82M\$0x3a000000"
diff --git a/wic/macchiatobin.wks b/wic/macchiatobin.wks
index ead8b14..021abbe 100644
--- a/wic/macchiatobin.wks
+++ b/wic/macchiatobin.wks
@@ -11,6 +11,6 @@
 
 part u-boot --source rawcopy --sourceparams 
"file=/usr/lib/trusted-firmware-a/macchiatobin/flash-image.bin" --no-table 
--align 2048 --size 2M
 
-part / --source rootfs-u-boot --ondisk mmcblk1 --fstype ext4 --label platform 
--active --align 1024 --sourceparams "no_initrd=yes"
+part / --source rootfs-u-boot --ondisk mmcblk1 --fstype ext4 --mkfs-extraopts 
"-T default" --label platform --active --align 1024 --sourceparams 
"no_initrd=yes"
 
 bootloader --append "rw rootwait cma=32M mem=3840M"
diff --git a/wic/nuc6cay.wks b/wic/nuc6cay.wks
index 341e948..a8cbff9 100644
--- a/wic/nuc6cay.wks
+++ b/wic/nuc6cay.wks
@@ -11,6 +11,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 --label platform --align 
1024 --use-uuid
+part / --source rootfs --ondisk sda --fstype ext4 --mkfs-extraopts "-T 
default" --label platform --align 1024 --use-uuid
 
 bootloader --ptable gpt --timeout 3 --append "rootwait intel_iommu=off 
memmap=82M\$0x3a000000"
diff --git a/wic/orangepi-zero.wks b/wic/orangepi-zero.wks
index df0b6d2..9482e13 100644
--- a/wic/orangepi-zero.wks
+++ b/wic/orangepi-zero.wks
@@ -11,6 +11,6 @@
 
 part u-boot --source rawcopy --sourceparams 
"file=/usr/lib/u-boot/orangepi_zero/u-boot-sunxi-with-spl.bin" --no-table 
--align 8
 
-part / --source rootfs-u-boot --ondisk mmcblk0 --fstype ext4 --label platform 
--align 1024 --sourceparams "no_initrd=yes,script_prepend=setenv fdt_high 
0xffffffff"
+part / --source rootfs-u-boot --ondisk mmcblk0 --fstype ext4 --mkfs-extraopts 
"-T default" --label platform --align 1024 --sourceparams 
"no_initrd=yes,script_prepend=setenv fdt_high 0xffffffff"
 
 bootloader --append "mem=128M vmalloc=512M"
diff --git a/wic/pine64-plus.wks b/wic/pine64-plus.wks
index 307e355..ca077e9 100644
--- a/wic/pine64-plus.wks
+++ b/wic/pine64-plus.wks
@@ -11,6 +11,6 @@
 
 part u-boot --source rawcopy --sourceparams 
"file=/usr/lib/u-boot/pine64-plus/u-boot-sunxi-with-spl.bin" --no-table --align 
8
 
-part / --source rootfs-u-boot --ondisk mmcblk0 --fstype ext4 --label platform 
--align 1024 --active --sourceparams "no_initrd=yes"
+part / --source rootfs-u-boot --ondisk mmcblk0 --fstype ext4 --mkfs-extraopts 
"-T default" --label platform --align 1024 --active --sourceparams 
"no_initrd=yes"
 
 bootloader --append "rootwait mem=1792M"
diff --git a/wic/rpi4.wks b/wic/rpi4.wks
index 2d10b99..d895eec 100644
--- a/wic/rpi4.wks
+++ b/wic/rpi4.wks
@@ -11,7 +11,7 @@
 
 part --source bootimg-partition --ondisk mmcblk0 --fstype vfat --label boot 
--align 1 --size 32 --overhead-factor 1 --extra-space 0
 
-part / --source rootfs --ondisk mmcblk0 --fstype ext4 --label platform --align 
1024 --active
+part / --source rootfs --ondisk mmcblk0 --fstype ext4 --mkfs-extraopts "-T 
default" --label platform --align 1024 --active
 
 # silence wic
 bootloader
diff --git a/wic/ultra96.wks b/wic/ultra96.wks
index 41d092e..06db02a 100644
--- a/wic/ultra96.wks
+++ b/wic/ultra96.wks
@@ -11,6 +11,6 @@
 
 part --source bootimg-partition --ondisk mmcblk0 --fstype vfat --label boot 
--align 1 --size 16 --overhead-factor 1 --extra-space 0
 
-part / --source rootfs-u-boot --ondisk mmcblk0 --fstype ext4 --label platform 
--align 1024 --active --sourceparams "no_initrd=yes"
+part / --source rootfs-u-boot --ondisk mmcblk0 --fstype ext4 --mkfs-extraopts 
"-T default" --label platform --align 1024 --active --sourceparams 
"no_initrd=yes"
 
 bootloader --append "rootwait mem=1820M"
-- 
2.26.2

-- 
You received this message because you are subscribed to the Google Groups 
"Jailhouse" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To view this discussion on the web visit 
https://groups.google.com/d/msgid/jailhouse-dev/1237e6ba658892fff85670a0bcb3eb223f99ca9e.1618866389.git.jan.kiszka%40siemens.com.

Reply via email to