Skip to content

Commit 2068e3d

Browse files
committed
Update dependencies: require xfsprogs and e2fsprogs
To be able to format our OVL disk images with XFS or Ext4, we need the required tools present on the system. However, on systems with XFS file systems only, it's not needed to have tools for ext4, and vice versa. So on such systems, users can remove these packages manually. In that cases, we get into a problems, especially when XFS is the default FS in our case. To resolve that, we add dependencies for xfsprogs and e2fsprogs rpms into the spec file, so we are sure these are always present on the system. In case of Ext4 is a little bit "redundant" - as use of Ext4 is optional. However we expect actually that many people will do it (many == not a small amount of people -> not uncommon use..). So keeping this the least effort, let's add the requirement for both as the actual installation stack is not big. Packaging: * Requires xfsprogs, e2fsprogs * Bump leapp-repository-dependencies to 10 jira: RHEL-10847
1 parent 4968bec commit 2068e3d

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

packaging/leapp-repository.spec

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
%global repositorydir %{leapp_datadir}/repositories
33
%global custom_repositorydir %{leapp_datadir}/custom-repositories
44

5-
%define leapp_repo_deps 9
5+
%define leapp_repo_deps 10
66

77
%if 0%{?rhel} == 7
88
%define leapp_python_sitelib %{python2_sitelib}
@@ -149,6 +149,16 @@ Provides: leapp-repository-dependencies = %{leapp_repo_deps}
149149
##################################################
150150
Requires: dnf >= 4
151151
Requires: pciutils
152+
153+
# required to be able to format disk images with XFS file systems (default)
154+
Requires: xfsprogs
155+
156+
# required to be able to format disk images with Ext4 file systems
157+
# NOTE: this is not happening by default, but we can expact that many customers
158+
# will want to / need to do this - especially on RHEL 7 now. Adding this deps
159+
# as the best trade-off to resolve this problem.
160+
Requires: e2fsprogs
161+
152162
%if 0%{?rhel} && 0%{?rhel} == 7
153163
# Required to gather system facts about SELinux
154164
Requires: libselinux-python

packaging/other_specs/leapp-el7toel8-deps.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
%endif
1010

1111

12-
%define leapp_repo_deps 9
12+
%define leapp_repo_deps 10
1313
%define leapp_framework_deps 5
1414

1515
# NOTE: the Version contains the %{rhel} macro just for the convenience to

0 commit comments

Comments
 (0)