diff --git a/.gitignore b/.gitignore index 4ca59af..7ae19bb 100644 --- a/.gitignore +++ b/.gitignore @@ -242,29 +242,6 @@ /lorax-40.4.tar.gz /lorax-40.5.tar.gz /lorax-40.6.tar.gz -/lorax-41.0.tar.gz -/lorax-41.1.tar.gz -/lorax-41.2.tar.gz -/lorax-41.3.tar.gz -/lorax-42.0.tar.gz -/lorax-42.1.tar.gz -/lorax-42.2.tar.gz -/lorax-42.3.tar.gz -/lorax-42.4.tar.gz -/lorax-42.5.tar.gz -/lorax-43.0.tar.gz -/lorax-43.1.tar.gz -/lorax-43.2.tar.gz -/lorax-43.3.tar.gz -/lorax-43.4.tar.gz -/lorax-43.5.tar.gz -/lorax-43.6.tar.gz -/lorax-43.7.tar.gz -/lorax-43.8.tar.gz -/lorax-43.9.tar.gz -/lorax-43.10.tar.gz -/lorax-44.0.tar.gz -/lorax-44.1.tar.gz -/lorax-44.2.tar.gz -/lorax-44.3.tar.gz -/lorax-44.4.tar.gz +/lorax-40.7.tar.gz +/lorax-40.8.tar.gz +/lorax-40.9.tar.gz diff --git a/lorax.spec b/lorax.spec index 5e3eaa4..a270767 100644 --- a/lorax.spec +++ b/lorax.spec @@ -1,24 +1,21 @@ # NOTE: This specfile is generated from upstream at https://github.com/rhinstaller/lorax # NOTE: Please submit changes as a pull request %define debug_package %{nil} -%global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 44.4 -Release: 1%{?dist} +Version: 40.9 +Release: 2%{?dist} Summary: Tool for creating the anaconda install images + License: GPL-2.0-or-later - -# qemu is no longer available on 32-bit -ExcludeArch: %{ix86} - -%global tag %{version} -%forgemeta -Url: %{forgeurl} -Source0: %{forgesource} +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: python3-devel -BuildRequires: python3-pip BuildRequires: python3-setuptools BuildRequires: make BuildRequires: systemd-rpm-macros @@ -43,7 +40,6 @@ Requires: isomd5sum Requires: module-init-tools Requires: parted Requires: squashfs-tools >= 4.2 -Requires: erofs-utils >= 1.8.2 Requires: util-linux Requires: xz-lzma-compat Requires: xz @@ -96,29 +92,19 @@ Requires: lorax = %{version}-%{release} %description docs Includes the full html documentation for lorax, livemedia-creator, and the pylorax library. -%if ! (0%{?rhel} >= 10 && "%{_arch}" == "ppc64le") %package lmc-virt Summary: livemedia-creator libvirt dependencies Requires: lorax = %{version}-%{release} -%if 0%{?rhel} -# RHEL doesn't have qemu, just qemu-kvm -Requires: qemu-kvm -%else Requires: qemu -Recommends: qemu-kvm -%endif -# edk2 builds currently only support these arches -%ifarch x86_64 +# Fedora edk2 builds currently only support these arches +%ifarch x86_64 aarch64 Requires: edk2-ovmf %endif -%ifarch aarch64 -Requires: edk2-aarch64 -%endif +Recommends: qemu-kvm %description lmc-virt Additional dependencies required by livemedia-creator when using it with qemu. -%endif %package lmc-novirt Summary: livemedia-creator no-virt dependencies @@ -143,7 +129,7 @@ Lorax templates for creating the boot.iso and live isos are placed in /usr/share/lorax/templates.d/99-generic %prep -%forgeautosetup +%autosetup -p1 -n %{name}-%{version} %build @@ -158,10 +144,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %doc docs/lorax.rst docs/livemedia-creator.rst docs/product-images.rst %doc docs/*ks %{python3_sitelib}/pylorax -%{python3_sitelib}/pylorax-%{version}.dist-info -%{_bindir}/lorax -%{_bindir}/mkefiboot -%{_bindir}/livemedia-creator +%{python3_sitelib}/*.egg-info +%{_sbindir}/lorax +%{_sbindir}/mkefiboot +%{_sbindir}/livemedia-creator %{_bindir}/mkksiso %{_bindir}/image-minimizer %dir %{_sysconfdir}/lorax @@ -176,9 +162,7 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %files docs %doc docs/html/* -%if ! (0%{?rhel} >= 10 && "%{_arch}" == "ppc64le") %files lmc-virt -%endif %files lmc-novirt @@ -187,155 +171,27 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Mon Dec 01 2025 Brian C. Lane 44.4-1 -- Exclude build on the i686 architecture (berrange@redhat.com) -- runtime-cleanup: mesa no longer includes gallium-pipe drivers (yselkowi@redhat.com) +* Mon Nov 25 2024 Brian C. Lane - 40.9-2 +- tests: Set release to 40 instead of rawhide (bcl) -* Wed Nov 26 2025 Daniel P. Berrangé - 44.3-2 -- Add ExcludeArch for i686 to remove qemu dependency - -* Wed Oct 15 2025 Brian C. Lane 44.3-1 -- Do not remove SELinux from the runtime (ppolawsk@redhat.com) - -* Thu Oct 09 2025 Brian C. Lane 44.2-1 -- Add mac80211_hwsim for wifi testing to installer image (rvykydal@redhat.com) -- runtime-install: drop tigervnc (awilliam@redhat.com) - -* Wed Sep 24 2025 Brian C. Lane 44.1-1 -- runtime-install: skip qcom-accel-firmware (awilliam@redhat.com) -- executils: decoding after deserialization (oleg.sviridov@red-soft.ru) -- mkksiso: make ISO reproducible with SOURCE_DATE_EPOCH (e.champetier@ateme.com) - -* Mon Sep 08 2025 Brian C. Lane 44.0-1 -- maint: Switch default platform to F44 (bcl@redhat.com) -- Drop all installs of shim-ia32 (it no longer exists) (awilliam@redhat.com) -- templates: Support product version to contain blank character in - templates.d/99-generic (songmingliang@uniontech.com) - -* Thu Aug 14 2025 Brian C. Lane 43.10-1 -- executils: Remove binary_output flag (bcl@redhat.com) -- logging: Set encoding=UTF-8 on FileHandler (bcl@redhat.com) -- executils: Set encoding to UTF-8 for _run_program (bcl@redhat.com) -- tests: Add template runcmd unicode test (bcl@redhat.com) -- tests: Add some unicode to the executils tests (bcl@redhat.com) -- templates: Remove explicit installation of anaconda-widgets (k.koukiou@gmail.com) - -* Tue Jul 22 2025 Brian C. Lane 43.9-1 -- Makefile: Separate install and all targets (bcl@redhat.com) - -* Tue Jul 15 2025 Brian C. Lane 43.8-1 -- pylilnt: Drop old rules and ignore .tito (bcl@redhat.com) -- tito: Add support for tagging the version in pyproject.toml (bcl@redhat.com) -- lorax.spec: Update for pyproject.toml use (bcl@redhat.com) -- pyproject: Add cmdline scripts (bcl@redhat.com) -- bin: symlink to scripts from src/bin (bcl@redhat.com) -- Move cmdline scripts under pylorax.cmdline (bcl@redhat.com) -- pylorax: Move cmdline into a pylorax.cmdline module (bcl@redhat.com) -- pyproject: Add a pyproject.toml config file (bcl@redhat.com) -- Makefile: Stop running setup.py directly (bcl@redhat.com) - -* Fri Jul 11 2025 Brian C. Lane 43.7-1 -- runtime-cleanup: don't strip avahi-libs (awilliam@redhat.com) -- treebuilder: use fedora-eln-logos for ELN (yselkowi@redhat.com) - -* Wed Jul 02 2025 Brian C. Lane 43.6-1 -- config_files: Do not remove `chcon` in runtime cleanup (ppolawsk@redhat.com) -- use /mnt/sysroot PATH in profile (butirsky@gmail.com) -- fix chroot path in .bash_history (butirsky@gmail.com) - -* Mon Jun 16 2025 Brian C. Lane 43.5-1 -- templates.d: Remove libdir variable from templates (bcl@redhat.com) -- runtime-cleanup: Move rpm database cleanup to the end (bcl@redhat.com) - -* Tue May 06 2025 Brian C. Lane 43.4-1 -- runtime-postinstall: Remove root password (bcl@redhat.com) - Resolves: rhbz#2364082 -- tests: Update magic module usage (bcl@redhat.com) -- utils: Remove old filediff.py script (bcl@redhat.com) -- dnfbase: Use load_repos instead of update_and_load_enabled_repos (bcl@redhat.com) - Fixes #1464 - -* Mon Mar 31 2025 Brian C. Lane 43.3-1 -- config_files: Drop efi suffix from linuxefi and initrdefi in grub2-efi.cfg (bcl@redhat.com) -- runtime-install: only install amd-ucode-firmware on x86_64 (awilliam@redhat.com) -- runtime-install: exclude crust-firmware (awilliam@redhat.com) -- runtime-cleanup: drop more video and audio firmwares (awilliam@redhat.com) -- runtime-install: drop exceptions related to F38-era fw renames (awilliam@redhat.com) -- runtime-postinstall: allow pipewire to run as root (awilliam@redhat.com) - -* Tue Mar 25 2025 Brian C. Lane 43.2-1 -- spec: update lorax-lmc-virt dependencies (yselkowi@redhat.com) -- livemedia-creator: Set 0755 permission on / cpio overlay (bcl@redhat.com) - -* Mon Mar 10 2025 Brian C. Lane 43.1-1 -- runtime-postinstall: Remove systemd-gpt-auto-generator (bcl@redhat.com) - -* Thu Mar 06 2025 Brian C. Lane 43.0-1 -- maint: Switch default platform to F43 (bcl@redhat.com) -- runtime-cleanup: Leave stat binary (bcl@redhat.com) - -* Mon Feb 03 2025 Brian C. Lane 42.5-1 -- Remove sbin usage (bcl@redhat.com) -- mkksiso: Replace existing inst.ks on the iso (bcl@redhat.com) -- Dockerfile.test: Use fedora:latest instead of rawhide (bcl@redhat.com) -- mkksiso: Fix rebuilding the efiboot.img on some systems (bcl@redhat.com) -- Remove leftovers from xorg drop (jkonecny@redhat.com) - -* Fri Nov 22 2024 Brian C. Lane 42.4-1 +* Fri Nov 22 2024 Brian C. Lane 40.9-1 - runtime-cleanup: Newer glibc installs into /usr/lib64 (bcl@redhat.com) -- erofs: Change the erofs compression default to zstd (bcl@redhat.com) +- Prepare for the sbin merge (zbyszek@in.waw.pl) -* Mon Oct 21 2024 Brian C. Lane 42.3-1 -- Update template for anaconda webui to start as user (adamkankovsky@gmail.com) +* Tue Oct 08 2024 Brian C. Lane 40.8-1 +- creator: Fix pylint error in run_creator (bcl@redhat.com) - tests: Fix mkksiso unit test (bcl@redhat.com) - -* Tue Oct 08 2024 Brian C. Lane 42.2-1 +- test: Use fedora:40 for test-in-podman (bcl@redhat.com) - pylint: Print astroid version (bcl@redhat.com) - Extend help for --updates and --ks parameters (jkonecny@redhat.com) - Fix --updates the updates image wasn't loaded (jkonecny@redhat.com) - -* Mon Sep 30 2024 Brian C. Lane 42.1-1 -- templates: Drop dnf install (bcl@redhat.com) - -* Mon Sep 09 2024 Brian C. Lane 42.0-1 -- New lorax documentation - 41.3 (bcl@redhat.com) -- ltmpl: Remove * from docstring (bcl@redhat.com) -- docs: Update intersphinx and add _static dir (bcl@redhat.com) -- docs: Document --rootfs-type options (bcl@redhat.com) -- Adjust Lorax templates for Xorg to Wayland switch (jkonecny@redhat.com) -- creator: Change rootfs description to match cmdline argument (bcl@redhat.com) - -* Tue Jul 16 2024 Brian C. Lane 41.3-1 -- Accept but ignore the old --squashfs-only argument (awilliam@redhat.com) - -* Mon Jul 15 2024 Brian C. Lane 41.2-1 -- Prepare for the sbin merge (zbyszek@in.waw.pl) -- Add compression.erofs section to lorax.conf (bcl@redhat.com) -- Add erofs and erofs-ext4 support to --rootfs-type (bcl@redhat.com) -- Replace squashfs_only with rootfs_type (bcl@redhat.com) -- imgutils: Add mkerofs function and test (bcl@redhat.com) - Implement --replace also for S390 (sebastian.stark@advantest.com) - mkksiso: option --replace to replace arbitrary text in boot config. (sebastian.stark@advantest.com) -- spec: Drop forge tag lua tweak (bcl@redhat.com) +- New lorax documentation 40.8 (bcl@redhat.com) +- docs: Remove links to older branches (bcl@redhat.com) -* Wed Jun 12 2024 Brian C. Lane 41.1-1 -- livemedia-creator: Check for BIOS vs. UEFI qemu support (bcl@redhat.com) -- livemedia-creator: Enable s390x virt support (bcl@redhat.com) -- livemedia-creator: Make use of virtio devices more generic (bcl@redhat.com) -- Makefile: Turn off seccomp for test-in-podman (bcl@redhat.com) -- tests: Fix image_minimizer test dnf usage (bcl@redhat.com) -- creator: Fix pylint error in run_creator (bcl@redhat.com) -- New lorax documentation - 41.1 (bcl@redhat.com) -- docs: Add sphinx-reredirects and composer-cli redirect (bcl@redhat.com) -- New lorax documentation - 41.1 (bcl@redhat.com) -- spec: Switch to using the source from the github tag (bcl@redhat.com) -- workflows: Add missing branch names (bcl@redhat.com) +* Tue Mar 26 2024 Brian C. Lane 40.7-1 - runtime-cleanup: wget2-wget has replaced wget (yselkowi@redhat.com) -- Add a simple PR template reminder (bcl@redhat.com) - -* Fri Mar 15 2024 Brian C. Lane -- maint: Switch default platform to F41 (bcl@redhat.com) -- Add prefixdevname support to the boot.iso (rvykydal@redhat.com) * Mon Feb 19 2024 Brian C. Lane - Add example use of lmc in github actions. (cjshowalter@alaska.edu) diff --git a/sources b/sources index 0b5f402..6980e72 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-44.4.tar.gz) = e2be9a13a0aec657bfe9a32dbd51e9024dfcb89471dbc57b8206dccdcd71cf5561fb25f97a7fdaca2b0279a2966b142ddf4e4544577ac2b47171f19648742577 +SHA512 (lorax-40.9.tar.gz) = 5c4033f3eebd5810a142d631b1a86a81f070e488c1a2c063528d116765f296477f8902803083b97c52509e26c1d31369f5674cecdc674236a742a6e769cc5ec1 diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index f4849b2..f26c626 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -241,8 +241,6 @@ function run_as_user { umount_dirs } - - # Gather up the list of system repo files and use them for lorax REPOS=$(for f in /etc/yum.repos.d/*repo; do echo -n "--repo $f "; done) if [ -z "$REPOS" ]; then @@ -254,7 +252,7 @@ fi # Run lorax using the host's repository configuration file if [ ! -e "$BOOTISO" ]; then running "Build boot.iso with lorax" - lorax --product="Fedora" --version=rawhide --release=rawhide --volid="Fedora-rawhide-test" \ + lorax --product="Fedora" --version=40 --release=40 --volid="Fedora-40-test" \ $REPOS --isfinal --nomacboot /var/tmp/lorax-fedora-iso/ || exit 1 fi