Skip to content

Commit 1f0f5d2

Browse files
committed
Packaging: Update leapp-repository deps for RHEL 8+
Since RHEL 8, several rpms do not have to be present on the system anymore but they are mandatory for the IPU. Add requirement for the following RPMs: kmod dracut propc-ng Bump leapp-repository-dependencies to 7 Related tasks: OAMG-7085: https://bugzilla.redhat.com/show_bug.cgi?id=2100108 OAMG-7086: https://bugzilla.redhat.com/show_bug.cgi?id=2100110
1 parent c634b45 commit 1f0f5d2

2 files changed

Lines changed: 17 additions & 2 deletions

File tree

packaging/leapp-el7toel8-deps.spec

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

1111

12-
%define leapp_repo_deps 6
12+
%define leapp_repo_deps 7
1313
%define leapp_framework_deps 5
1414

1515
# NOTE: the Version contains the %{rhel} macro just for the convenience to
@@ -56,6 +56,14 @@ Requires: policycoreutils-python-utils
5656
# Than we ensure the rpm will be present after the upgrade transaction.
5757
Requires: dnf-command(config-manager)
5858

59+
# It should not happen that dracut is not present on the target system,
60+
# but as dracut is removable on RHEL 8+, let's rather require it to be really
61+
# sure
62+
Requires: dracut
63+
64+
# just to be sure that /etc/modprobe.d is present
65+
Requires: kmod
66+
5967
%description -n %{lrdname}
6068
%{summary}
6169

packaging/leapp-repository.spec

Lines changed: 8 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 6
5+
%define leapp_repo_deps 7
66

77
%if 0%{?rhel} == 7
88
%define leapp_python_sitelib %{python2_sitelib}
@@ -161,6 +161,13 @@ Requires: python3-requests
161161
Requires: python3-six
162162
# required by SELinux actors
163163
Requires: policycoreutils-python-utils
164+
# required by systemfacts, and several other actors
165+
Requires: procps-ng
166+
Requires: kmod
167+
# since RHEL 8+ dracut does not have to be present on the system all the time
168+
# and missing dracut could be killing situation for us :)
169+
Requires: dracut
170+
164171
%endif
165172
##################################################
166173
# end requirement

0 commit comments

Comments
 (0)