rpm/kernel-firmware
SHA256
1
0
Fork 0
forked from pool/kernel-firmware
Code Pull Requests Activity

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

Browse Source 
- Apply the same workaround to uncompressed flat package, too
  (bsc#1204103)

OBS-URL: https://build.opensuse.org/request/show/1009317
OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=391
This commit is contained in:
Takashi Iwai 2022-10-10 09:25:22 +00:00 committed by Git OBS Bridge
parent 25a9af69d1
commit 0652fbc46e
5 changed files with 60 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel-firmware.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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> Sat Oct 8 15:46:30 UTC 2022 - Takashi Iwai <tiwai@suse.com>

21
kernel-firmware.spec
View File

@ -61,7 +61,9 @@ Source1011: fwtopics.py
Source1012: check-topic.py Source1012: check-topic.py
Source1013: update-aliases.py Source1013: update-aliases.py
Source1014: README.build Source1014: README.build
# workarounds
Source1100: qcom-post Source1100: qcom-post
Source1101: uncompressed-post
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: suse-module-tools BuildRequires: suse-module-tools
Requires(post): /usr/bin/mkdir /usr/bin/touch Requires(post): /usr/bin/mkdir /usr/bin/touch
@ -6272,13 +6274,32 @@ sh %{_sourcedir}/list-license.sh < %{_sourcedir}/licenses.list
%fdupes -s %{buildroot} %fdupes -s %{buildroot}
%if "%flavor" != "compressed" %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 %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} %{?regenerate_initrd_post}
fi
%postun %postun
%{?regenerate_initrd_post} %{?regenerate_initrd_post}
%posttrans %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} %{?regenerate_initrd_posttrans}
%post -n ucode-amd %post -n ucode-amd

2
kernel-firmware.spec.in
View File

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

4
makespec.sh
View File

@ -33,6 +33,10 @@ define_subpackage () {
define_post () { define_post () {
local l="$*" local l="$*"
if [ -z "$l" -a -f uncompressed-post ]; then
cat uncompressed-post
return 0
fi
if [ -n "$l" -a -f "$l"-post ]; then if [ -n "$l" -a -f "$l"-post ]; then
cat "$l"-post cat "$l"-post
return 0 return 0

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}