Accepting request 847553 from home:lnussel:firmware

- use %_firmwaredir

OBS-URL: https://build.opensuse.org/request/show/847553
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-firmware?expand=0&rev=40
This commit is contained in:
Takashi Iwai 2020-11-11 13:28:55 +00:00 committed by Git OBS Bridge
parent 2b312f87b5
commit 58c9864ac2
2 changed files with 13 additions and 8 deletions

View File

@ -6,6 +6,11 @@ Wed Oct 21 13:04:20 CEST 2020 - tiwai@suse.de
See details in See details in
https://alsa-project.org/wiki/Changes_v1.2.3.2_v1.2.4 https://alsa-project.org/wiki/Changes_v1.2.3.2_v1.2.4
-------------------------------------------------------------------
Mon Oct 19 12:49:11 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- use %_firmwaredir
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jan 14 14:46:03 CET 2020 - tiwai@suse.de Tue Jan 14 14:46:03 CET 2020 - tiwai@suse.de

View File

@ -82,36 +82,36 @@ Various firmware data files for ALSA drivers.
%configure \ %configure \
--enable-loader \ --enable-loader \
--enable-hotplug \ --enable-hotplug \
--with-hotplug-dir=/lib/firmware --with-hotplug-dir=%{_firmwaredir}
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
make DESTDIR="%{buildroot}" install make DESTDIR="%{buildroot}" install
# remove duplicated entries that are already in kernel-firmware package # remove duplicated entries that are already in kernel-firmware package
rm -f %{buildroot}/lib/firmware/ctefx.bin rm -f %{buildroot}%{_firmwaredir}/ctefx.bin
rm -f %{buildroot}/lib/firmware/ctspeq.bin rm -f %{buildroot}%{_firmwaredir}/ctspeq.bin
# remove unnecessary loader firmwares # remove unnecessary loader firmwares
for d in vxloader mixartloader pcxhrloader; do for d in vxloader mixartloader pcxhrloader; do
rm -rf %{buildroot}%{_datadir}/alsa/firmware/$d rm -rf %{buildroot}%{_datadir}/alsa/firmware/$d
done done
# some files are included in the new "kernel-firmware" package # some files are included in the new "kernel-firmware" package
for d in ess korg sb16 yamaha; do for d in ess korg sb16 yamaha; do
rm -rf %{buildroot}/lib/firmware/$d rm -rf %{buildroot}%{_firmwaredir}/$d
done done
# change identical files to symlinks for hdsploader # change identical files to symlinks for hdsploader
pushd %{buildroot}%{_datadir}/alsa/firmware/hdsploader pushd %{buildroot}%{_datadir}/alsa/firmware/hdsploader
for i in *.bin; do for i in *.bin; do
hotplug=%{buildroot}/lib/firmware/$i hotplug=%{buildroot}%{_firmwaredir}/$i
if [ -f $hotplug ]; then if [ -f $hotplug ]; then
if cmp -s -b $hotplug $i; then if cmp -s -b $hotplug $i; then
rm $i rm $i
ln -s /lib/firmware/$i ln -s %{_firmwaredir}/$i
fi fi
fi fi
done done
popd popd
# FIXME: remove non-existing msnd firmware symlinks # FIXME: remove non-existing msnd firmware symlinks
rm -rf %{buildroot}/lib/firmware/turtlebeach rm -rf %{buildroot}%{_firmwaredir}/turtlebeach
# install documents # install documents
mkdir -p %{buildroot}%{_docdir}/%{name} mkdir -p %{buildroot}%{_docdir}/%{name}
mkdir -p %{buildroot}%{_licensedir}/%{name} mkdir -p %{buildroot}%{_licensedir}/%{name}
@ -143,7 +143,7 @@ install -D -c -m 0644 %{SOURCE1} %{buildroot}%{_udevdir}/rules.d/52-usx2yaudio.r
%defattr(-, root, root) %defattr(-, root, root)
%doc %{_docdir}/%{name} %doc %{_docdir}/%{name}
%license %{_licensedir}/%{name} %license %{_licensedir}/%{name}
/lib/firmware/* %{_firmwaredir}/*
%{_datadir}/alsa %{_datadir}/alsa
%{_udevdir} %{_udevdir}