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

Accepting request 847560 from home:lnussel:firmware

Browse Source 
- use %_firmwaredir

OBS-URL: https://build.opensuse.org/request/show/847560
OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=331
This commit is contained in:
Takashi Iwai 2020-11-11 13:28:48 +00:00 committed by Git OBS Bridge
parent 41a69eff82
commit 8e693e7276
4 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install-split.sh
View File

@ -15,7 +15,7 @@ fi
topics="$1" topics="$1"
DESTDIR="$2" DESTDIR="$2"
fwdir=/lib/firmware fwdir=${3:-/lib/firmware}
dest=$DESTDIR/$fwdir dest=$DESTDIR/$fwdir
do_compress=1 do_compress=1
@ -85,7 +85,7 @@ while read l; do
$verbose "Switching to topic $topic" $verbose "Switching to topic $topic"
if [ -n "$topic" ]; then if [ -n "$topic" ]; then
if [ ! -s files-$topic ]; then if [ ! -s files-$topic ]; then
echo "%dir /lib/firmware" > files-$topic echo "%dir $fwdir" > files-$topic
fi fi
fi fi
;; ;;

5
kernel-firmware.changes
View File

@ -14,6 +14,11 @@ Thu Oct 29 08:07:03 UTC 2020 - tiwai@suse.com
* qcom : updated venus firmware files for v5.4 * qcom : updated venus firmware files for v5.4
- Add _constraints to fix the build error (bsc#1178242) - Add _constraints to fix the build error (bsc#1178242)
-------------------------------------------------------------------
Mon Oct 19 12:57:37 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- use %_firmwaredir
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 12 10:09:10 CEST 2020 - tiwai@suse.de Mon Oct 12 10:09:10 CEST 2020 - tiwai@suse.de

18
kernel-firmware.spec
View File

@ -18,7 +18,7 @@
%global flavor @BUILD_FLAVOR@%{nil} %global flavor @BUILD_FLAVOR@%{nil}
%define __ksyms_path ^/lib/firmware %define __ksyms_path ^%{_firmwaredir}
%define version_unconverted 20201023 %define version_unconverted 20201023
Name: kernel-firmware Name: kernel-firmware
@ -5685,11 +5685,11 @@ cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} .
# nothing to do # nothing to do
%install %install
mkdir -p %{buildroot}/lib/firmware mkdir -p %{buildroot}%{_firmwaredir}
%if "%flavor" != "compressed" %if "%flavor" != "compressed"
sh ./copy-firmware.sh %{buildroot}/lib/firmware sh ./copy-firmware.sh %{buildroot}%{_firmwaredir}
%else %else
sh %{_sourcedir}/install-split.sh -v %{_sourcedir}/topics.list %{buildroot} < WHENCE sh %{_sourcedir}/install-split.sh -v %{_sourcedir}/topics.list %{buildroot} %{_firmwaredir} < WHENCE
sh %{_sourcedir}/list-license.sh < %{_sourcedir}/licenses.list sh %{_sourcedir}/list-license.sh < %{_sourcedir}/licenses.list
%endif %endif
%fdupes -s %{buildroot} %fdupes -s %{buildroot}
@ -5900,14 +5900,14 @@ sh %{_sourcedir}/list-license.sh < %{_sourcedir}/licenses.list
%files %files
%doc WHENCE README %doc WHENCE README
%license GPL-2 GPL-3 LICEN[CS]E.* %license GPL-2 GPL-3 LICEN[CS]E.*
/lib/firmware %{_firmwaredir}
%exclude /lib/firmware/amd-ucode %exclude %{_firmwaredir}/amd-ucode
%exclude /lib/firmware/amd-ucode/* %exclude %{_firmwaredir}/amd-ucode/*
%files -n ucode-amd %files -n ucode-amd
%license LICENSE.amd-ucode %license LICENSE.amd-ucode
%dir /lib/firmware %dir %{_firmwaredir}
/lib/firmware/amd-ucode %{_firmwaredir}/amd-ucode
%endif %endif
%if "%flavor" == "compressed" %if "%flavor" == "compressed"

20
kernel-firmware.spec.in
View File

@ -18,7 +18,7 @@
%global flavor @BUILD_FLAVOR@%{nil} %global flavor @BUILD_FLAVOR@%{nil}
%define __ksyms_path ^/lib/firmware %define __ksyms_path ^%{_firmwaredir}
%define version_unconverted @@VERSION@@ %define version_unconverted @@VERSION@@
Name: kernel-firmware Name: kernel-firmware
@ -114,14 +114,14 @@ cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} .
# nothing to do # nothing to do
%install %install
mkdir -p %{buildroot}/lib/firmware mkdir -p %{buildroot}%{_firmwaredir}
%if "%flavor" != "compressed" %if "%flavor" != "compressed"
sh ./copy-firmware.sh %{buildroot}/lib/firmware sh ./copy-firmware.sh %{buildroot}%{_firmwaredir}
%else %else
sh %{_sourcedir}/install-split.sh %{_sourcedir}/topics.list %{buildroot} < WHENCE sh %{_sourcedir}/install-split.sh -v %{_sourcedir}/topics.list %{buildroot} %{_firmwaredir} < WHENCE
sh %{_sourcedir}/list-license.sh < %{_sourcedir}/licenses.list sh %{_sourcedir}/list-license.sh < %{_sourcedir}/licenses.list
%endif %endif
%fdupes %{buildroot} %fdupes -s %{buildroot}
%if "%flavor" != "compressed" %if "%flavor" != "compressed"
@@POST@@ @@POST@@
@ -135,14 +135,14 @@ sh %{_sourcedir}/list-license.sh < %{_sourcedir}/licenses.list
%files %files
%doc WHENCE README %doc WHENCE README
%license GPL-2 GPL-3 LICEN[CS]E.* %license GPL-2 GPL-3 LICEN[CS]E.*
/lib/firmware %{_firmwaredir}
%exclude /lib/firmware/amd-ucode %exclude %{_firmwaredir}/amd-ucode
%exclude /lib/firmware/amd-ucode/* %exclude %{_firmwaredir}/amd-ucode/*
%files -n ucode-amd %files -n ucode-amd
%license LICENSE.amd-ucode %license LICENSE.amd-ucode
%dir /lib/firmware %dir %{_firmwaredir}
/lib/firmware/amd-ucode %{_firmwaredir}/amd-ucode
%endif %endif
%if "%flavor" == "compressed" %if "%flavor" == "compressed"