example/centos: _include becomes common

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
osbuild · Oct 7, 2024 · dd2c66c · dd2c66c
1 parent 939b718
commit dd2c66c
Show file tree

Hide file tree

Showing 32 changed files with 27 additions and 27 deletions.
diff --git a/example/centos/common/package-set/aarch64/build/ami.yaml b/example/centos/common/package-set/aarch64/build/ami.yaml
@@ -1,7 +1,7 @@
 include:
   otk.op.join:
     values:
-      - otk.include: "_include.yaml"
+      - otk.include: "common.yaml"
       - - dosfstools
         - python3-pyyaml
         - rpm

diff --git a/...n/package-set/aarch64/build/_include.yaml → ...mon/package-set/aarch64/build/common.yaml b/...n/package-set/aarch64/build/_include.yaml → ...mon/package-set/aarch64/build/common.yaml
diff --git a/example/centos/common/package-set/aarch64/build/edge-commit.yaml b/example/centos/common/package-set/aarch64/build/edge-commit.yaml
@@ -1,7 +1,7 @@
 include:
   otk.op.join:
     values:
-      - otk.include: "_include.yaml"
+      - otk.include: "common.yaml"
       - - rpm-ostree
         - tar
 exclude: []
diff --git a/example/centos/common/package-set/aarch64/build/image-installer.yaml b/example/centos/common/package-set/aarch64/build/image-installer.yaml
@@ -1,7 +1,7 @@
 include:
   otk.op.join:
     values:
-      - otk.include: "_include.yaml"
+      - otk.include: "common.yaml"
       - - efibootmgr
         - grub2-efi-aa64
         - grub2-efi-aa64-cdboot

diff --git a/example/centos/common/package-set/aarch64/build/vhd.yaml b/example/centos/common/package-set/aarch64/build/vhd.yaml
@@ -1,7 +1,7 @@
 include:
   otk.op.join:
     values:
-      - otk.include: "_include.yaml"
+      - otk.include: "common.yaml"
       - - dosfstools
         - python3-pyyaml
         - qemu-img

diff --git a/example/centos/common/package-set/aarch64/os/ami.yaml b/example/centos/common/package-set/aarch64/os/ami.yaml
@@ -3,7 +3,7 @@ include:
   # https://github.com/osbuild/images/blob/v0.86.0/pkg/platform/${architecture}.go#L37
   otk.op.join:
     values:
-      - otk.include: "_include.yaml"
+      - otk.include: "common.yaml"
       - - "@core"
         - NetworkManager-cloud-setup
         - authselect-compat

diff --git a/...mmon/package-set/aarch64/os/_include.yaml → ...common/package-set/aarch64/os/common.yaml b/...mmon/package-set/aarch64/os/_include.yaml → ...common/package-set/aarch64/os/common.yaml
diff --git a/example/centos/common/package-set/aarch64/os/edge-commit.yaml b/example/centos/common/package-set/aarch64/os/edge-commit.yaml
@@ -1,7 +1,7 @@
 include:
   otk.op.join:
     values:
-      - otk.include: "_include.yaml"
+      - otk.include: "common.yaml"
       - - NetworkManager
         - NetworkManager-wifi
         - NetworkManager-wwan

diff --git a/example/centos/common/package-set/aarch64/os/image-installer.yaml b/example/centos/common/package-set/aarch64/os/image-installer.yaml
@@ -1,7 +1,7 @@
 include:
   otk.op.join:
     values:
-      - otk.include: "_include.yaml"
+      - otk.include: "common.yaml"
       - - "@core"
         - authselect-compat
         - chrony

diff --git a/example/centos/common/package-set/aarch64/os/minimal-raw.yaml b/example/centos/common/package-set/aarch64/os/minimal-raw.yaml
@@ -1,7 +1,7 @@
 include:
   otk.op.join:
     values:
-      - otk.include: "_include.yaml"
+      - otk.include: "common.yaml"
       - - "@core"
         - NetworkManager-wifi
         - initial-setup

