diff --git a/.gitignore b/.gitignore index 24477b5..4ca59af 100644 --- a/.gitignore +++ b/.gitignore @@ -246,3 +246,25 @@ /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 diff --git a/lorax.spec b/lorax.spec index 1fbe0fe..5e3eaa4 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,17 +4,21 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 41.3 -Release: 2%{?dist} +Version: 44.4 +Release: 1%{?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} BuildRequires: python3-devel +BuildRequires: python3-pip BuildRequires: python3-setuptools BuildRequires: make BuildRequires: systemd-rpm-macros @@ -39,7 +43,7 @@ Requires: isomd5sum Requires: module-init-tools Requires: parted Requires: squashfs-tools >= 4.2 -Requires: erofs-utils +Requires: erofs-utils >= 1.8.2 Requires: util-linux Requires: xz-lzma-compat Requires: xz @@ -92,19 +96,29 @@ 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 -# Fedora edk2 builds currently only support these arches -%ifarch x86_64 aarch64 +# edk2 builds currently only support these arches +%ifarch x86_64 Requires: edk2-ovmf %endif -Recommends: qemu-kvm +%ifarch aarch64 +Requires: edk2-aarch64 +%endif %description lmc-virt Additional dependencies required by livemedia-creator when using it with qemu. +%endif %package lmc-novirt Summary: livemedia-creator no-virt dependencies @@ -144,10 +158,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}/*.egg-info -%{_sbindir}/lorax -%{_sbindir}/mkefiboot -%{_sbindir}/livemedia-creator +%{python3_sitelib}/pylorax-%{version}.dist-info +%{_bindir}/lorax +%{_bindir}/mkefiboot +%{_bindir}/livemedia-creator %{_bindir}/mkksiso %{_bindir}/image-minimizer %dir %{_sysconfdir}/lorax @@ -162,7 +176,9 @@ 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 @@ -171,8 +187,123 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Thu Jul 18 2024 Fedora Release Engineering - 41.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild +* 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) + +* 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 +- runtime-cleanup: Newer glibc installs into /usr/lib64 (bcl@redhat.com) +- erofs: Change the erofs compression default to zstd (bcl@redhat.com) + +* Mon Oct 21 2024 Brian C. Lane 42.3-1 +- Update template for anaconda webui to start as user (adamkankovsky@gmail.com) +- tests: Fix mkksiso unit test (bcl@redhat.com) + +* Tue Oct 08 2024 Brian C. Lane 42.2-1 +- 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) diff --git a/sources b/sources index dd876cb..0b5f402 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-41.3.tar.gz) = 35fcbde5490a52c07f2fdc05b04f7d2f7877e33012f3adf654458f5e52ac56b91345b567fd10c95d0dcea33895bc0602b7ba4db6251935f7103322e0461590ff +SHA512 (lorax-44.4.tar.gz) = e2be9a13a0aec657bfe9a32dbd51e9024dfcb89471dbc57b8206dccdcd71cf5561fb25f97a7fdaca2b0279a2966b142ddf4e4544577ac2b47171f19648742577 diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index ce3c4ed..f4849b2 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -186,8 +186,8 @@ function add_updatesimg { running "Add updates.img" # nothing in the file, just test that it is there - touch /tmp/test-updates.img - mkksiso -u /tmp/test-updates.img $BOOTISO $OUTISO || exit 1 + touch /tmp/updates.img + mkksiso -u /tmp/updates.img $BOOTISO $OUTISO || exit 1 mount $OUTISO $ISODIR || exit 1 test_updatesimg @@ -197,15 +197,17 @@ function add_updatesimg { } function test_updatesimg { - [ -e "$ISODIR/updates/updates.img" ] || fail "Missing file from iso" + [ -e "$ISODIR/updates.img" ] || fail "Missing updates.img file from iso" + grep "inst.updates=.*updates.img" "$ISODIR/boot/grub2/grub.cfg" || fail "Missing BIOS grub.cfg inst.updates entry" + grep "inst.updates=.*updates.img" "$ISODIR/EFI/BOOT/grub.cfg" || fail "Missing UEFI grub.cfg inst.updates entry" } # All of the changes function run_all { running "Use all the options" - touch /tmp/test-updates.img - mkksiso -u /tmp/test-updates.img -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO || exit 1 + touch /tmp/updates.img + mkksiso -u /tmp/updates.img -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO || exit 1 mount $OUTISO $ISODIR || exit 1 test_ks @@ -224,8 +226,8 @@ function run_as_user { running "Use all the options as a user" [ ! -e "/home/lorax-ted" ] && useradd -m lorax-ted - touch /tmp/test-updates.img - su - lorax-ted -c "mkksiso --skip-mkefiboot -u /tmp/test-updates.img -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO" || exit 1 + touch /tmp/updates.img + su - lorax-ted -c "mkksiso --skip-mkefiboot -u /tmp/updates.img -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO" || exit 1 mount $OUTISO $ISODIR || exit 1 test_ks