From c0d7c2bd25268b461984679a7f6fcb5b5d67c5dd Mon Sep 17 00:00:00 2001
From: Isaac True <isaac.true@canonical.com>
Date: Tue, 21 Nov 2023 13:05:36 +0100
Subject: [PATCH 1/2] ERL-481: nemos-images-reference-*: *: disable bigtime
 feature on xfs

The bigtime feature can cause issues when trying to build on older host
systems (i.e. systems with kernel <5.10). Disable it so that we can use
such systems as build hosts, and add a comment that this should be
removed when it's no longer required.

Signed-off-by: Isaac True <isaac.true@canonical.com>
---
 nemos-images-reference-lunar/qemu-amd64/appliance.kiwi    | 3 +++
 nemos-images-reference-lunar/qemu-arm64/appliance.kiwi    | 3 +++
 nemos-images-reference-lunar/s32g274ardb2/appliance.kiwi  | 3 +++
 nemos-images-reference-mantic/qemu-amd64/appliance.kiwi   | 3 +++
 nemos-images-reference-mantic/qemu-arm64/appliance.kiwi   | 3 +++
 nemos-images-reference-mantic/s32g274ardb2/appliance.kiwi | 3 +++
 6 files changed, 18 insertions(+)

diff --git a/nemos-images-reference-lunar/qemu-amd64/appliance.kiwi b/nemos-images-reference-lunar/qemu-amd64/appliance.kiwi
index 24b2835..079f05a 100644
--- a/nemos-images-reference-lunar/qemu-amd64/appliance.kiwi
+++ b/nemos-images-reference-lunar/qemu-amd64/appliance.kiwi
@@ -17,8 +17,11 @@
     <preferences>
         <version>1.0.1</version>
         <packagemanager>apt</packagemanager>
+        <!-- NOTE: bigtime is disabled in fscreateoptions to ensure compatibility with older kernels
+        running on the build hosts. Remove this once it is no longer necessary! -->
         <type image="oem" filesystem="xfs" firmware="efi" initrd_system="dracut"
             overlayroot="true" overlayroot_write_partition="true"
+            fscreateoptions="-m bigtime=0"
             overlayroot_readonly_partsize="1024" squashfscompression="zstd"
             bootpartition="true" bootpartsize="256" bootfilesystem="ext4" format="qcow2"
             kernelcmdline="console=ttyS0 rd.systemd.verity=1 root=overlay:MAPPER=verityRoot verityroot=/dev/disk/by-partlabel/p.lxreadonly rd.root.overlay.write=/dev/mapper/luks rd.luks=yes rootwait pstore.backend=efi"
diff --git a/nemos-images-reference-lunar/qemu-arm64/appliance.kiwi b/nemos-images-reference-lunar/qemu-arm64/appliance.kiwi
index d6a75f8..c5d9efd 100644
--- a/nemos-images-reference-lunar/qemu-arm64/appliance.kiwi
+++ b/nemos-images-reference-lunar/qemu-arm64/appliance.kiwi
@@ -17,8 +17,11 @@
     <preferences>
         <version>1.0.1</version>
         <packagemanager>apt</packagemanager>
+        <!-- NOTE: bigtime is disabled in fscreateoptions to ensure compatibility with older kernels
+        running on the build hosts. Remove this once it is no longer necessary! -->
         <type image="oem" filesystem="xfs" firmware="efi" initrd_system="dracut"
             overlayroot="true" overlayroot_write_partition="true"
+            fscreateoptions="-m bigtime=0"
             overlayroot_readonly_partsize="1024" squashfscompression="zstd"
             bootpartition="true" bootpartsize="256" bootfilesystem="ext4" format="qcow2"
             kernelcmdline="console=ttyS0 rd.systemd.verity=1 root=overlay:MAPPER=verityRoot verityroot=/dev/disk/by-partlabel/p.lxreadonly rd.root.overlay.write=/dev/mapper/luks rd.luks=yes pstore.backend=efi"
diff --git a/nemos-images-reference-lunar/s32g274ardb2/appliance.kiwi b/nemos-images-reference-lunar/s32g274ardb2/appliance.kiwi
index 1f1b043..e70d48b 100644
--- a/nemos-images-reference-lunar/s32g274ardb2/appliance.kiwi
+++ b/nemos-images-reference-lunar/s32g274ardb2/appliance.kiwi
@@ -17,8 +17,11 @@
     <preferences>
         <version>1.0.1</version>
         <packagemanager>apt</packagemanager>
