revert: undo the shared omnifest bits

Sadly this needs to be reverted to get `main` to be able to build the manifests. Separate issues have been file to deal with the bugs. Signed-off-by: Simon de Vlieger <[email protected]>
osbuild · May 13, 2024 · 821d63f · 821d63f
1 parent 771c0e0
commit 821d63f
Show file tree

Hide file tree

Showing 3 changed files with 91 additions and 50 deletions.
diff --git a/example/fedora/minimal-40-aarch64.yaml b/example/fedora/minimal-40-aarch64.yaml
@@ -3,5 +3,49 @@ otk.version: 1
 otk.define:
   version: 40
   architecture: "aarch64"
+  isolabel: Fedora-${version}-${architecture}
 
-otk.include: "minimal-common.yaml"
+  packages:
+    # Repositories to fetch packages from
+    repositories:
+      otk.include: "repository/${version}/repositories.yaml"
+    # GPG keys to verify packages with
+    keys:
+      otk.include: "repository/${version}/keys.yaml"
+    # These packages are used in the buildroot
+    buildroot:
+      docs: false
+      weak: false
+      packages:
+        otk.include: "packages/${version}/_buildroot.yaml"
+    # These packages are used for the operating system tree which is what ends
+    # up in the outputs.
+    tree:
+      docs: false
+      weak: false
+      packages:
+        otk.include: "packages/${version}/minimal.yaml"
+  filesystem:
+    root:
+      uuid: "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"
+      vfs_type: "ext4"
+      path: "/"
+      options: "defaults"
+    boot:
+      uuid: "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
+      vfs_type: "ext4"
+      path: "/boot"
+      options: "defaults"
+    boot-efi:
+      uuid: "7B77-95E7"
+      vfs_type: "vfat"
+      path: "/boot/efi"
+      options: "defaults,uid=0,gid=0,umask=077,shortname=winnt"
+      passno: 2
+
+otk.target.osbuild:
+  pipelines:
+    - otk.include: "osbuild/buildroot.yaml"
+    - otk.include: "osbuild/pipeline/tree.yaml"
+    - otk.include: "osbuild/pipeline/raw.yaml"
+    - otk.include: "osbuild/pipeline/xz.yaml"
diff --git a/example/fedora/minimal-40-x86_64.yaml b/example/fedora/minimal-40-x86_64.yaml
@@ -2,6 +2,50 @@ otk.version: 1
 
 otk.define:
   version: 40
-  architecture: "x86_64"
+  architecture: "aarch64"
+  isolabel: Fedora-${version}-${architecture}
 
-otk.include: "minimal-common.yaml"
+  packages:
+    # Repositories to fetch packages from
+    repositories:
+      otk.include: "repository/${version}/repositories.yaml"
+    # GPG keys to verify packages with
+    keys:
+      otk.include: "repository/${version}/keys.yaml"
+    # These packages are used in the buildroot
+    buildroot:
+      docs: false
+      weak: false
+      packages:
+        otk.include: "packages/${version}/_buildroot.yaml"
+    # These packages are used for the operating system tree which is what ends
+    # up in the outputs.
+    tree:
+      docs: false
+      weak: false
+      packages:
+        otk.include: "packages/${version}/minimal.yaml"
+  filesystem:
+    root:
+      uuid: "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"
+      vfs_type: "ext4"
+      path: "/"
+      options: "defaults"
+    boot:
+      uuid: "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
+      vfs_type: "ext4"
+      path: "/boot"
+      options: "defaults"
+    boot-efi:
+      uuid: "7B77-95E7"
+      vfs_type: "vfat"
+      path: "/boot/efi"
+      options: "defaults,uid=0,gid=0,umask=077,shortname=winnt"
+      passno: 2
+
+otk.target.osbuild:
+  pipelines:
+    - otk.include: "osbuild/buildroot.yaml"
+    - otk.include: "osbuild/pipeline/tree.yaml"
+    - otk.include: "osbuild/pipeline/raw.yaml"
+    - otk.include: "osbuild/pipeline/xz.yaml"
diff --git a/example/fedora/minimal-common.yaml b/example/fedora/minimal-common.yaml