fix: Add libblockdev-s390 to blivet_package_list

libblockdev-s390 is available only on s390x architecture so we can't add it as dependency everywhere.
linux-system-roles · Aug 2, 2024 · 90b761f · 90b761f
1 parent 794e385
commit 90b761f
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 0 deletions.
diff --git a/vars/AlmaLinux_10.yml b/vars/AlmaLinux_10.yml
@@ -9,5 +9,8 @@ blivet_package_list:
   - xfsprogs
   - stratisd
   - stratis-cli
+  # XXX libblockdev-s390 is available only on s390 so just add 'libblockdev' everywhere
+  # else, it is already brought in as dependency of blivet so it's just no-op here
+  - "{{ 'libblockdev-s390' if ansible_architecture == 's390x' else 'libblockdev' }}"
 # vdo not yet available on el10
 #  - vdo
diff --git a/vars/AlmaLinux_8.yml b/vars/AlmaLinux_8.yml
@@ -11,3 +11,6 @@ blivet_package_list:
   - xfsprogs
   - stratisd
   - stratis-cli
+  # XXX libblockdev-s390 is available only on s390 so just add 'libblockdev' everywhere
+  # else, it is already brought in as dependency of blivet so it's just no-op here
+  - "{{ 'libblockdev-s390' if ansible_architecture == 's390x' else 'libblockdev' }}"
diff --git a/vars/AlmaLinux_9.yml b/vars/AlmaLinux_9.yml
@@ -11,3 +11,6 @@ blivet_package_list:
   - xfsprogs
   - stratisd
   - stratis-cli
+  # XXX libblockdev-s390 is available only on s390 so just add 'libblockdev' everywhere
+  # else, it is already brought in as dependency of blivet so it's just no-op here
+  - "{{ 'libblockdev-s390' if ansible_architecture == 's390x' else 'libblockdev' }}"
diff --git a/vars/CentOS_10.yml b/vars/CentOS_10.yml
@@ -9,5 +9,8 @@ blivet_package_list:
   - xfsprogs
   - stratisd
   - stratis-cli
+  # XXX libblockdev-s390 is available only on s390 so just add 'libblockdev' everywhere
+  # else, it is already brought in as dependency of blivet so it's just no-op here
+  - "{{ 'libblockdev-s390' if ansible_architecture == 's390x' else 'libblockdev' }}"
 # vdo not yet available on el10
 #  - vdo
diff --git a/vars/CentOS_7.yml b/vars/CentOS_7.yml
@@ -7,6 +7,9 @@ blivet_package_list:
   - libblockdev-lvm
   - libblockdev-mdraid
   - libblockdev-swap
+  # XXX libblockdev-s390 is available only on s390 so just add 'libblockdev' everywhere
+  # else, it is already brought in as dependency of blivet so it's just no-op here
+  - "{{ 'libblockdev-s390' if ansible_architecture == 's390x' else 'libblockdev' }}"
 # additional options for mkfs when creating a disk volume (whole disk fs)
 __storage_blivet_diskvolume_mkfs_option_map:
   ext2: '-F'

diff --git a/vars/CentOS_8.yml b/vars/CentOS_8.yml
@@ -11,3 +11,6 @@ blivet_package_list:
   - xfsprogs
   - stratisd
   - stratis-cli
+  # XXX libblockdev-s390 is available only on s390 so just add 'libblockdev' everywhere
+  # else, it is already brought in as dependency of blivet so it's just no-op here
+  - "{{ 'libblockdev-s390' if ansible_architecture == 's390x' else 'libblockdev' }}"
diff --git a/vars/CentOS_9.yml b/vars/CentOS_9.yml
@@ -11,3 +11,6 @@ blivet_package_list:
   - xfsprogs
   - stratisd
   - stratis-cli