+        <!-- NOTE: bigtime is disabled in fscreateoptions to ensure compatibility with older kernels
+        running on the build hosts. Remove this once it is no longer necessary! -->
         <type image="oem" filesystem="xfs" firmware="custom" initrd_system="dracut"
             overlayroot="true" overlayroot_write_partition="true" disk_start_sector="8192"
+            fscreateoptions="-m bigtime=0"
             dosparttable_extended_layout="true" force_mbr="true" devicepersistency="by-uuid"
             overlayroot_readonly_partsize="1024" squashfscompression="zstd"
             bootpartition="true" bootpartsize="256" bootfilesystem="ext4" format="qcow2"
diff --git a/nemos-images-reference-mantic/qemu-amd64/appliance.kiwi b/nemos-images-reference-mantic/qemu-amd64/appliance.kiwi
index 2980e75..83c509f 100644
--- a/nemos-images-reference-mantic/qemu-amd64/appliance.kiwi
+++ b/nemos-images-reference-mantic/qemu-amd64/appliance.kiwi
@@ -17,8 +17,11 @@
     <preferences>
         <version>1.0.1</version>
         <packagemanager>apt</packagemanager>
+        <!-- NOTE: bigtime is disabled in fscreateoptions to ensure compatibility with older kernels
+        running on the build hosts. Remove this once it is no longer necessary! -->
         <type image="oem" filesystem="xfs" firmware="efi" initrd_system="dracut"
             overlayroot="true" overlayroot_write_partition="true"
+            fscreateoptions="-m bigtime=0"
             editbootconfig="install_grub.sh"
             overlayroot_readonly_partsize="1024" squashfscompression="zstd"
             bootpartition="true" bootpartsize="256" bootfilesystem="ext4" format="qcow2"
diff --git a/nemos-images-reference-mantic/qemu-arm64/appliance.kiwi b/nemos-images-reference-mantic/qemu-arm64/appliance.kiwi
index e04658e..f69223f 100644
--- a/nemos-images-reference-mantic/qemu-arm64/appliance.kiwi
+++ b/nemos-images-reference-mantic/qemu-arm64/appliance.kiwi
@@ -17,8 +17,11 @@
     <preferences>
         <version>1.0.1</version>
         <packagemanager>apt</packagemanager>
+        <!-- NOTE: bigtime is disabled in fscreateoptions to ensure compatibility with older kernels
+        running on the build hosts. Remove this once it is no longer necessary! -->
         <type image="oem" filesystem="xfs" firmware="efi" initrd_system="dracut"
             overlayroot="true" overlayroot_write_partition="true"
+            fscreateoptions="-m bigtime=0"
             editbootconfig="install_grub.sh"
             overlayroot_readonly_partsize="1024" squashfscompression="zstd"
             bootpartition="true" bootpartsize="256" bootfilesystem="ext4" format="qcow2"
diff --git a/nemos-images-reference-mantic/s32g274ardb2/appliance.kiwi b/nemos-images-reference-mantic/s32g274ardb2/appliance.kiwi
index d2d4280..8569196 100644
--- a/nemos-images-reference-mantic/s32g274ardb2/appliance.kiwi
+++ b/nemos-images-reference-mantic/s32g274ardb2/appliance.kiwi
@@ -17,8 +17,11 @@
     <preferences>
         <version>1.0.1</version>
         <packagemanager>apt</packagemanager>
+        <!-- NOTE: bigtime is disabled in fscreateoptions to ensure compatibility with older kernels
+        running on the build hosts. Remove this once it is no longer necessary! -->
         <type image="oem" filesystem="xfs" firmware="custom" initrd_system="dracut"
             overlayroot="true" overlayroot_write_partition="true" disk_start_sector="8192"
+            fscreateoptions="-m bigtime=0"
             dosparttable_extended_layout="true" force_mbr="true" devicepersistency="by-uuid"
             overlayroot_readonly_partsize="1024" squashfscompression="zstd"
             bootpartition="true" bootpartsize="256" bootfilesystem="ext4" format="qcow2"

From 2f1d4b9f0021e6ce42aff4d2a6f4ec57a1919552 Mon Sep 17 00:00:00 2001
From: Isaac True <isaac.true@canonical.com>
Date: Tue, 21 Nov 2023 17:50:37 +0100
Subject: [PATCH 2/2] ERL-481: nemos-images-reference-*: *: use ext4 for
 oci-storage

The XFS filesystem is sometimes created with incompatible features.
Until we can control the featureset using an argument we need to use
ext4.

