|
|
|
|
@ -2,14 +2,24 @@
|
|
|
|
|
%global repositorydir %{leapp_datadir}/repositories
|
|
|
|
|
%global custom_repositorydir %{leapp_datadir}/custom-repositories
|
|
|
|
|
|
|
|
|
|
%define leapp_repo_deps 9
|
|
|
|
|
%define leapp_repo_deps 10
|
|
|
|
|
|
|
|
|
|
%if 0%{?rhel} == 7
|
|
|
|
|
%define leapp_python_sitelib %{python2_sitelib}
|
|
|
|
|
%define lpr_name leapp-upgrade-el7toel8
|
|
|
|
|
%define repo_shortname el7toel8
|
|
|
|
|
%define next_major_ver 8
|
|
|
|
|
%else
|
|
|
|
|
%define leapp_python_sitelib %{python3_sitelib}
|
|
|
|
|
%if 0%{?rhel} == 8
|
|
|
|
|
%define lpr_name leapp-upgrade-el8toel9
|
|
|
|
|
%define repo_shortname el8toel9
|
|
|
|
|
%define next_major_ver 9
|
|
|
|
|
%else
|
|
|
|
|
%define lpr_name leapp-upgrade-el9toel10
|
|
|
|
|
%define repo_shortname el9toel10
|
|
|
|
|
%define next_major_ver 10
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
# This drops autogenerated deps on
|
|
|
|
|
# - /usr/libexec/platform-python (rhel-8 buildroot)
|
|
|
|
|
@ -41,24 +51,21 @@ py2_byte_compile "%1" "%2"}
|
|
|
|
|
# RHEL 8+ packages to be consistent with other leapp projects in future.
|
|
|
|
|
|
|
|
|
|
Name: leapp-repository
|
|
|
|
|
Version: 0.18.0
|
|
|
|
|
Release: 1%{?dist}
|
|
|
|
|
Version: 0.21.0
|
|
|
|
|
Release: 2%{?dist}
|
|
|
|
|
Summary: Repositories for leapp
|
|
|
|
|
|
|
|
|
|
License: ASL 2.0
|
|
|
|
|
URL: https://oamg.github.io/leapp/
|
|
|
|
|
Source0: https://github.com/oamg/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
|
|
|
|
Source1: deps-pkgs-9.tar.gz
|
|
|
|
|
Source1: deps-pkgs-10.tar.gz
|
|
|
|
|
|
|
|
|
|
# NOTE: Our packages must be noarch. Do no drop this in any way.
|
|
|
|
|
BuildArch: noarch
|
|
|
|
|
|
|
|
|
|
### PATCHES HERE
|
|
|
|
|
# Patch0001: filename.patch
|
|
|
|
|
|
|
|
|
|
## DO NOT REMOVE THIS PATCH UNLESS THE RUBYGEM-IRB ISSUE IS RESOLVED IN ACTORS!
|
|
|
|
|
# See: https://bugzilla.redhat.com/show_bug.cgi?id=2030627
|
|
|
|
|
Patch0004: 0004-Enforce-the-removal-of-rubygem-irb-do-not-install-it.patch
|
|
|
|
|
Patch0001: 0001-rhui-alibaba-add-ARM-RHEL8-and-RHEL9-setup-entries-1.patch
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%description
|
|
|
|
|
@ -88,14 +95,24 @@ Obsoletes: leapp-repository-sos-plugin <= 0.10.0
|
|
|
|
|
Conflicts: leapp-upgrade-el8toel9
|
|
|
|
|
|
|
|
|
|
%else
|
|
|
|
|
######### RHEL 8 ############
|
|
|
|
|
######### RHEL 8+ (and newer) ############
|
|
|
|
|
BuildRequires: python3-devel
|
|
|
|
|
Requires: python3-leapp
|
|
|
|
|
|
|
|
|
|
# NOTE(pstodulk): else if / elif has been implemented quite late. as we still
|
|
|
|
|
# want to build on RHEL 7 too, go in the old way. Ref:
|
|
|
|
|
# https://github.com/rpm-software-management/rpm/issues/311
|
|
|
|
|
%if 0%{?rhel} == 8
|
|
|
|
|
######### RHEL 8 ############
|
|
|
|
|
|
|
|
|
|
# Same as the conflict above - we want to be sure our packages are untouched
|
|
|
|
|
# during the whole IPU process
|
|
|
|
|
Conflicts: leapp-upgrade-el7toel8
|
|
|
|
|
|
|
|
|
|
Conflicts: leapp-upgrade-el9toel10
|
|
|
|
|
%else
|
|
|
|
|
######### RHEL 9 ############
|
|
|
|
|
Conflicts: leapp-upgrade-el8toel9
|
|
|
|
|
%endif
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
# IMPORTANT: every time the requirements are changed, increment number by one
|
|
|
|
|
@ -104,7 +121,7 @@ Requires: leapp-repository-dependencies = %{leapp_repo_deps}
|
|
|
|
|
|
|
|
|
|
# IMPORTANT: this is capability provided by the leapp framework rpm.
|
|
|
|
|
# Check that 'version' instead of the real framework rpm version.
|
|
|
|
|
Requires: leapp-framework >= 3.1
|
|
|
|
|
Requires: leapp-framework >= 5.0
|
|
|
|
|
|
|
|
|
|
# Since we provide sub-commands for the leapp utility, we expect the leapp
|
|
|
|
|
# tool to be installed as well.
|
|
|
|
|
@ -153,6 +170,16 @@ Provides: leapp-repository-dependencies = %{leapp_repo_deps}
|
|
|
|
|
##################################################
|
|
|
|
|
Requires: dnf >= 4
|
|
|
|
|
Requires: pciutils
|
|
|
|
|
|
|
|
|
|
# required to be able to format disk images with XFS file systems (default)
|
|
|
|
|
Requires: xfsprogs
|
|
|
|
|
|
|
|
|
|
# required to be able to format disk images with Ext4 file systems
|
|
|
|
|
# NOTE: this is not happening by default, but we can expact that many customers
|
|
|
|
|
# will want to / need to do this - especially on RHEL 7 now. Adding this deps
|
|
|
|
|
# as the best trade-off to resolve this problem.
|
|
|
|
|
Requires: e2fsprogs
|
|
|
|
|
|
|
|
|
|
%if 0%{?rhel} && 0%{?rhel} == 7
|
|
|
|
|
# Required to gather system facts about SELinux
|
|
|
|
|
Requires: libselinux-python
|
|
|
|
|
@ -201,15 +228,11 @@ Requires: python3-gobject-base
|
|
|
|
|
|
|
|
|
|
# APPLY PATCHES HERE
|
|
|
|
|
# %%patch0001 -p1
|
|
|
|
|
%patch0004 -p1
|
|
|
|
|
%patch0001 -p1
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%build
|
|
|
|
|
%if 0%{?rhel} == 7
|
|
|
|
|
cp -a leapp*deps*el8.noarch.rpm repos/system_upgrade/el7toel8/files/bundled-rpms/
|
|
|
|
|
%else
|
|
|
|
|
cp -a leapp*deps*el9.noarch.rpm repos/system_upgrade/el8toel9/files/bundled-rpms/
|
|
|
|
|
%endif
|
|
|
|
|
cp -a leapp*deps*el%{next_major_ver}.noarch.rpm repos/system_upgrade/%{repo_shortname}/files/bundled-rpms/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%install
|
|
|
|
|
@ -217,9 +240,11 @@ install -m 0755 -d %{buildroot}%{custom_repositorydir}
|
|
|
|
|
install -m 0755 -d %{buildroot}%{repositorydir}
|
|
|
|
|
cp -r repos/* %{buildroot}%{repositorydir}/
|
|
|
|
|
install -m 0755 -d %{buildroot}%{_sysconfdir}/leapp/repos.d/
|
|
|
|
|
# NOTE(pstodulk): drop transaction dir and its content if replaced by config files before RHEL 10
|
|
|
|
|
install -m 0755 -d %{buildroot}%{_sysconfdir}/leapp/transaction/
|
|
|
|
|
install -m 0755 -d %{buildroot}%{_sysconfdir}/leapp/files/
|
|
|
|
|
install -m 0644 etc/leapp/transaction/* %{buildroot}%{_sysconfdir}/leapp/transaction
|
|
|
|
|
install -m 0644 etc/leapp/files/* %{buildroot}%{_sysconfdir}/leapp/files
|
|
|
|
|
|
|
|
|
|
# install CLI commands for the leapp utility on the expected path
|
|
|
|
|
install -m 0755 -d %{buildroot}%{leapp_python_sitelib}/leapp/cli/
|
|
|
|
|
@ -228,11 +253,10 @@ rm -rf %{buildroot}%{leapp_python_sitelib}/leapp/cli/commands/tests
|
|
|
|
|
|
|
|
|
|
# Remove irrelevant repositories - We don't want to ship them for the particular
|
|
|
|
|
# RHEL version
|
|
|
|
|
%if 0%{?rhel} == 7
|
|
|
|
|
rm -rf %{buildroot}%{repositorydir}/system_upgrade/el8toel9
|
|
|
|
|
%else
|
|
|
|
|
rm -rf %{buildroot}%{repositorydir}/system_upgrade/el7toel8
|
|
|
|
|
%endif
|
|
|
|
|
for i in el7toel8 el8toel9 el9toel10;
|
|
|
|
|
do
|
|
|
|
|
[ "$i" != "%{repo_shortname}" ] && rm -rf %{buildroot}%{repositorydir}/system_upgrade/$i
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
# remove component/unit tests, Makefiles, ... stuff that related to testing only
|
|
|
|
|
rm -rf %{buildroot}%{repositorydir}/common/actors/testactor
|
|
|
|
|
@ -267,6 +291,7 @@ done;
|
|
|
|
|
%dir %{repositorydir}
|
|
|
|
|
%dir %{custom_repositorydir}
|
|
|
|
|
%dir %{leapp_python_sitelib}/leapp/cli/commands
|
|
|
|
|
%config %{_sysconfdir}/leapp/files/*
|
|
|
|
|
%{_sysconfdir}/leapp/repos.d/*
|
|
|
|
|
%{_sysconfdir}/leapp/transaction/*
|
|
|
|
|
%{repositorydir}/*
|
|
|
|
|
@ -277,6 +302,163 @@ done;
|
|
|
|
|
# no files here
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Mon Aug 19 2024 Petr Stodulka <pstodulk@redhat.com> - 0.21.0-2
|
|
|
|
|
- Updated SPEC file to drop leapp repositories unrelated to IPU 8 -> 9
|
|
|
|
|
- Resolves: RHEL-27847
|
|
|
|
|
|
|
|
|
|
* Fri Aug 16 2024 Toshio Kuratomi <toshio@fedoraproject.org> - 0.21.0-1
|
|
|
|
|
- Rebase to new upstream 0.21.0
|
|
|
|
|
- Updated leapp data files.
|
|
|
|
|
- Inhibit the upgrade to RHEL 9.5 on ARM architecture due to
|
|
|
|
|
incompatibility between the RHEL 8 bootloader and RHEL 9.5 kernel.
|
|
|
|
|
- Introduce experimental upgrades in 'live' mode for the testing.
|
|
|
|
|
- Resolves: RHEL-27847, RHEL-52993, RHEL-45280, RHEL-49748, RHEL-52186
|
|
|
|
|
|
|
|
|
|
* Wed Jul 24 2024 Toshio Kuratomi <toshio@fedoraproject.org> - 0.20.0-5
|
|
|
|
|
- Improve set_systemd_services_states logging
|
|
|
|
|
- [IPU 7 -> 8] Fix detection of bootable device on RAID
|
|
|
|
|
- Fix detection of valid sshd config with internal-sftp subsystem in Leapp
|
|
|
|
|
- Handle a false positive GPG check error when TargetUserSpaceInfo is missing
|
|
|
|
|
- Fix failing "update-ca-trust" command caused by missing util-linux package
|
|
|
|
|
- Improve report when a system is unsupported
|
|
|
|
|
- Fix handling of versions in RHUI configuration for ELS and SAP upgrades
|
|
|
|
|
- Add missing RHUI GCP config info for RHEL for SAP
|
|
|
|
|
- Fix upgrade on aarch64 via RHUI on AWS
|
|
|
|
|
- Resolves: RHEL-33902, RHEL-38909, RHEL-30573, RHEL-43978, RHEL-39046, RHEL-39047, RHEL-39049
|
|
|
|
|
|
|
|
|
|
* Thu May 30 2024 Petr Stodulka <pstodulk@redhat.com> - 0.20.0-4
|
|
|
|
|
- Enable new upgrade path RHEL 8.10 -> 9.5
|
|
|
|
|
- Minor updates in reports
|
|
|
|
|
- Add information about leapp invocation to leapp.db
|
|
|
|
|
- Resolves: RHEL-27847
|
|
|
|
|
|
|
|
|
|
* Mon May 13 2024 Toshio Kuratomi <toshio@fedoraproject.org> - 0.20.0-3
|
|
|
|
|
- Do not terminate the upgrade dracut module execution if
|
|
|
|
|
/sysroot/root/tmp_leapp_py3/.leapp_upgrade_failed exists
|
|
|
|
|
- Several minor improvements in messages printed in console output
|
|
|
|
|
- Several minor improvements in report and error messages
|
|
|
|
|
- Fix the parsing of the lscpu output
|
|
|
|
|
- Fix evaluation of PES data
|
|
|
|
|
- Target by default always "GA" channel repositories unless a different
|
|
|
|
|
channel is specified for the leapp execution
|
|
|
|
|
- Fix creation of the post upgrade report about changes in states of systemd
|
|
|
|
|
services
|
|
|
|
|
- Update the device driver deprecation data, fixing invalid fields for some
|
|
|
|
|
AMD CPUs
|
|
|
|
|
- Update the default kernel cmdline
|
|
|
|
|
- Wait for the storage initialization when /usr is on separate file system -
|
|
|
|
|
covering SAN
|
|
|
|
|
- Resolves: RHEL-27847, RHEL-35240
|
|
|
|
|
|
|
|
|
|
* Tue Feb 20 2024 Petr Stodulka <pstodulk@redhat.com> - 0.20.0-2
|
|
|
|
|
- Fallback to original RHUI solution on AWS to fix issues caused by changes in RHUI client
|
|
|
|
|
- Resolves: RHEL-16729
|
|
|
|
|
|
|
|
|
|
* Tue Feb 13 2024 Toshio Kuratomi <toshio@fedoraproject.org> - 0.20.0-1
|
|
|
|
|
- Rebase to new upstream v0.20.0.
|
|
|
|
|
- Fix semanage import issue
|
|
|
|
|
- Fix handling of libvirt's systemd services
|
|
|
|
|
- Add a dracut breakpoint for the pre-upgrade step.
|
|
|
|
|
- Drop obsoleted upgrade paths (obsoleted releases: 8.6, 8.9, 9.0, 9.3)
|
|
|
|
|
- Resolves: RHEL-16729
|
|
|
|
|
|
|
|
|
|
* Tue Jan 23 2024 Toshio Kuratomi <toshio@fedoraproject.org> - 0.19.0-10
|
|
|
|
|
- Print nice error msg when device and driver deprecation data is malformed
|
|
|
|
|
- Fix another cornercase when preserving symlinks to certificates in /etc/pki
|
|
|
|
|
- Update the leapp upgrade data files - fixing upgrades with idm-tomcatjss
|
|
|
|
|
- Resolves: RHEL-16729
|
|
|
|
|
|
|
|
|
|
* Fri Jan 19 2024 Petr Stodulka <pstodulk@redhat.com> - 0.19.0-9
|
|
|
|
|
- Do not try to download data files anymore when missing as the service
|
|
|
|
|
is obsoleted since the data is part of installed packages
|
|
|
|
|
- Update error messages and reports when installed upgrade data files
|
|
|
|
|
are malformed or missing to instruct user how to resolve it
|
|
|
|
|
- Update the leapp upgrade data files - bump data stream to "3.0"
|
|
|
|
|
- Resolves: RHEL-16729
|
|
|
|
|
|
|
|
|
|
* Fri Jan 12 2024 Petr Stodulka <pstodulk@redhat.com> - 0.19.0-7
|
|
|
|
|
- Add detection of possible usage of OpenSSL IBMCA engine on IBM Z machines
|
|
|
|
|
- Add detection of modified /etc/pki/tls/openssl.cnf file
|
|
|
|
|
- Update the leapp upgrade data files
|
|
|
|
|
- Fix handling of symlinks under /etc/pki with relative paths specified
|
|
|
|
|
- Report custom actors and modifications of the upgrade tooling
|
|
|
|
|
- Requires xfsprogs and e2fsprogs to ensure that Ext4 and XFS tools are installed
|
|
|
|
|
- Bump leapp-repository-dependencies to 10
|
|
|
|
|
- Resolves: RHEL-1774, RHEL-16729
|
|
|
|
|
|
|
|
|
|
* Thu Nov 16 2023 Petr Stodulka <pstodulk@redhat.com> - 0.19.0-5
|
|
|
|
|
- Enable new upgrade path for RHEL 8.10 -> RHEL 9.4 (including RHEL with SAP HANA)
|
|
|
|
|
- Introduce generic transition of systemd services states during the IPU
|
|
|
|
|
- Introduce possibility to upgrade with local repositories
|
|
|
|
|
- Improve possibilities of upgrade when a proxy is configured in DNF configutation file
|
|
|
|
|
- Fix handling of symlinks under /etc/pki when managing certificates
|
|
|
|
|
- Fix the upgrade with custom https repositories
|
|
|
|
|
- Default to the NO_RHSM mode when subscription-manager is not installed
|
|
|
|
|
- Detect customized configuration of dynamic linker
|
|
|
|
|
- Drop the invalid `tuv` target channel for the --channel option
|
|
|
|
|
- Fix the issue of going out of bounds in the isccfg parser
|
|
|
|
|
- Fix traceback when saving the rhsm facts results and the /etc/rhsm/facts directory doesn’t exist yet
|
|
|
|
|
- Load all rpm repository substitutions that dnf knows about, not just "releasever" only
|
|
|
|
|
- Simplify handling of upgrades on systems using RHUI, reducing the maintenance burden for cloud providers
|
|
|
|
|
- Detect possible unexpected RPM GPG keys has been installed during RPM transaction
|
|
|
|
|
- Resolves: RHEL-16729
|
|
|
|
|
|
|
|
|
|
* Thu Nov 02 2023 Petr Stodulka <pstodulk@redhat.com> - 0.19.0-4
|
|
|
|
|
- Fix the upgrade for systems without subscription-manager package
|
|
|
|
|
- Resolves: RHEL-14901
|
|
|
|
|
|
|
|
|
|
* Tue Oct 31 2023 Petr Stodulka <pstodulk@redhat.com> - 0.19.0-3
|
|
|
|
|
- Fix the upgrade when the release is locked by new subscription-manager
|
|
|
|
|
- Resolves: RHEL-14901
|
|
|
|
|
|
|
|
|
|
* Wed Aug 23 2023 Petr Stodulka <pstodulk@redhat.com> - 0.19.0-1
|
|
|
|
|
- Rebase to v0.19.0
|
|
|
|
|
- Requires leapp-framework 5.0
|
|
|
|
|
- Handle correctly the installed certificates to allow upgrades with custom repositories using HTTPs with enabled SSL verification
|
|
|
|
|
- Fix failing upgrades with devtmpfs file systems specified in FSTAB
|
|
|
|
|
- Do not try to update GRUB core on IBM Z systems
|
|
|
|
|
- Minor improvements and fixes of various reports and error messages
|
|
|
|
|
- Redesign handling of information about kernel (booted and target) to reflect changes in RHEL 9.3
|
|
|
|
|
- Use new leapp CLI API which provides better report summary output
|
|
|
|
|
- Resolves: rhbz#2215997, rhbz#2222861, rhbz#2232618
|
|
|
|
|
|
|
|
|
|
* Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 0.18.0-5
|
|
|
|
|
- Rebuilt for MSVSphere 8.8
|
|
|
|
|
|
|
|
|
|
* Tue Jul 18 2023 Petr Stodulka <pstodulk@redhat.com> - 0.18.0-5
|
|
|
|
|
- Fix the calculation of the required free space on each partitions/volume for the upgrade transactions
|
|
|
|
|
- Create source overlay images with dynamic sizes to optimize disk space consumption
|
|
|
|
|
- Update GRUB2 when /boot resides on multiple devices aggregated in RAID
|
|
|
|
|
- Use new leapp CLI API which provides better report summary output
|
|
|
|
|
- Introduce possibility to add (custom) kernel drivers to initramfs
|
|
|
|
|
- Detect and report use of deprecated Xorg drivers
|
|
|
|
|
- Fix the generation of the report about hybrid images
|
|
|
|
|
- Inhibit the upgrade when unsupported x86-64 microarchitecture is detected
|
|
|
|
|
- Minor improvements and fixes of various reports
|
|
|
|
|
- Requires leapp-framework 4.0
|
|
|
|
|
- Update leapp data files
|
|
|
|
|
- Resolves: rhbz#2140011, rhbz#2144304, rhbz#2174095, rhbz#2215997
|
|
|
|
|
|
|
|
|
|
* Mon Jun 19 2023 Petr Stodulka <pstodulk@redhat.com> - 0.18.0-4
|
|
|
|
|
- Introduce new upgrade path RHEL 8.9 -> 9.3
|
|
|
|
|
- Update leapp data files to reflect new changes between systems
|
|
|
|
|
- Detect and report use of deprecated Xorg drivers
|
|
|
|
|
- Minor improvements of generated reports
|
|
|
|
|
- Fix false positive report about invalid symlinks
|
|
|
|
|
- Inhibit the upgrade when unsupported x86-64 microarchitecture is detected
|
|
|
|
|
- Resolves: rhbz#2215997
|
|
|
|
|
|
|
|
|
|
* Mon Jun 05 2023 Petr Stodulka <pstodulk@redhat.com> - 0.18.0-3
|
|
|
|
|
- Update the repomap.json file to address planned changes on RHUI Azure
|
|
|
|
|
- Resolves: rhbz#2203800
|
|
|
|
|
|
|
|
|
|
* Fri May 19 2023 Petr Stodulka <pstodulk@redhat.com> - 0.18.0-2
|
|
|
|
|
- Include leap data files in the package
|
|
|
|
|
- Introduce in-place upgrades for systems with enabled FIPS mode
|
|
|
|
|
- Enable the upgrade path 8.8 -> 9.2 for RHEL with SAP HANA
|
|
|
|
|
- Fix the upgrade of ruby-irb package
|
|
|
|
|
- Resolves: rhbz#2030627, rhbz#2097003, rhbz#2203800, rhbz#2203803
|
|
|
|
|
|
|
|
|
|
* Tue Feb 21 2023 Petr Stodulka <pstodulk@redhat.com> - 0.18.0-1
|
|
|
|
|
- Rebase to v0.18.0
|
|
|
|
|
- Introduce new upgrade path RHEL 8.8 -> 9.2
|
|
|
|
|
|
MSVSphere Packaging Team
MSVSphere Packaging Team