diff --git a/SOURCES/0116.patch b/SOURCES/0116.patch new file mode 100644 index 0000000..4ca2f7e --- /dev/null +++ b/SOURCES/0116.patch @@ -0,0 +1,47 @@ +From 76a59a57aeaaa8f86445ae75e71807fb1f0394e0 Mon Sep 17 00:00:00 2001 +From: Pavel Valena +Date: Wed, 24 Jun 2026 22:54:40 +0200 +Subject: [PATCH] revert: "feat(i18n): pull 'drm' or 'simpledrm' module unless + excluded" + +This reverts commit 35e125e0b8c013e759b4a1b819d73a99adcbf347. + +Resolves: RHEL-188248 +--- + modules.d/10i18n/module-setup.sh | 23 +---------------------- + 1 file changed, 1 insertion(+), 22 deletions(-) + +diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh +index 11aedb0cc..35bda36fb 100755 +--- a/modules.d/10i18n/module-setup.sh ++++ b/modules.d/10i18n/module-setup.sh +@@ -11,28 +11,7 @@ check() { + + # called by dracut + depends() { +- # Include "drm" / "simpledrm" to be able to set the console font properly +- local _module _drm +- local -a _modules=(drm simpledrm) +- +- for _module in "${_modules[@]}"; do +- if dracut_module_included "$_module"; then +- _drm="$_module" +- break +- fi +- done +- +- if [[ -z $_drm ]]; then +- for _module in "${_modules[@]}"; do +- module_check "$_module" > /dev/null 2>&1 +- if [[ $? == 255 ]] && ! [[ " $omit_dracutmodules " == *\ $_module\ * ]]; then +- _drm="$_module" +- break +- fi +- done +- fi +- +- echo "$_drm" ++ return 0 + } + + # called by dracut diff --git a/SPECS/dracut.spec b/SPECS/dracut.spec index 55e9ce2..c7be2e3 100644 --- a/SPECS/dracut.spec +++ b/SPECS/dracut.spec @@ -5,7 +5,7 @@ # strip the automatically generated dep here and instead co-own the # directory. %global __requires_exclude pkg-config -%define dist_free_release 115.git20260527 +%define dist_free_release 117.git20260625 Name: dracut Version: 057 @@ -139,6 +139,7 @@ Patch110: 0110.patch Patch111: 0111.patch Patch113: 0113.patch Patch114: 0114.patch +Patch116: 0116.patch Source1: https://www.gnu.org/licenses/lgpl-2.1.txt @@ -595,6 +596,9 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{_prefix}/lib/kernel/install.d/51-dracut-rescue.install %changelog +* Thu Jun 25 2026 Pavel Valena - 057-117.git20260625 +- revert: "feat(i18n): pull 'drm' or 'simpledrm' module unless + * Wed May 27 2026 Pavel Valena - 057-115.git20260527 - build: rebuild without an obsoleted patch