Skip to content

Commit

Permalink
Allow building for SLE15SP1+ systems
Browse files Browse the repository at this point in the history
  • Loading branch information
aaannz committed Dec 13, 2024
1 parent c16d4fb commit d016573
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 6 deletions.
6 changes: 6 additions & 0 deletions kiwi-desc-saltboot/kiwi-desc-saltboot.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Dec 13 13:13:07 UTC 2024 - Ondrej Holecek <[email protected]>

- Update to version 0.1.
* Allow building for SLE15SP1+

-------------------------------------------------------------------
Fri Jun 23 13:47:10 UTC 2023 - Ondrej Holecek <[email protected]>

Expand Down
24 changes: 20 additions & 4 deletions kiwi-desc-saltboot/kiwi-desc-saltboot.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# spec file for package kiwi-desc-saltboot
#
# Copyright (c) 2020 SUSE LLC.
# Copyright (c) 2024 SUSE LLC.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
Expand All @@ -24,9 +24,15 @@ Summary: SALT-based PXE network boot template
License: GPL-2.0
Group: System/Packages
BuildArch: noarch
%if 0%{?sle_version} >= 150100
BuildRequires: python3-kiwi > 9.24
BuildRequires: kiwi-boot-descriptions
Requires: kiwi-boot-descriptions
%else
BuildRequires: kiwi > 4.0
BuildRequires: kiwi-desc-netboot
Requires: kiwi-desc-netboot
%endif
Provides: kiwi-boot:saltboot
Provides: kiwi-image:cpio
Provides: kiwi-image:pxe
Expand All @@ -37,20 +43,30 @@ ExclusiveArch: x86_64 noarch
ExclusiveArch: i586 x86_64 noarch
%endif

%if 0%{?sle_version} >= 150100
%define kiwi_image_dir /usr/share/kiwi/custom_boot
%define linuxrc_include /usr/share/kiwi/custom_boot/functions.sh
%else
%define kiwi_image_dir /usr/share/kiwi/image
%define linuxrc_include /usr/share/kiwi/modules/KIWILinuxRC.sh
%endif

%description
kiwi boot (initrd) image for booting SALT-based PXE images.

%prep
%setup -q
ln -s %{linuxrc_include} saltboot/suse-SLES11/root/include
ln -s %{linuxrc_include} saltboot/suse-SLES12/root/include

%build

%install
mkdir -p %{buildroot}/usr/share/kiwi/image
cp -R saltboot %{buildroot}/usr/share/kiwi/image
mkdir -p %{buildroot}%{kiwi_image_dir}
cp -R saltboot %{buildroot}%{kiwi_image_dir}

%files
%defattr(-,root,root,-)
/usr/share/kiwi/image
%{kiwi_image_dir}/saltboot

%changelog
1 change: 0 additions & 1 deletion kiwi-desc-saltboot/saltboot/suse-SLES11/root/include

This file was deleted.

1 change: 0 additions & 1 deletion kiwi-desc-saltboot/saltboot/suse-SLES12/root/include

This file was deleted.

0 comments on commit d016573

Please sign in to comment.