From 37db9d459c429d61aeb0536ce82f1fd079e30ec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= Date: Tue, 14 Apr 2026 15:29:12 +0200 Subject: [PATCH] Drop custom SUSE patch Drop kiwi-revert-bls-default-for-suse.patch which reverts the default grub BLS setting from True to False. With the next major version of kiwi the Boot Loader Spec should be the default for grub as we have it for all other except SUSE distributions. The attribute bls can be used to switch it off. As I expect BLS to not land in Leap in the near future, this commit also disables BLS for leap integration test images. --- Makefile | 2 - .../appliance.kiwi | 2 +- .../test-image-disk-ramdisk/appliance.kiwi | 2 +- .../test-image-disk-selinux/appliance.kiwi | 2 +- .../test-image-disk-simple/appliance.kiwi | 2 +- .../x86/leap/test-image-disk/appliance.kiwi | 2 +- .../leap/test-image-embedded/appliance.kiwi | 2 +- .../x86/leap/test-image-live/appliance.kiwi | 2 +- .../x86/leap/test-image-luks/appliance.kiwi | 2 +- .../x86/leap/test-image-lvm/appliance.kiwi | 2 +- .../test-image-overlayroot/appliance.kiwi | 2 +- .../leap/test-image-vagrant/appliance.kiwi | 4 +- .../kiwi-revert-bls-default-for-suse.patch | 62 ------------------- package/python-kiwi-spec-template | 8 --- 14 files changed, 12 insertions(+), 84 deletions(-) delete mode 100644 package/kiwi-revert-bls-default-for-suse.patch diff --git a/Makefile b/Makefile index a3acdb564b3..1e4dfcc07fe 100644 --- a/Makefile +++ b/Makefile @@ -165,8 +165,6 @@ build: clean check test -e s"@%%MD5SUM@$${md5sums}@" > dist/PKGBUILD # provide rpm rpmlintrc cp package/python-kiwi-rpmlintrc dist - # provide patches - cp package/*.patch dist # provide additional source files cp package/systemd-tmpfiles-for-suse.conf dist diff --git a/build-tests/x86/leap/test-image-custom-partitions/appliance.kiwi b/build-tests/x86/leap/test-image-custom-partitions/appliance.kiwi index 5fa825db495..870813375b9 100644 --- a/build-tests/x86/leap/test-image-custom-partitions/appliance.kiwi +++ b/build-tests/x86/leap/test-image-custom-partitions/appliance.kiwi @@ -25,7 +25,7 @@ 512 /dev/ram - + diff --git a/build-tests/x86/leap/test-image-disk-ramdisk/appliance.kiwi b/build-tests/x86/leap/test-image-disk-ramdisk/appliance.kiwi index d85146e0182..0622bd14bf9 100644 --- a/build-tests/x86/leap/test-image-disk-ramdisk/appliance.kiwi +++ b/build-tests/x86/leap/test-image-disk-ramdisk/appliance.kiwi @@ -18,7 +18,7 @@ openSUSE 2 - + true true diff --git a/build-tests/x86/leap/test-image-disk-selinux/appliance.kiwi b/build-tests/x86/leap/test-image-disk-selinux/appliance.kiwi index f8f9b9d5e58..bf1e52a98d9 100644 --- a/build-tests/x86/leap/test-image-disk-selinux/appliance.kiwi +++ b/build-tests/x86/leap/test-image-disk-selinux/appliance.kiwi @@ -20,7 +20,7 @@ false - + diff --git a/build-tests/x86/leap/test-image-disk-simple/appliance.kiwi b/build-tests/x86/leap/test-image-disk-simple/appliance.kiwi index 89c7d85cfa4..7c4f53d2cb6 100644 --- a/build-tests/x86/leap/test-image-disk-simple/appliance.kiwi +++ b/build-tests/x86/leap/test-image-disk-simple/appliance.kiwi @@ -20,7 +20,7 @@ false - + diff --git a/build-tests/x86/leap/test-image-disk/appliance.kiwi b/build-tests/x86/leap/test-image-disk/appliance.kiwi index 2f58bcf2aef..3e9f6020cb9 100644 --- a/build-tests/x86/leap/test-image-disk/appliance.kiwi +++ b/build-tests/x86/leap/test-image-disk/appliance.kiwi @@ -17,7 +17,7 @@ bgrt openSUSE - + true 1024 diff --git a/build-tests/x86/leap/test-image-embedded/appliance.kiwi b/build-tests/x86/leap/test-image-embedded/appliance.kiwi index 531ad772298..ca163749f27 100644 --- a/build-tests/x86/leap/test-image-embedded/appliance.kiwi +++ b/build-tests/x86/leap/test-image-embedded/appliance.kiwi @@ -49,7 +49,7 @@ - + false diff --git a/build-tests/x86/leap/test-image-live/appliance.kiwi b/build-tests/x86/leap/test-image-live/appliance.kiwi index a4664b41cb0..ddf5a4c48ec 100644 --- a/build-tests/x86/leap/test-image-live/appliance.kiwi +++ b/build-tests/x86/leap/test-image-live/appliance.kiwi @@ -17,7 +17,7 @@ bgrt openSUSE - + diff --git a/build-tests/x86/leap/test-image-luks/appliance.kiwi b/build-tests/x86/leap/test-image-luks/appliance.kiwi index 22c03e73ce6..d449d259644 100644 --- a/build-tests/x86/leap/test-image-luks/appliance.kiwi +++ b/build-tests/x86/leap/test-image-luks/appliance.kiwi @@ -20,7 +20,7 @@ false - + diff --git a/build-tests/x86/leap/test-image-lvm/appliance.kiwi b/build-tests/x86/leap/test-image-lvm/appliance.kiwi index ccaef406700..1babb2c5b74 100644 --- a/build-tests/x86/leap/test-image-lvm/appliance.kiwi +++ b/build-tests/x86/leap/test-image-lvm/appliance.kiwi @@ -20,7 +20,7 @@ false - + diff --git a/build-tests/x86/leap/test-image-overlayroot/appliance.kiwi b/build-tests/x86/leap/test-image-overlayroot/appliance.kiwi index 6658a261376..a8a43ca3c2a 100644 --- a/build-tests/x86/leap/test-image-overlayroot/appliance.kiwi +++ b/build-tests/x86/leap/test-image-overlayroot/appliance.kiwi @@ -20,7 +20,7 @@ false - + 4 diff --git a/build-tests/x86/leap/test-image-vagrant/appliance.kiwi b/build-tests/x86/leap/test-image-vagrant/appliance.kiwi index 73a36af19d1..e08ddef57a5 100644 --- a/build-tests/x86/leap/test-image-vagrant/appliance.kiwi +++ b/build-tests/x86/leap/test-image-vagrant/appliance.kiwi @@ -32,7 +32,7 @@ false - + 42 @@ -42,7 +42,7 @@ false - + 42 diff --git a/package/kiwi-revert-bls-default-for-suse.patch b/package/kiwi-revert-bls-default-for-suse.patch deleted file mode 100644 index 842060ffbf8..00000000000 --- a/package/kiwi-revert-bls-default-for-suse.patch +++ /dev/null @@ -1,62 +0,0 @@ -restore backward compatibility for grub2 with bls. -For the time being, SUSE distributions cannot handle KIWI's -default (True) to use BLS with GRUB2. Until they catch up, the -kiwi default is set to: False - -diff --git a/kiwi/xml_state.py b/kiwi/xml_state.py -index 7653be284..1e72cca22 100644 ---- a/kiwi/xml_state.py -+++ b/kiwi/xml_state.py -@@ -1176,7 +1176,7 @@ class XMLState: - bootloader = self.get_build_type_bootloader_section() - if bootloader and bootloader.get_bls() is not None: - return bootloader.get_bls() -- return True -+ return False - - def get_build_type_bootloader_console(self) -> List[str]: - """ -diff --git a/test/unit/bootloader/config/grub2_test.py b/test/unit/bootloader/config/grub2_test.py -index b40362941..a2dd3106d 100644 ---- a/test/unit/bootloader/config/grub2_test.py -+++ b/test/unit/bootloader/config/grub2_test.py -@@ -629,7 +629,6 @@ class TestBootLoaderConfigGrub2: - 'GRUB_BACKGROUND': '/boot/grub2/themes/openSUSE/background.png', - 'GRUB_CMDLINE_LINUX_DEFAULT': '"some-cmdline"', - 'GRUB_DISTRIBUTOR': '"Bob"', -- 'GRUB_ENABLE_BLSCFG': 'true', - 'GRUB_ENABLE_CRYPTODISK': 'y', - 'GRUB_GFXMODE': '800x600', - 'GRUB_SERIAL_COMMAND': '"serial --speed=38400"', -@@ -677,7 +676,6 @@ class TestBootLoaderConfigGrub2: - 'GRUB_BACKGROUND': '/boot/grub2/themes/openSUSE/background.png', - 'GRUB_CMDLINE_LINUX_DEFAULT': '"some-cmdline"', - 'GRUB_DISTRIBUTOR': '"Bob"', -- 'GRUB_ENABLE_BLSCFG': 'true', - 'GRUB_ENABLE_CRYPTODISK': 'y', - 'GRUB_GFXMODE': '800x600', - 'GRUB_SERIAL_COMMAND': '"serial --speed=38400"', -@@ -720,7 +718,6 @@ class TestBootLoaderConfigGrub2: - call('GRUB_CMDLINE_LINUX', '"root=LABEL=some-label"'), - call('GRUB_DISABLE_LINUX_UUID', 'true'), - call('GRUB_DISTRIBUTOR', '"Bob"'), -- call('GRUB_ENABLE_BLSCFG', 'true'), - call('GRUB_ENABLE_CRYPTODISK', 'y'), - call('GRUB_ENABLE_LINUX_LABEL', 'true'), - call('GRUB_GFXMODE', '800x600'), -@@ -765,7 +762,6 @@ class TestBootLoaderConfigGrub2: - call('GRUB_DISABLE_LINUX_PARTUUID', 'false'), - call('GRUB_DISABLE_LINUX_UUID', 'true'), - call('GRUB_DISTRIBUTOR', '"Bob"'), -- call('GRUB_ENABLE_BLSCFG', 'true'), - call('GRUB_ENABLE_CRYPTODISK', 'y'), - call('GRUB_GFXMODE', '800x600'), - call( -@@ -809,7 +805,6 @@ class TestBootLoaderConfigGrub2: - call('GRUB_CMDLINE_LINUX_DEFAULT', '"abcd console=tty0"'), - call('GRUB_DISABLE_LINUX_UUID', 'true'), - call('GRUB_DISTRIBUTOR', '"Bob"'), -- call('GRUB_ENABLE_BLSCFG', 'true'), - call('GRUB_ENABLE_CRYPTODISK', 'y'), - call('GRUB_ENABLE_LINUX_LABEL', 'true'), - call('GRUB_GFXMODE', '800x600'), diff --git a/package/python-kiwi-spec-template b/package/python-kiwi-spec-template index 528ac50f6b5..4bb49988b4b 100644 --- a/package/python-kiwi-spec-template +++ b/package/python-kiwi-spec-template @@ -71,9 +71,6 @@ Source0: %{name}.tar.gz Source1: %{name}-rpmlintrc # SUSE-specific source additions (1001+) Source1001: systemd-tmpfiles-for-suse.conf -# SUSE-specific patches (1001+) -## PATCH-FIX-OPENSUSE kiwi-revert-bls-default-for-suse.patch -- temporary until opensuse has bls -Patch1001: kiwi-revert-bls-default-for-suse.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?fedora} || 0%{?suse_version} BuildRequires: fdupes @@ -697,11 +694,6 @@ of subcommands, parameters and keywords for the kiwi-ng command. %prep %setup -q -n kiwi-%{version} -%if 0%{?suse_version} -# Temporarily revert grub-bls default to false for SUSE distributions -%patch -P 1001 -p1 -%endif - # Temporarily switch things back to docopt for everything but Fedora 41+ # FIXME: Drop this hack as soon as we can... %if ! (0%{?fedora} >= 41 || 0%{?rhel} >= 10)