diff --git a/.gitignore b/.gitignore index 4ca59af..9fa627f 100644 --- a/.gitignore +++ b/.gitignore @@ -263,8 +263,4 @@ /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-43.11.tar.gz diff --git a/0001-runtime-install-drop-tigervnc.patch b/0001-runtime-install-drop-tigervnc.patch new file mode 100644 index 0000000..76424cd --- /dev/null +++ b/0001-runtime-install-drop-tigervnc.patch @@ -0,0 +1,31 @@ +From 2892e1edcea0d92ce09a573822b4d42799eedd8f Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Thu, 2 Oct 2025 12:07:50 -0700 +Subject: [PATCH] runtime-install: drop tigervnc + +anaconda dropped VNC support in +https://github.com/rhinstaller/anaconda/pull/5829 . There is no +point to having these any more, and they pull Xorg and its deps +into the image unnecessarily. + +Signed-off-by: Adam Williamson +--- + share/templates.d/99-generic/runtime-install.tmpl | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl +index 6ed14fdc..49545065 100644 +--- a/share/templates.d/99-generic/runtime-install.tmpl ++++ b/share/templates.d/99-generic/runtime-install.tmpl +@@ -122,8 +122,6 @@ installpkg selinux-policy-targeted audit + + ## network tools/servers + installpkg ethtool openssh-server nfs-utils openssh-clients +-installpkg tigervnc-server-minimal +-installpkg tigervnc-server-module + installpkg net-tools + installpkg bridge-utils + installpkg nmap-ncat +-- +2.51.0 + diff --git a/lorax.spec b/lorax.spec index 5e3eaa4..5213595 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,19 +4,20 @@ %global forgeurl https://github.com/weldr/lorax Name: lorax -Version: 44.4 -Release: 1%{?dist} +Version: 43.11 +Release: 3%{?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} +# https://github.com/weldr/lorax/pull/1495 +# drop tigervnc to save space, anaconda now uses RDP +Patch: 0001-runtime-install-drop-tigervnc.patch + BuildRequires: python3-devel BuildRequires: python3-pip BuildRequires: python3-setuptools @@ -143,7 +144,7 @@ Lorax templates for creating the boot.iso and live isos are placed in /usr/share/lorax/templates.d/99-generic %prep -%forgeautosetup +%forgeautosetup -p1 %build @@ -187,30 +188,14 @@ 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) +* Fri Oct 03 2025 Adam Williamson - 43.11-3 +- Backport PR #1495 to drop tigervnc from installer images -* Wed Nov 26 2025 Daniel P. Berrangé - 44.3-2 -- Add ExcludeArch for i686 to remove qemu dependency +* Thu Sep 25 2025 Brian C. Lane - 43.11-2 +- Pass 43 to CI testing so it uses the correct repository -* 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 +* Wed Sep 24 2025 Brian C. Lane 43.11-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) diff --git a/sources b/sources index 0b5f402..b5c6429 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-44.4.tar.gz) = e2be9a13a0aec657bfe9a32dbd51e9024dfcb89471dbc57b8206dccdcd71cf5561fb25f97a7fdaca2b0279a2966b142ddf4e4544577ac2b47171f19648742577 +SHA512 (lorax-43.11.tar.gz) = dfc9f77da7f756360afcdf9832fb13fef2f975a0aa45c91d3824529044892f0bcceb0359de9664800ee7c9826c61a9ee89ad8603cf15cc9e2d85eb903eadd577 diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index f4849b2..caf0e72 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -254,7 +254,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=43 --release=43 --volid="Fedora-43-test" \ $REPOS --isfinal --nomacboot /var/tmp/lorax-fedora-iso/ || exit 1 fi