From a29dfbfee14021cdd742ac0e6a0837c2e5704622 Mon Sep 17 00:00:00 2001 From: basebuilder_pel7ppc64bebuilder0 Date: Wed, 10 Feb 2021 15:09:09 +0100 Subject: [PATCH] lorax package update Signed-off-by: basebuilder_pel7ppc64bebuilder0 --- SPECS/lorax.spec | 147 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 131 insertions(+), 16 deletions(-) diff --git a/SPECS/lorax.spec b/SPECS/lorax.spec index 261c7833..e61c46d1 100644 --- a/SPECS/lorax.spec +++ b/SPECS/lorax.spec @@ -1,16 +1,21 @@ %define debug_package %{nil} Name: lorax -Version: 19.6.104 +Version: 19.7.28 Release: 1%{?dist} Summary: Tool for creating the anaconda install images Group: Applications/System License: GPLv2+ -URL: http://git.fedorahosted.org/git/?p=lorax.git -Source0: https://fedorahosted.org/releases/l/o/%{name}/%{name}-%{version}.tar.gz +URL: https://github.com/weldr/lorax +# To generate Source0 do: +# git clone https://github.com/weldr/lorax +# git checkout -b archive-branch lorax-%%{version}-%%{release} +# tito build --tgz +Source0: %{name}-%{version}.tar.gz BuildRequires: python2-devel +BuildRequires: python-sphinx yum python-mako pykickstart Requires: GConf2 Requires: cpio @@ -36,17 +41,9 @@ Requires: yum Requires: pykickstart Requires: dracut >= 030 -%if 0%{?fedora} -# Fedora specific deps -Requires: fedup-dracut -Requires: fedup-dracut-plymouth -%endif - -%if 0%{?el7} -# RHEL 7 specific deps +# PEL 7 specific deps Requires: powerel-upgrade-dracut Requires: powerel-upgrade-dracut-plymouth -%endif %ifarch %{ix86} x86_64 Requires: syslinux >= 4.02-5 @@ -63,7 +60,7 @@ Requires: openssh %endif # Moved image-minimizer tool to lorax -Provides: appliance-tools-minimizer +Provides: appliance-tools-minimizer = %{version}-%{release} Obsoletes: appliance-tools-minimizer < 007.7-3 %description @@ -78,17 +75,31 @@ Anaconda's image install feature. sed 's/libutempter//g' -i share/runtime-cleanup.tmpl sed 's/redhat-upgrade-dracut/powerel-upgrade-dracut/g' -i share/runtime-install.tmpl + %build +make docs %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install +# Do Not Package lorax-composer or composer-cli files +rm -rf $RPM_BUILD_ROOT/%{python_sitelib}/pylorax/api +rm -rf $RPM_BUILD_ROOT/%{python_sitelib}/composer +rm -rf $RPM_BUILD_ROOT/%{_datadir}/lorax/composer +rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/lorax/composer.conf +rm -f $RPM_BUILD_ROOT/%{_sbindir}/lorax-composer +rm -f $RPM_BUILD_ROOT/%{_bindir}/composer-cli +rm -f $RPM_BUILD_ROOT/%{_unitdir}/lorax-composer.* +rm -f $RPM_BUILD_ROOT/%{_tmpfilesdir}/lorax-composer.conf + %files %defattr(-,root,root,-) %doc COPYING AUTHORS README.livemedia-creator README.product %doc docs/*ks +%doc docs/html %{python_sitelib}/pylorax +%exclude %{python_sitelib}/pylorax/api %{python_sitelib}/*.egg-info %{_sbindir}/lorax %{_sbindir}/mkefiboot @@ -99,9 +110,113 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %config(noreplace) %{_sysconfdir}/lorax/lorax.conf %dir %{_datadir}/lorax %{_datadir}/lorax/* +%exclude %{_datadir}/lorax/composer %{_mandir}/man1/*.1* +%{_tmpfilesdir}/lorax.conf %changelog +* Thu May 14 2020 Brian C. Lane 19.7.28-1 +- rhel7-livemedia: Increase the rootfilesystem size (bcl) + Resolves: rhbz#1829204 + +* Mon Apr 20 2020 Brian C. Lane 19.7.27-1 +- Change --make-pxe-live --no-virt to use a fsimage (bcl) + Resolves: rhbz#1802591 +- Makefile: Add the ability to use podman instead of docker (bcl) + Related: rhbz#1472622 +- tests: Add tests for _install_branding with and without variant (bcl) + Related: rhbz#1472622 +- lorax: Move get_yum_base_object into pylorax.yumbase (bcl) + Related: rhbz#1472622 +- lorax: Update how the release package is chosen (bcl) + Resolves: rhbz#1472622 + +* Mon Dec 16 2019 Brian C. Lane 19.7.26-1 +- Remove unneeded scap-security-guide files (bcl) + Related: rhbz#1779659 + +* Tue Jun 04 2019 Brian C. Lane 19.7.25-1 +- lorax: Add --rootfs-size (bcl) + Resolves: rhbz#1715116 +- lorax: pass size from Lorax.run to create_runtime (bcl) + Related: rhbz#1715116 +- Fix path to generic.prm (jstodola) + Resolves: rhbz#1712491 + +* Mon Apr 29 2019 Brian C. Lane 19.7.24-1 +- Update PPC isolabel to allow escaping spaces (bcl) + Resolves: rhbz#1402328 + +* Thu Apr 04 2019 Brian C. Lane 19.7.23-1 +- lorax: Install redhat-release-eula (bcl) + Resolves: rhbz#1696335 + +* Tue Mar 26 2019 Brian C. Lane 19.7.22-1 +- Improve logging for template syntax errors (bcl) + Related: rhbz#1689314 +- Add extra boot args to the livemedia-creator iso templates (bcl) + Resolves: rhbz#1689314 +- Use hd:LABEL= for inst.stage2 on ppc (bcl) + Resolves: rhbz#1402328 +- Don't remove chmem and lsmem from install.img (bcl) + Resolves: rhbz#1511358 + +* Mon Mar 18 2019 Brian C. Lane 19.7.21-1 +- Do not include /usr/bin/delv (bcl) + Resolves: rhbz#1688767 +- Remove SELinux Permissive checks (bcl) + Resolves: rhbz#1654795 +- Remove lorax-composer tests (bcl) + Resolves: rhbz#1679798 + +* Mon Feb 25 2019 Brian C. Lane 19.7.20-1 +- Add cancel_func to virt and novirt_install functions (bcl) + Resolves: rhbz#1659129 +- lorax: Move default tmp dir to /var/tmp/lorax (bcl) + Resolves: rhbz#1668520 +- New cli test covering basic compose commands (atodorov) (atodorov) +- Execute bash tests for composer-cli (atodorov) (atodorov) +- Add pylint testing (bcl) (bcl) + +* Wed Aug 15 2018 Brian C. Lane 19.7.19-1 +- Add documentation for --dracut-arg to lorax.1 (bcl) + Related: rhbz#1452220 +- Add the dracut options to the lorax help output (bcl) + Related: rhbz#1452220 + +* Thu Jun 21 2018 Brian C. Lane 19.7.18-1 +- Add redhat.exec to s390 .treeinfo (bcl) + Resolves: rhbz#1593657 + +* Tue Jun 19 2018 Brian C. Lane 19.7.17-1 +- Exclude lorax-composer and composer-cli code from the lorax build (bcl) + Resolves: rhbz#1547759 + +* Fri Jun 15 2018 Brian C. Lane 19.7.16-2 +- Fixup the lorax.spec after rebasing on 19.6.105-1 (bcl) + Resolves: rhbz#1547759 + +* Fri Jun 15 2018 Brian C. Lane 19.7.16-2 +- Rebase of lorax-composer branch onto 19.6.105-1 +- See https://github.com/weldr/lorax/tree/lorax-composer for individual commits + for 19.7.1-1 thru 19.7.16-1 + Resolves: rhbz#1547759 + +* Mon Jun 11 2018 Brian C. Lane 19.6.105-1 +- Retry losetup if loop_attach fails (bcl) + Resolves: rhbz#1589084 +- Add reqpart to example kickstart files (bcl) + Resolves: rhbz#1545289 +- Increase default ram used with lmc and virt to 2048 (bcl) + Resolves: rhbz#1538747 +- Add --virt-uefi to boot the VM using OVMF (bcl) + Resolves: rhbz#1546715 + Resolves: rhbz#1544805 +- Add --dracut-arg support to lorax (bcl) + Resolves: rhbz#1452220 +- livemedia-creator: Search for kernel/initrd under /images/pxeboot (bcl) + Resolves: rhbz#1522629 + * Wed Jan 24 2018 Brian C. Lane 19.6.104-1 - Replace fedora-gnome-theme with gnome-themes-standard (bcl) Resolves: rhbz#1537573 @@ -157,7 +272,7 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install Resolves: rhbz#1341280 - Fix loop_wait (bcl) Resolves: rhbz#1462150 -- Document kickstart restrictions on %include (bcl) +- Document kickstart restrictions on %%include (bcl) Resolves: rhbz#1418500 - Add support for --repo to read yum .repo files directly (bcl) Resolves: rhbz#1430479 @@ -1008,7 +1123,7 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install - Allow specifying buildarch on the command line (#771382) (mgracik) - lorax: Don't touch /etc/mtab in cleanup (bcl) - Update TODO and POLICY to reflect the current state of things (wwoods) -- consider %ghost files part of the filelists in templates (wwoods) +- consider %%ghost files part of the filelists in templates (wwoods) - lorax: Add option to exclude packages (bcl) - dracut needs kbd directories (#769932) (bcl) - better debug, handle relative output paths (bcl) @@ -1027,7 +1142,7 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install - Changes needed for livecd creation (bcl) - dracut has moved to /usr/bin (bcl) -* Mon Oct 21 2011 Will Woods 17.0-1 +* Fri Oct 21 2011 Will Woods 17.0-1 - Merges the 'treebuilder' branch of lorax - images are split into two parts again (initrd.img, LiveOS/squashfs.img) - base memory use reduced to ~200M (was ~550M in F15, ~320MB in F16)