Signed-off-by: Isaac True <isaac.true@canonical.com>
---
 nemos-images-reference-lunar/qemu-amd64/appliance.kiwi  | 3 ++-
 nemos-images-reference-lunar/qemu-arm64/appliance.kiwi  | 3 ++-
 nemos-images-reference-mantic/qemu-amd64/appliance.kiwi | 3 ++-
 nemos-images-reference-mantic/qemu-arm64/appliance.kiwi | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/nemos-images-reference-lunar/qemu-amd64/appliance.kiwi b/nemos-images-reference-lunar/qemu-amd64/appliance.kiwi
index 079f05a..e74049d 100644
--- a/nemos-images-reference-lunar/qemu-amd64/appliance.kiwi
+++ b/nemos-images-reference-lunar/qemu-amd64/appliance.kiwi
@@ -33,7 +33,8 @@
             <size unit="G">3</size>
             <partitions>
                 <partition name="home" size="10" mountpoint="/home" filesystem="ext4" />
-                <partition name="oci-storage" size="512" mountpoint="/var/lib/containers/storage" filesystem="xfs" />
+                <!-- oci-storage should be changed to xfs in the future -->
+                <partition name="oci-storage" size="512" mountpoint="/var/lib/containers/storage" filesystem="ext4" />
                 <partition name="oci-preloaded" size="512" mountpoint="/var/lib/containers/loaded" filesystem="squashfs" />
             </partitions>
             <luksformat>
diff --git a/nemos-images-reference-lunar/qemu-arm64/appliance.kiwi b/nemos-images-reference-lunar/qemu-arm64/appliance.kiwi
index c5d9efd..56bcb58 100644
--- a/nemos-images-reference-lunar/qemu-arm64/appliance.kiwi
+++ b/nemos-images-reference-lunar/qemu-arm64/appliance.kiwi
@@ -33,7 +33,8 @@
             <size unit="G">3</size>
             <partitions>
                 <partition name="home" size="10" mountpoint="/home" filesystem="ext4" />
-                <partition name="oci-storage" size="512" mountpoint="/var/lib/containers/storage" filesystem="xfs" />
+                <!-- oci-storage should be changed to xfs in the future -->
+                <partition name="oci-storage" size="512" mountpoint="/var/lib/containers/storage" filesystem="ext4" />
                 <partition name="oci-preloaded" size="512" mountpoint="/var/lib/containers/loaded" filesystem="squashfs" />
             </partitions>
             <luksformat>
diff --git a/nemos-images-reference-mantic/qemu-amd64/appliance.kiwi b/nemos-images-reference-mantic/qemu-amd64/appliance.kiwi
index 83c509f..1de64a1 100644
--- a/nemos-images-reference-mantic/qemu-amd64/appliance.kiwi
+++ b/nemos-images-reference-mantic/qemu-amd64/appliance.kiwi
@@ -33,7 +33,8 @@
             <size unit="G">3</size>
             <partitions>
                 <partition name="home" size="10" mountpoint="/home" filesystem="ext4" />
-                <partition name="oci-storage" size="512" mountpoint="/var/lib/containers/storage" filesystem="xfs" />
+                <!-- oci-storage should be changed to xfs in the future -->
+                <partition name="oci-storage" size="512" mountpoint="/var/lib/containers/storage" filesystem="ext4" />
                 <partition name="oci-preloaded" size="512" mountpoint="/var/lib/containers/loaded" filesystem="squashfs" />
             </partitions>
             <luksformat>
diff --git a/nemos-images-reference-mantic/qemu-arm64/appliance.kiwi b/nemos-images-reference-mantic/qemu-arm64/appliance.kiwi
index f69223f..b6fb204 100644
--- a/nemos-images-reference-mantic/qemu-arm64/appliance.kiwi
+++ b/nemos-images-reference-mantic/qemu-arm64/appliance.kiwi
@@ -33,7 +33,8 @@
             <size unit="G">3</size>
             <partitions>
                 <partition name="home" size="10" mountpoint="/home" filesystem="ext4" />
-                <partition name="oci-storage" size="512" mountpoint="/var/lib/containers/storage" filesystem="xfs" />
+                <!-- oci-storage should be changed to xfs in the future -->
+                <partition name="oci-storage" size="512" mountpoint="/var/lib/containers/storage" filesystem="ext4" />
                 <partition name="oci-preloaded" size="512" mountpoint="/var/lib/containers/loaded" filesystem="squashfs" />
             </partitions>
             <luksformat>