Accepting request 1137580 from home:tiwai:branches:Kernel:HEAD

- Update to version 20240105 (git commit 5a6ae745d8a4):
  * amlogic/bluetooth: add firmware bin of W1 serial soc(w1u_uart)
- Drop superfluous Provides from uncompressed kernel-firmware package
  that may confuse dependencies (bsc#1218307)
- Minor adjustment and updates of scripts / templates

OBS-URL: https://build.opensuse.org/request/show/1137580
OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=459
This commit is contained in:
Takashi Iwai 2024-01-08 14:37:33 +00:00 committed by Git OBS Bridge
parent e08f634460
commit 8c4540e328
7 changed files with 17 additions and 42 deletions

View File

@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git</param>
<param name="changesrevision">b83108216200dfece891ddc52bcde2e2860f5dc2</param></service></servicedata>
<param name="changesrevision">5a6ae745d8a4a4d74956e8b3816150580ac2f7ab</param></service></servicedata>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5df87ca6cc62624053148f20255280e6db0601658aa4c04090fde292a35c6f4b
size 363983308

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d0eb0c57c169c53bd19f2ac67f614a967f71415f48cec1345ffd066627b642c1
size 364007020

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Jan 08 13:19:55 UTC 2024 - tiwai@suse.com
- Update to version 20240105 (git commit 5a6ae745d8a4):
* amlogic/bluetooth: add firmware bin of W1 serial soc(w1u_uart)
- Drop superfluous Provides from uncompressed kernel-firmware package
that may confuse dependencies (bsc#1218307)
- Minor adjustment and updates of scripts / templates
-------------------------------------------------------------------
Tue Jan 02 13:54:59 UTC 2024 - tiwai@suse.com

View File

@ -21,11 +21,11 @@
%define _firmwaredir /lib/firmware
%endif
%define __ksyms_path ^%{_firmwaredir}
%define version_unconverted 20240102
%define version_unconverted 20240105
# Force bzip2 instead of lzma compression (bsc#1176981)
%define _binary_payload w9.bzdio
Name: kernel-firmware
Version: 20240102
Version: 20240105
Release: 0
Summary: Linux kernel firmware files
License: GPL-2.0-only AND SUSE-Firmware AND GPL-2.0-or-later AND MIT
@ -114,39 +114,6 @@ Obsoletes: qlogic-firmware < %{version}
Conflicts: filesystem < 84
%endif
%if "%{flavor}" == "uncompressed"
Provides: %{name}-amdgpu = %{version}
Provides: %{name}-ath10k = %{version}
Provides: %{name}-ath11k = %{version}
Provides: %{name}-ath12k = %{version}
Provides: %{name}-atheros = %{version}
Provides: %{name}-bluetooth = %{version}
Provides: %{name}-bnx2 = %{version}
Provides: %{name}-brcm = %{version}
Provides: %{name}-chelsio = %{version}
Provides: %{name}-dpaa2 = %{version}
Provides: %{name}-i915 = %{version}
Provides: %{name}-intel = %{version}
Provides: %{name}-iwlwifi = %{version}
Provides: %{name}-liquidio = %{version}
Provides: %{name}-marvell = %{version}
Provides: %{name}-media = %{version}
Provides: %{name}-mediatek = %{version}
Provides: %{name}-mellanox = %{version}
Provides: %{name}-mwifiex = %{version}
Provides: %{name}-network = %{version}
Provides: %{name}-nfp = %{version}
Provides: %{name}-nvidia = %{version}
Provides: %{name}-platform = %{version}
Provides: %{name}-prestera = %{version}
Provides: %{name}-qcom = %{version}
Provides: %{name}-qlogic = %{version}
Provides: %{name}-radeon = %{version}
Provides: %{name}-realtek = %{version}
Provides: %{name}-serial = %{version}
Provides: %{name}-sound = %{version}
Provides: %{name}-ti = %{version}
Provides: %{name}-ueagle = %{version}
Provides: %{name}-usb-network = %{version}
Provides: kernel-firmware-uncompressed = %{version}
%endif

View File

@ -1,7 +1,7 @@
#
# spec file for package kernel-firmware
#
# Copyright (c) 2023 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
@ -89,7 +89,6 @@ Conflicts: filesystem < 84
%endif
%if "%{flavor}" == "uncompressed"
Provides: kernel-firmware-uncompressed = %{version}
@@SUBPKGPROVS@@
%endif
%description

View File

@ -18,8 +18,8 @@ define_subpackage () {
echo "Requires(postun):/usr/bin/mkdir /usr/bin/touch"
echo "Requires(post): dracut >= 049"
echo "Conflicts: kernel < 5.3"
echo "Conflicts: kernel-firmware-uncompressed"
echo "Conflicts: kernel-firmware < %{version}"
echo "Conflicts: kernel-firmware-uncompressed"
echo "%if 0%{?suse_version} >= 1550"
echo "# make sure we have post-usrmerge filesystem package on TW"
echo "Conflicts: filesystem < 84"