pool/kernel-firmware
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1009318 from Kernel:HEAD

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1009318
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kernel-firmware?expand=0&rev=190
This commit is contained in:
Fabian Vogt 2022-10-10 16:46:45 +00:00 committed by Git OBS Bridge
commit 381599d01d
6 changed files with 118 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kernel-firmware.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Oct 10 09:12:47 UTC 2022 - Takashi Iwai <tiwai@suse.com>
- Apply the same workaround to uncompressed flat package, too
(bsc#1204103)
-------------------------------------------------------------------
Sat Oct 8 15:46:30 UTC 2022 - Takashi Iwai <tiwai@suse.com>
- Workaround for update failure of kernel-firmware-qcom package
due to the change from a directory to a symlink (bsc#1204103)
-------------------------------------------------------------------
Mon Oct 03 06:55:34 UTC 2022 - tiwai@suse.com

41
kernel-firmware.spec
View File

@ -61,6 +61,9 @@ Source1011: fwtopics.py
Source1012: check-topic.py
Source1013: update-aliases.py
Source1014: README.build
# workarounds
Source1100: qcom-post
Source1101: uncompressed-post
BuildRequires: fdupes
BuildRequires: suse-module-tools
Requires(post): /usr/bin/mkdir /usr/bin/touch
@ -6271,13 +6274,32 @@ sh %{_sourcedir}/list-license.sh < %{_sourcedir}/licenses.list
%fdupes -s %{buildroot}
%if "%flavor" != "compressed"
%pre
# ugly workaround for changing qcom/LENOVO/21BX to a symlink (bsc#1204103)
if [ ! -L %{_firmwaredir}/qcom/LENOVO/21BX ]; then
if [ -d %{_firmwaredir}/qcom/LENOVO/21BX ]; then
mv %{_firmwaredir}/qcom/LENOVO/21BX %{_firmwaredir}/qcom/LENOVO/21BX.xxxold
fi
fi
%post
# ugly workaround (bsc#1204103)
if [ -d %{_firmwaredir}/qcom/LENOVO/21BX.xxxold ]; then
mv %{_firmwaredir}/qcom/LENOVO/21BX %{_firmwaredir}/qcom/LENOVO/21BX.xxxnew
mv %{_firmwaredir}/qcom/LENOVO/21BX.xxxold %{_firmwaredir}/qcom/LENOVO/21BX
else
%{?regenerate_initrd_post}
fi
%postun
%{?regenerate_initrd_post}
%posttrans
# ugly workaround (bsc#1204103)
if [ -L %{_firmwaredir}/qcom/LENOVO/21BX.xxxnew ]; then
rm -rf %{_firmwaredir}/qcom/LENOVO/21BX
mv %{_firmwaredir}/qcom/LENOVO/21BX.xxxnew %{_firmwaredir}/qcom/LENOVO/21BX
fi
%{?regenerate_initrd_posttrans}
%post -n ucode-amd
@ -6506,13 +6528,32 @@ sh %{_sourcedir}/list-license.sh < %{_sourcedir}/licenses.list
%posttrans prestera
%{?regenerate_initrd_posttrans}
%pre qcom
# ugly workaround for changing qcom/LENOVO/21BX to a symlink (bsc#1204103)
if [ ! -L %{_firmwaredir}/qcom/LENOVO/21BX ]; then
if [ -d %{_firmwaredir}/qcom/LENOVO/21BX ]; then
mv %{_firmwaredir}/qcom/LENOVO/21BX %{_firmwaredir}/qcom/LENOVO/21BX.xxxold
fi
fi
%post qcom
# ugly workaround (bsc#1204103)
if [ -d %{_firmwaredir}/qcom/LENOVO/21BX.xxxold ]; then
mv %{_firmwaredir}/qcom/LENOVO/21BX %{_firmwaredir}/qcom/LENOVO/21BX.xxxnew
mv %{_firmwaredir}/qcom/LENOVO/21BX.xxxold %{_firmwaredir}/qcom/LENOVO/21BX
else
%{?regenerate_initrd_post}
fi
%postun qcom
%{?regenerate_initrd_post}
%posttrans qcom
# ugly workaround (bsc#1204103)
if [ -L %{_firmwaredir}/qcom/LENOVO/21BX.xxxnew ]; then
rm -rf %{_firmwaredir}/qcom/LENOVO/21BX
mv %{_firmwaredir}/qcom/LENOVO/21BX.xxxnew %{_firmwaredir}/qcom/LENOVO/21BX
fi
%{?regenerate_initrd_posttrans}
%post qlogic

3
kernel-firmware.spec.in
View File

@ -61,6 +61,9 @@ Source1011: fwtopics.py
Source1012: check-topic.py
Source1013: update-aliases.py
Source1014: README.build
# workarounds
Source1100: qcom-post
Source1101: uncompressed-post
BuildRequires: fdupes
BuildRequires: suse-module-tools
Requires(post): /usr/bin/mkdir /usr/bin/touch

8
makespec.sh
View File

@ -33,6 +33,14 @@ define_subpackage () {
define_post () {
local l="$*"
if [ -z "$l" -a -f uncompressed-post ]; then
cat uncompressed-post
return 0
fi
if [ -n "$l" -a -f "$l"-post ]; then
cat "$l"-post
return 0
fi
test -n "$l" && l=" $l"
echo "%post$l"
echo "%{?regenerate_initrd_post}"

27
qcom-post Normal file
View File

@ -0,0 +1,27 @@
%pre qcom
# ugly workaround for changing qcom/LENOVO/21BX to a symlink (bsc#1204103)
if [ ! -L %{_firmwaredir}/qcom/LENOVO/21BX ]; then
if [ -d %{_firmwaredir}/qcom/LENOVO/21BX ]; then
mv %{_firmwaredir}/qcom/LENOVO/21BX %{_firmwaredir}/qcom/LENOVO/21BX.xxxold
fi
fi
%post qcom
# ugly workaround (bsc#1204103)
if [ -d %{_firmwaredir}/qcom/LENOVO/21BX.xxxold ]; then
mv %{_firmwaredir}/qcom/LENOVO/21BX %{_firmwaredir}/qcom/LENOVO/21BX.xxxnew
mv %{_firmwaredir}/qcom/LENOVO/21BX.xxxold %{_firmwaredir}/qcom/LENOVO/21BX
else
%{?regenerate_initrd_post}
fi
%postun qcom
%{?regenerate_initrd_post}
%posttrans qcom
# ugly workaround (bsc#1204103)
if [ -L %{_firmwaredir}/qcom/LENOVO/21BX.xxxnew ]; then
rm -rf %{_firmwaredir}/qcom/LENOVO/21BX
mv %{_firmwaredir}/qcom/LENOVO/21BX.xxxnew %{_firmwaredir}/qcom/LENOVO/21BX
fi
%{?regenerate_initrd_posttrans}

27
uncompressed-post Normal file
View File

@ -0,0 +1,27 @@
%pre
# ugly workaround for changing qcom/LENOVO/21BX to a symlink (bsc#1204103)
if [ ! -L %{_firmwaredir}/qcom/LENOVO/21BX ]; then
if [ -d %{_firmwaredir}/qcom/LENOVO/21BX ]; then
mv %{_firmwaredir}/qcom/LENOVO/21BX %{_firmwaredir}/qcom/LENOVO/21BX.xxxold
fi
fi
%post
# ugly workaround (bsc#1204103)
if [ -d %{_firmwaredir}/qcom/LENOVO/21BX.xxxold ]; then
mv %{_firmwaredir}/qcom/LENOVO/21BX %{_firmwaredir}/qcom/LENOVO/21BX.xxxnew
mv %{_firmwaredir}/qcom/LENOVO/21BX.xxxold %{_firmwaredir}/qcom/LENOVO/21BX
else
%{?regenerate_initrd_post}
fi
%postun
%{?regenerate_initrd_post}
%posttrans
# ugly workaround (bsc#1204103)
if [ -L %{_firmwaredir}/qcom/LENOVO/21BX.xxxnew ]; then
rm -rf %{_firmwaredir}/qcom/LENOVO/21BX
mv %{_firmwaredir}/qcom/LENOVO/21BX.xxxnew %{_firmwaredir}/qcom/LENOVO/21BX
fi
%{?regenerate_initrd_posttrans}