oracle: Add support for Oracle Linux 9 and 10

data/distrodefs/bootc-generic/imagetypes.yaml

@@ -118,7 +118,7 @@ image_types:
     exports: ["image"]
     required_partition_sizes: *default_required_dir_sizes
     partition_table: *default_bootc_partition_table
-    image_config:
+    image_config: &raw_image_config
       kernel_options: *bootc_kernel_options
     blueprint:
       supported_options: *supported_options_disk
@@ -127,11 +127,13 @@ image_types:
     <<: *raw_image_type
     filename: "disk.raw"
 
-  "qcow2":
+  "qcow2": &qcow2_image_type
     <<: *raw_image_type
     filename: "disk.qcow2"
     mime_type: "application/x-qemu-disk"
     exports: ["qcow2"]
+    image_config: &qcow2_image_config
+      <<: *raw_image_config
 
   "vmdk":
     <<: *raw_image_type
@@ -158,6 +160,12 @@ image_types:
     mime_type: "application/ovf"
     exports: ["archive"]
 
+  oci:
+    <<: *qcow2_image_type
+    image_config:
+      <<: *qcow2_image_config
+      hostonly: true
+
   bootc-installer:
     mime_type: "application/x-iso9660-image"
     exports: ["bootiso"]

data/distrodefs/rhel-10/imagetypes.yaml

@@ -956,21 +956,33 @@ image_types:
             - "python3-jsonschema"
             - "qemu-guest-agent"
             - "redhat-release"
-            - "redhat-release-eula"
             - "rsync"
             - "tar"
             - "tcpdump"
             - "tuned"
-          exclude:
-            - "dracut-config-rescue"
           conditions:
             "add subscription-manager-cockpit on rhel":
               when:
                 distro_name: "rhel"
               append:
                 include:
                   - "subscription-manager-cockpit"
-
+            "include dracut-config-rescue exclude redhat-release-eula on Oracle Linux":
+              when:
+                distro_name: "ol"
+              append:
+                include:
+                  - "dracut-config-rescue"
+                exclude:
+                  - "redhat-release-eula"
+            "include redhat-release-eula exclude dracut-config-rescue when not Oracle Linux":
+              when:
+                not_distro_name: "ol"
+              append:
+                include:
+                  - "redhat-release-eula"
+                exclude:
+                  - "dracut-config-rescue"
   qcow2: &qcow2
     name_aliases: ["guest-image"]
     filename: "disk.qcow2"
@@ -991,10 +1003,20 @@ image_types:
         image_format: "qcow2"
       - <<: *s390x_zipl_platform
         image_format: "qcow2"
+    platforms_override:
+      conditions:
+        "overriding supported platforms for oracle linux images":
+          when:
+            distro_name: "ol"
+          override:
+            - <<: *x86_64_bios_platform
+              image_format: "qcow2"
+            - <<: *aarch64_platform
+              image_format: "qcow2"
     image_config: &qcow2_image_config
       default_target: "multi-user.target"
       kernel_options: ["console=tty0", "console=ttyS0,115200n8"]
-      conditions:
+      conditions: &qcow2_image_config_conditions
         "tweak the rhsm config on rhel":
           when:
             distro_name: "rhel"
@@ -1026,7 +1048,6 @@ image_types:
             - "python3-jsonschema"
             - "qemu-guest-agent"
             - "redhat-release"
-            - "redhat-release-eula"
             - "rsync"
             - "system-reinstall-bootc"
             - "tar"
@@ -1075,6 +1096,28 @@ image_types:
                 include:
                   - "insights-client"
                   - "subscription-manager-cockpit"
+            "exclude redhat-release-eula on Oracle Linux":
+              when:
+                distro_name: "ol"
+              append:
+                exclude:
+                  - "redhat-release-eula"
+            "include redhat-release-eula when not Oracle Linux":
+              when:
+                not_distro_name: "ol"
+              append:
+                include:
+                  - "redhat-release-eula"
+            "exclude rhn packages on Oracle Linux":
+              when:
+                distro_name: "ol"
+              append:
+                exclude:
+                  - "rhn-check"
+                  - "rhn-setup"
+                  - "rhnsd"
+                  - "dnf-plugin-spacewalk"
+
     blueprint:
       supported_options: *supported_options_disk
 
@@ -1147,6 +1190,13 @@ image_types:
           config:
             add_drivers:
               - "mlx5_core"
+      conditions:
+        <<: *qcow2_image_config_conditions
+        "oracle linux is hostonly":
+          when:
+            distro_name: "ol"
+          shallow_merge:
+            hostonly: true
     partition_table:
       x86_64:
         type: "gpt"
@@ -1394,6 +1444,14 @@ image_types:
       - arch: "aarch64"
       - arch: "ppc64le"
       - arch: "s390x"
+    platforms_override:
+      conditions:
+        "overriding supported platforms for oracle linux images":
+          when:
+            distro_name: "ol"
+          override:
+            - arch: "x86_64"
+            - arch: "aarch64"
     blueprint:
       supported_options:
         # We've never tested many options or customizations with this image type
@@ -1581,7 +1639,6 @@ image_types:
             - "langpacks-en"
             - "NetworkManager-cloud-setup"
             - "redhat-release"
-            - "redhat-release-eula"
             - "rsync"
             - "system-reinstall-bootc"
             - "tuned"
@@ -1625,6 +1682,12 @@ image_types:
               append:
                 include:
                   - "insights-client"
+            "include redhat-release-eula when not Oracle Linux":
+              when:
+                not_distro_name: "ol"
+              append:
+                include:
+                  - "redhat-release-eula"
     blueprint:
       supported_options: *supported_options_disk
 
@@ -2063,7 +2126,6 @@ image_types:
             - "prefixdevname"
             - "python3-pyatspi"
             - "rdma-core"
-            - "redhat-release-eula"
             - "rng-tools"
             - "rpcbind"
             - "rpm-ostree"
@@ -2102,6 +2164,24 @@ image_types:
               append:
                 include:
                   - "dmidecode"
+            "add Oracle Linux UEK kernel":
+              when:
+                distro_name: "ol"
+              append:
+                include:
+                  - "kernel-uek"
+            "add dracut-config-rescue for Oracle Linux installer":
+              when:
+                distro_name: "ol"
+              append:
+                include:
+                  - "dracut-config-rescue"
+            "include redhat-release-eula when not Oracle Linux":
+              when:
+                not_distro_name: "ol"
+              append:
+                include:
+                  - "redhat-release-eula"
     blueprint:
       supported_options:
         - "distro"