- lorax.spec: Add psmisc for fuser debugging of failed umounts in pylorax.imgutils (bcl@redhat.com)

- composer-cli: Disable retry counter on connection timeout (bcl@redhat.com)
- composer-cli: Change timeout to 5 minutes (bcl@redhat.com)
- Temporary fix for running lorax inside mock (no /proc created)
This commit is contained in:
Brian C. Lane 2020-06-18 12:10:50 -07:00
parent 0d7e6b5223
commit c023d712c0
3 changed files with 11 additions and 5 deletions

1
.gitignore vendored
View File

@ -181,3 +181,4 @@
/lorax-33.3.tar.gz /lorax-33.3.tar.gz
/lorax-33.4.tar.gz /lorax-33.4.tar.gz
/lorax-33.5.tar.gz /lorax-33.5.tar.gz
/lorax-33.6.tar.gz

View File

@ -3,8 +3,8 @@
%define debug_package %{nil} %define debug_package %{nil}
Name: lorax Name: lorax
Version: 33.5 Version: 33.6
Release: 2%{?dist} Release: 1%{?dist}
Summary: Tool for creating the anaconda install images Summary: Tool for creating the anaconda install images
License: GPLv2+ License: GPLv2+
@ -15,6 +15,7 @@ URL: https://github.com/weldr/lorax
# tito build --tgz # tito build --tgz
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
# Temporary workaround - see rhbz#1848201
# https://github.com/weldr/lorax/pull/1035 # https://github.com/weldr/lorax/pull/1035
# Ensure /proc exists before trying to touch /proc/modules # Ensure /proc exists before trying to touch /proc/modules
Patch0: 0001-Ensure-proc-exists-before-trying-to-touch-proc-modul.patch Patch0: 0001-Ensure-proc-exists-before-trying-to-touch-proc-modul.patch
@ -47,6 +48,7 @@ Requires: pigz
Requires: pbzip2 Requires: pbzip2
Requires: dracut >= 030 Requires: dracut >= 030
Requires: kpartx Requires: kpartx
Requires: psmisc
# Python modules # Python modules
Requires: libselinux-python3 Requires: libselinux-python3
@ -271,8 +273,11 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin
%{_mandir}/man1/composer-cli.1* %{_mandir}/man1/composer-cli.1*
%changelog %changelog
* Mon Jun 15 2020 Adam Williamson <awilliam@redhat.com> - 33.5-2 * Thu Jun 18 2020 Brian C. Lane <bcl@redhat.com> 33.6-1
- Backport PR#1035 to fix Rawhide composes (I hope) - lorax.spec: Add psmisc for fuser debugging of failed umounts in pylorax.imgutils (bcl@redhat.com)
- composer-cli: Disable retry counter on connection timeout (bcl@redhat.com)
- composer-cli: Change timeout to 5 minutes (bcl@redhat.com)
- Temporary fix for running lorax inside mock (no /proc created)
* Thu Jun 11 2020 Brian C. Lane <bcl@redhat.com> 33.5-1 * Thu Jun 11 2020 Brian C. Lane <bcl@redhat.com> 33.5-1
- lorax-composer: Add deprecation notice to documentation (bcl@redhat.com) - lorax-composer: Add deprecation notice to documentation (bcl@redhat.com)

View File

@ -1 +1 @@
SHA512 (lorax-33.5.tar.gz) = 713decd7421af2e4728794a742d7bfc27282b14bc2f4d5ac6c90ccd1cdc3de4ac7e6587057ead5cd729f8b3a3ece886cb33883b7883172543cbdbc39092904d2 SHA512 (lorax-33.6.tar.gz) = dc53607eddabc92d38d4382eae4d441b6a9501c1340abe8363a09836e77e5ebfa5c9fa3d6dbd85a1ebeb3b88822b038f872b51008acc0b0a4d7e9252d35b405e