diff --git a/installation-images-16.63.tar.xz b/installation-images-16.63.tar.xz deleted file mode 100644 index d8085a9..0000000 --- a/installation-images-16.63.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:62a2cbe06a3332c8e56711ccea2ea92e7b2658d654cacdee440a9a7ad22f5fb2 -size 230952 diff --git a/installation-images-16.64.tar.xz b/installation-images-16.64.tar.xz new file mode 100644 index 0000000..e73ebde --- /dev/null +++ b/installation-images-16.64.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47ee810c117aa9059091e4bd3711e04ea504268410a24081b7485a6dc8b12474 +size 231020 diff --git a/installation-images.changes b/installation-images.changes index fffd00e..3125568 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,10 @@ +-------------------------------------------------------------------- +Fri Apr 16 13:15:24 UTC 2021 - Lubos.Kocman@suse.com + +- merge gh#openSUSE/installation-images#480 +- build with kernel-default-extra on Leap (bsc#1184413, bsc#1183140) +- 16.64 + -------------------------------------------------------------------- Wed Apr 14 10:39:46 UTC 2021 - wfeldt@opensuse.org diff --git a/installation-images.spec b/installation-images.spec index 450e585..7a98707 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -43,6 +43,7 @@ ExclusiveArch: do_not_build %define with_reiserfs_kmp 0 %define with_ssl_hmac 1 %define with_exfat 0 +%define with_kernel_extra 0 %bcond_without sbl %bcond_without vnc %bcond_with xen @@ -64,6 +65,7 @@ ExclusiveArch: do_not_build %if 0%{?is_opensuse} %define theme openSUSE %if 0%{?sle_version} +%define with_kernel_extra 1 # define the_version %(echo %sle_version | sed -Ee 's/^([0-9][0-9])(0|([0-9]))([0-9]).*/\\1.\\3\\4/') %define the_version \\$releasever %if "%{the_version}" == "" @@ -385,6 +387,9 @@ BuildRequires: jfsutils BuildRequires: joe BuildRequires: kbd BuildRequires: kernel-default +%if %with_kernel_extra +BuildRequires: kernel-default-extra +%endif BuildRequires: kernel-firmware BuildRequires: kexec-tools BuildRequires: khmeros-fonts @@ -669,7 +674,7 @@ AutoReqProv: off Summary: Installation Image Files for %theme License: GPL-2.0-or-later Group: Metapackages -Version: 16.63 +Version: 16.64 Release: 0 Provides: installation-images = %version-%release Conflicts: otherproviders(installation-images)