+  # XXX libblockdev-s390 is available only on s390 so just add 'libblockdev' everywhere
+  # else, it is already brought in as dependency of blivet so it's just no-op here
+  - "{{ 'libblockdev-s390' if ansible_architecture == 's390x' else 'libblockdev' }}"
diff --git a/vars/Fedora.yml b/vars/Fedora.yml
@@ -8,6 +8,9 @@ blivet_package_list:
   - libblockdev-swap
   - stratisd
   - stratis-cli
+  # XXX libblockdev-s390 is available only on s390 so just add 'libblockdev' everywhere
+  # else, it is already brought in as dependency of blivet so it's just no-op here
+  - "{{ 'libblockdev-s390' if ansible_architecture == 's390x' else 'libblockdev' }}"
 _storage_copr_packages:
   - repository: "rhawalsh/dm-vdo"
     packages:

diff --git a/vars/RedHat_10.yml b/vars/RedHat_10.yml
@@ -9,5 +9,8 @@ blivet_package_list:
   - xfsprogs
   - stratisd
   - stratis-cli
+  # XXX libblockdev-s390 is available only on s390 so just add 'libblockdev' everywhere
+  # else, it is already brought in as dependency of blivet so it's just no-op here
+  - "{{ 'libblockdev-s390' if ansible_architecture == 's390x' else 'libblockdev' }}"
 # vdo not yet available on el10
 #  - vdo
diff --git a/vars/RedHat_7.yml b/vars/RedHat_7.yml
@@ -7,6 +7,9 @@ blivet_package_list:
   - libblockdev-lvm
   - libblockdev-mdraid
   - libblockdev-swap
+  # XXX libblockdev-s390 is available only on s390 so just add 'libblockdev' everywhere
+  # else, it is already brought in as dependency of blivet so it's just no-op here
+  - "{{ 'libblockdev-s390' if ansible_architecture == 's390x' else 'libblockdev' }}"
 # additional options for mkfs when creating a disk volume (whole disk fs)
 __storage_blivet_diskvolume_mkfs_option_map:
   ext2: '-F'

diff --git a/vars/RedHat_8.yml b/vars/RedHat_8.yml
@@ -11,3 +11,6 @@ blivet_package_list:
   - xfsprogs
   - stratisd
   - stratis-cli
+  # XXX libblockdev-s390 is available only on s390 so just add 'libblockdev' everywhere
+  # else, it is already brought in as dependency of blivet so it's just no-op here
+  - "{{ 'libblockdev-s390' if ansible_architecture == 's390x' else 'libblockdev' }}"
diff --git a/vars/RedHat_9.yml b/vars/RedHat_9.yml
@@ -11,3 +11,6 @@ blivet_package_list:
   - xfsprogs
   - stratisd
   - stratis-cli
+  # XXX libblockdev-s390 is available only on s390 so just add 'libblockdev' everywhere
+  # else, it is already brought in as dependency of blivet so it's just no-op here
+  - "{{ 'libblockdev-s390' if ansible_architecture == 's390x' else 'libblockdev' }}"
diff --git a/vars/Rocky_8.yml b/vars/Rocky_8.yml
@@ -11,3 +11,6 @@ blivet_package_list:
   - xfsprogs
   - stratisd
   - stratis-cli
+  # XXX libblockdev-s390 is available only on s390 so just add 'libblockdev' everywhere
+  # else, it is already brought in as dependency of blivet so it's just no-op here
+  - "{{ 'libblockdev-s390' if ansible_architecture == 's390x' else 'libblockdev' }}"
diff --git a/vars/Rocky_9.yml b/vars/Rocky_9.yml
@@ -11,3 +11,6 @@ blivet_package_list:
   - xfsprogs
   - stratisd
   - stratis-cli
+  # XXX libblockdev-s390 is available only on s390 so just add 'libblockdev' everywhere
+  # else, it is already brought in as dependency of blivet so it's just no-op here
+  - "{{ 'libblockdev-s390' if ansible_architecture == 's390x' else 'libblockdev' }}"