diff --git a/example/centos/common/package-set/aarch64/os/qcow2.yaml b/example/centos/common/package-set/aarch64/os/qcow2.yaml
@@ -1,7 +1,7 @@
 include:
   otk.op.join:
     values:
-      - otk.include: "_include.yaml"
+      - otk.include: "common.yaml"
       - - "@core"
         - authselect-compat
         - chrony

diff --git a/example/centos/common/package-set/aarch64/os/vhd.yaml b/example/centos/common/package-set/aarch64/os/vhd.yaml
@@ -1,7 +1,7 @@
 include:
   otk.op.join:
     values:
-      - otk.include: "_include.yaml"
+      - otk.include: "common.yaml"
       - - "@Server"
         - NetworkManager
         - NetworkManager-cloud-setup

diff --git a/...on/package-set/noarch/build/_include.yaml → ...mmon/package-set/noarch/build/common.yaml b/...on/package-set/noarch/build/_include.yaml → ...mmon/package-set/noarch/build/common.yaml
diff --git a/example/centos/common/package-set/noarch/build/minimal-raw.yaml b/example/centos/common/package-set/noarch/build/minimal-raw.yaml
@@ -1,7 +1,7 @@
 include:
   otk.op.join:
     values:
-      - otk.include: "_include.yaml"
+      - otk.include: "common.yaml"
       - - dosfstools
         - policycoreutils
         - xfsprogs

diff --git a/example/centos/common/package-set/noarch/build/tar.yaml b/example/centos/common/package-set/noarch/build/tar.yaml
@@ -1,7 +1,7 @@
 include:
   otk.op.join:
     values:
-      - otk.include: "_include.yaml"
+      - otk.include: "common.yaml"
       - - policycoreutils
         - tar
 exclude: []
diff --git a/example/centos/common/package-set/noarch/build/wsl.yaml b/example/centos/common/package-set/noarch/build/wsl.yaml
@@ -1,7 +1,7 @@
 include:
   otk.op.join:
     values:
-      - otk.include: "_include.yaml"
+      - otk.include: "common.yaml"
       - - python3-iniparse
         - tar
 exclude: []
diff --git a/example/centos/common/package-set/x86_64/build/ami.yaml b/example/centos/common/package-set/x86_64/build/ami.yaml
@@ -1,7 +1,7 @@
 include:
   otk.op.join:
     values:
-      - otk.include: "_include.yaml"
+      - otk.include: "common.yaml"
       - - dosfstools
         - python3-pyyaml
         - xfsprogs

diff --git a/...on/package-set/x86_64/build/_include.yaml → ...mmon/package-set/x86_64/build/common.yaml b/...on/package-set/x86_64/build/_include.yaml → ...mmon/package-set/x86_64/build/common.yaml
diff --git a/example/centos/common/package-set/x86_64/build/edge-commit.yaml b/example/centos/common/package-set/x86_64/build/edge-commit.yaml
@@ -1,7 +1,7 @@
 include:
   otk.op.join:
     values:
-      - otk.include: "_include.yaml"
+      - otk.include: "common.yaml"
       - - rpm-ostree
         - tar
 exclude: []
diff --git a/example/centos/common/package-set/x86_64/build/image-installer.yaml b/example/centos/common/package-set/x86_64/build/image-installer.yaml
@@ -1,7 +1,7 @@
 include:
   otk.op.join:
     values:
-      - otk.include: "_include.yaml"
+      - otk.include: "common.yaml"
       - - efibootmgr
         - grub2-efi-x64
         - grub2-efi-x64-cdboot

diff --git a/example/centos/common/package-set/x86_64/build/ova.yaml b/example/centos/common/package-set/x86_64/build/ova.yaml
@@ -1,7 +1,7 @@
 include:
   otk.op.join:
     values:
-      - otk.include: "_include.yaml"
+      - otk.include: "common.yaml"
       - - dosfstools
         - qemu-img
         - tar

diff --git a/example/centos/common/package-set/x86_64/build/qcow2_vmdk.yaml b/example/centos/common/package-set/x86_64/build/qcow2_vmdk.yaml
@@ -1,7 +1,7 @@
 include:
   otk.op.join:
     values:
-      - otk.include: "_include.yaml"
+      - otk.include: "common.yaml"
       - - dosfstools
         - qemu-img
         - xfsprogs

diff --git a/example/centos/common/package-set/x86_64/build/vhd.yaml b/example/centos/common/package-set/x86_64/build/vhd.yaml
@@ -1,7 +1,7 @@
 include:
   otk.op.join:
     values:
-      - otk.include: "_include.yaml"
+      - otk.include: "common.yaml"
       - - dosfstools
         - python3-pyyaml
         - qemu-img

diff --git a/example/centos/common/package-set/x86_64/os/ami.yaml b/example/centos/common/package-set/x86_64/os/ami.yaml
@@ -3,7 +3,7 @@ include:
   # https://github.com/osbuild/images/blob/v0.86.0/pkg/platform/${architecture}.go#L37
   otk.op.join:
     values:
-      - otk.include: "_include.yaml"
+      - otk.include: "common.yaml"
       - - "@core"
         - NetworkManager-cloud-setup
         - authselect-compat

diff --git a/...ommon/package-set/x86_64/os/_include.yaml → .../common/package-set/x86_64/os/common.yaml b/...ommon/package-set/x86_64/os/_include.yaml → .../common/package-set/x86_64/os/common.yaml
diff --git a/example/centos/common/package-set/x86_64/os/edge-commit.yaml b/example/centos/common/package-set/x86_64/os/edge-commit.yaml
@@ -1,7 +1,7 @@
 include:
   otk.op.join:
     values:
-      - otk.include: "_include.yaml"
+      - otk.include: "common.yaml"
       - - NetworkManager
         - NetworkManager-wifi
         - NetworkManager-wwan

diff --git a/example/centos/common/package-set/x86_64/os/image-installer.yaml b/example/centos/common/package-set/x86_64/os/image-installer.yaml
@@ -1,7 +1,7 @@
 include:
   otk.op.join:
     values:
-      - otk.include: "_include.yaml"
+      - otk.include: "common.yaml"
       - - "@core"
         - authselect-compat
         - chrony

diff --git a/example/centos/common/package-set/x86_64/os/minimal-raw.yaml b/example/centos/common/package-set/x86_64/os/minimal-raw.yaml
@@ -1,7 +1,7 @@
 include:
   otk.op.join:
     values:
-      - otk.include: "_include.yaml"
+      - otk.include: "common.yaml"
       - - "@core"
         - NetworkManager-wifi
         - initial-setup

diff --git a/example/centos/common/package-set/x86_64/os/ova.yaml b/example/centos/common/package-set/x86_64/os/ova.yaml
@@ -1,7 +1,7 @@
 include:
   otk.op.join:
     values:
-      - otk.include: "_include.yaml"
+      - otk.include: "common.yaml"
       - - "@core"
         - chrony
         - cloud-init

diff --git a/example/centos/common/package-set/x86_64/os/qcow2.yaml b/example/centos/common/package-set/x86_64/os/qcow2.yaml
@@ -1,7 +1,7 @@
 include:
   otk.op.join:
     values:
-      - otk.include: "_include.yaml"
+      - otk.include: "common.yaml"
       - - "@core"
         - authselect-compat
         - chrony

diff --git a/example/centos/common/package-set/x86_64/os/vhd.yaml b/example/centos/common/package-set/x86_64/os/vhd.yaml
@@ -1,7 +1,7 @@
 include:
   otk.op.join:
     values:
-      - otk.include: "_include.yaml"
+      - otk.include: "common.yaml"
       - - "@Server"
         - NetworkManager
         - NetworkManager-cloud-setup

diff --git a/example/centos/common/package-set/x86_64/os/vmdk.yaml b/example/centos/common/package-set/x86_64/os/vmdk.yaml
@@ -1,7 +1,7 @@
 include:
   otk.op.join:
     values:
-      - otk.include: "_include.yaml"
+      - otk.include: "common.yaml"
       - - "@core"
         - chrony
         - cloud-init