Hello community,
here is the log from the commit of package kernel-firmware for openSUSE:Factory
checked in at 2020-11-12 22:33:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kernel-firmware (Old)
and /work/SRC/openSUSE:Factory/.kernel-firmware.new.24930 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-firmware"
Thu Nov 12 22:33:33 2020 rev:154 rq:847807 version:20201023
Changes:
--------
--- /work/SRC/openSUSE:Factory/kernel-firmware/kernel-firmware.changes
2020-11-02 09:40:04.773591856 +0100
+++
/work/SRC/openSUSE:Factory/.kernel-firmware.new.24930/kernel-firmware.changes
2020-11-12 22:34:19.749845046 +0100
@@ -17,0 +18,5 @@
+Mon Oct 19 12:57:37 UTC 2020 - Ludwig Nussel <[email protected]>
+
+- use %_firmwaredir
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-firmware.spec ++++++
--- /var/tmp/diff_new_pack.Z6OpzW/_old 2020-11-12 22:34:23.377848377 +0100
+++ /var/tmp/diff_new_pack.Z6OpzW/_new 2020-11-12 22:34:23.381848380 +0100
@@ -18,7 +18,7 @@
%global flavor @BUILD_FLAVOR@%{nil}
-%define __ksyms_path ^/lib/firmware
+%define __ksyms_path ^%{_firmwaredir}
%define version_unconverted 20201023
Name: kernel-firmware
@@ -5685,11 +5685,11 @@
# nothing to do
%install
-mkdir -p %{buildroot}/lib/firmware
+mkdir -p %{buildroot}%{_firmwaredir}
%if "%flavor" != "compressed"
-sh ./copy-firmware.sh %{buildroot}/lib/firmware
+sh ./copy-firmware.sh %{buildroot}%{_firmwaredir}
%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
%endif
%fdupes -s %{buildroot}
@@ -5900,14 +5900,14 @@
%files
%doc WHENCE README
%license GPL-2 GPL-3 LICEN[CS]E.*
-/lib/firmware
-%exclude /lib/firmware/amd-ucode
-%exclude /lib/firmware/amd-ucode/*
+%{_firmwaredir}
+%exclude %{_firmwaredir}/amd-ucode
+%exclude %{_firmwaredir}/amd-ucode/*
%files -n ucode-amd
%license LICENSE.amd-ucode
-%dir /lib/firmware
-/lib/firmware/amd-ucode
+%dir %{_firmwaredir}
+%{_firmwaredir}/amd-ucode
%endif
%if "%flavor" == "compressed"
++++++ install-split.sh ++++++
--- /var/tmp/diff_new_pack.Z6OpzW/_old 2020-11-12 22:34:23.589848572 +0100
+++ /var/tmp/diff_new_pack.Z6OpzW/_new 2020-11-12 22:34:23.589848572 +0100
@@ -15,7 +15,7 @@
topics="$1"
DESTDIR="$2"
-fwdir=/lib/firmware
+fwdir=${3:-/lib/firmware}
dest=$DESTDIR/$fwdir
do_compress=1
@@ -85,7 +85,7 @@
$verbose "Switching to topic $topic"
if [ -n "$topic" ]; then
if [ ! -s files-$topic ]; then
- echo "%dir /lib/firmware" > files-$topic
+ echo "%dir $fwdir" > files-$topic
fi
fi
;;
++++++ kernel-firmware.spec.in ++++++
--- /var/tmp/diff_new_pack.Z6OpzW/_old 2020-11-12 22:34:23.649848626 +0100
+++ /var/tmp/diff_new_pack.Z6OpzW/_new 2020-11-12 22:34:23.649848626 +0100
@@ -18,7 +18,7 @@
%global flavor @BUILD_FLAVOR@%{nil}
-%define __ksyms_path ^/lib/firmware
+%define __ksyms_path ^%{_firmwaredir}
%define version_unconverted @@VERSION@@
Name: kernel-firmware
@@ -114,14 +114,14 @@
# nothing to do
%install
-mkdir -p %{buildroot}/lib/firmware
+mkdir -p %{buildroot}%{_firmwaredir}
%if "%flavor" != "compressed"
-sh ./copy-firmware.sh %{buildroot}/lib/firmware
+sh ./copy-firmware.sh %{buildroot}%{_firmwaredir}
%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
%endif
-%fdupes %{buildroot}
+%fdupes -s %{buildroot}
%if "%flavor" != "compressed"
@@POST@@
@@ -135,14 +135,14 @@
%files
%doc WHENCE README
%license GPL-2 GPL-3 LICEN[CS]E.*
-/lib/firmware
-%exclude /lib/firmware/amd-ucode
-%exclude /lib/firmware/amd-ucode/*
+%{_firmwaredir}
+%exclude %{_firmwaredir}/amd-ucode
+%exclude %{_firmwaredir}/amd-ucode/*
%files -n ucode-amd
%license LICENSE.amd-ucode
-%dir /lib/firmware
-/lib/firmware/amd-ucode
+%dir %{_firmwaredir}
+%{_firmwaredir}/amd-ucode
%endif
%if "%flavor" == "compressed"
_______________________________________________
openSUSE Commits mailing list -- [email protected]
To unsubscribe, email [email protected]
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/[email protected]
