Skip to content

Drop custom SUSE patch #2983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
schaefi wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Drop custom SUSE patch #2983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion build-tests/x86/leap/test-image-custom-partitions/appliance.kiwi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<oem-swapsize>512</oem-swapsize>
<oem-device-filter>/dev/ram</oem-device-filter>
</oemconfig>
<bootloader name="grub2" console="serial" timeout="10"/>
<bootloader name="grub2" bls="false" console="serial" timeout="10"/>
</type>
</preferences>
<users>
Expand Down
2 changes: 1 addition & 1 deletion build-tests/x86/leap/test-image-disk-ramdisk/appliance.kiwi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<bootloader-theme>openSUSE</bootloader-theme>
<type image="oem" filesystem="ext4" firmware="uefi" installiso="true" installboot="install" kernelcmdline="rd.kiwi.ramdisk ramdisk_size=2192000 console=ttyS0">
<size unit="G">2</size>
<bootloader name="grub2" console="serial" timeout="10"/>
<bootloader name="grub2" bls="false" console="serial" timeout="10"/>
<oemconfig>
<oem-skip-verify>true</oem-skip-verify>
<oem-unattended>true</oem-unattended>
Expand Down
2 changes: 1 addition & 1 deletion build-tests/x86/leap/test-image-disk-selinux/appliance.kiwi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<oemconfig>
<oem-resize>false</oem-resize>
</oemconfig>
<bootloader name="grub2" console="serial" timeout="10"/>
<bootloader name="grub2" bls="false" console="serial" timeout="10"/>
</type>
</preferences>
<users>
Expand Down
2 changes: 1 addition & 1 deletion build-tests/x86/leap/test-image-disk-simple/appliance.kiwi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<oemconfig>
<oem-resize>false</oem-resize>
</oemconfig>
<bootloader name="grub2" console="serial" timeout="10"/>
<bootloader name="grub2" bls="false" console="serial" timeout="10"/>
</type>
</preferences>
<users>
Expand Down
2 changes: 1 addition & 1 deletion build-tests/x86/leap/test-image-disk/appliance.kiwi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<bootsplash-theme>bgrt</bootsplash-theme>
<bootloader-theme>openSUSE</bootloader-theme>
<type image="oem" filesystem="btrfs" kernelcmdline="console=ttyS0" firmware="efi" installiso="true" bootpartition="false" installboot="install" volid="KATO_INSTALL">
<bootloader name="grub2" console="serial" timeout="10"/>
<bootloader name="grub2" bls="false" console="serial" timeout="10"/>
<oemconfig>
<oem-unattended>true</oem-unattended>
<oem-swapsize>1024</oem-swapsize>
Expand Down
2 changes: 1 addition & 1 deletion build-tests/x86/leap/test-image-embedded/appliance.kiwi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<preferences profiles="SystemFeatures">
<!-- simple disk image testing features useful in embedded projects -->
<type image="oem" filesystem="ext4" firmware="efi" overlayroot="true" bootpartition="true" devicepersistency="by-partuuid" kernelcmdline="console=ttyS0">
<bootloader name="grub2" console="serial" timeout="10"/>
<bootloader name="grub2" bls="false" console="serial" timeout="10"/>
<oemconfig>
<oem-resize>false</oem-resize>
</oemconfig>
Expand Down
2 changes: 1 addition & 1 deletion build-tests/x86/leap/test-image-live/appliance.kiwi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<bootsplash-theme>bgrt</bootsplash-theme>
<bootloader-theme>openSUSE</bootloader-theme>
<type image="iso" flags="overlay" firmware="efi" kernelcmdline="console=ttyS0" hybridpersistent_filesystem="ext4" hybridpersistent="true">
<bootloader name="grub2" console="serial" timeout="10"/>
<bootloader name="grub2" bls="false" console="serial" timeout="10"/>
</type>
</preferences>
<users>
Expand Down
2 changes: 1 addition & 1 deletion build-tests/x86/leap/test-image-luks/appliance.kiwi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<oemconfig>
<oem-resize>false</oem-resize>
</oemconfig>
<bootloader name="grub2" console="serial" timeout="10"/>
<bootloader name="grub2" bls="false" console="serial" timeout="10"/>
</type>
</preferences>
<users>
Expand Down
2 changes: 1 addition & 1 deletion build-tests/x86/leap/test-image-lvm/appliance.kiwi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<oemconfig>
<oem-resize>false</oem-resize>
</oemconfig>
<bootloader name="grub2" console="serial" timeout="10"/>
<bootloader name="grub2" bls="false" console="serial" timeout="10"/>
<systemdisk>
<volume name="home"/>
</systemdisk>
Expand Down
2 changes: 1 addition & 1 deletion build-tests/x86/leap/test-image-overlayroot/appliance.kiwi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<oemconfig>
<oem-resize>false</oem-resize>
</oemconfig>
<bootloader name="grub2" console="serial" timeout="10"/>
<bootloader name="grub2" bls="false" console="serial" timeout="10"/>
<size unit="G">4</size>
</type>
</preferences>
Expand Down
4 changes: 2 additions & 2 deletions build-tests/x86/leap/test-image-vagrant/appliance.kiwi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<oemconfig>
<oem-resize>false</oem-resize>
</oemconfig>
<bootloader name="grub2" timeout="0" console="serial"/>
<bootloader name="grub2" bls="false" timeout="0" console="serial"/>
<vagrantconfig provider="libvirt" virtualsize="42"/>
<size unit="G">42</size>
</type>
Expand All @@ -42,7 +42,7 @@
<oemconfig>
<oem-resize>false</oem-resize>
</oemconfig>
<bootloader name="grub2" timeout="0" console="serial"/>
<bootloader name="grub2" bls="false" timeout="0" console="serial"/>
<vagrantconfig provider="virtualbox" virtualbox_guest_additions_present="true" virtualsize="42"/>
<size unit="G">42</size>
</type>
Expand Down
62 changes: 0 additions & 62 deletions package/kiwi-revert-bls-default-for-suse.patch
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions package/python-kiwi-spec-template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
Loading