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

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

Browse Source 
- Fix symlink creations for split packages (bsc#1177554);
  also show the copy/link status verbosely at packge build

OBS-URL: https://build.opensuse.org/request/show/841090
OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=326
This commit is contained in:
Takashi Iwai 2020-10-11 21:35:11 +00:00 committed by Git OBS Bridge
parent 759ae3df18
commit 48e36efbfc
3 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
install-split.sh
View File

@ -102,28 +102,6 @@ while read l; do
copy_file "$f"
fi
;;
esac
done
sub="xxx"
while read l; do
test -z "$l" && continue
case "$l" in
----*)
sub=""
topic=""
;;
Driver:*)
test -n "$sub" && continue
sub=$(echo "$l" | sed -e's/Driver: *//' -e's/[ :].*$//')
m=$(grep -m1 "^$sub": "$topics" | sed -e's/^.*:[[:space:]]*//')
test -z "$m" && continue
set -- $m
topic="$1"
if [ "$topic" = "SKIP" ]; then
continue
fi
;;
Link:*)
test "$topic" = "SKIP" && continue
if [ -z "$topic" ]; then
@ -131,12 +109,10 @@ while read l; do
exit 1
fi
echo "$l" | sed -e's/^Link: *//g' -e's/-> //g' | while read f d; do
if test -L "$f"; then
copy_link "$f"
else
copy_link "$f" "$d"
fi
copy_link "$f" "$d"
done
;;
esac
done
exit 0

6
kernel-firmware.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Oct 11 22:01:34 CEST 2020 - tiwai@suse.de
- Fix symlink creations for split packages (bsc#1177554);
also show the copy/link status verbosely at packge build
-------------------------------------------------------------------
Mon Oct 5 19:34:51 CEST 2020 - tiwai@suse.de

4
kernel-firmware.spec
View File

@ -123,8 +123,8 @@ Conflicts: kernel < 5.3
Provides: compat-wireless-firmware = 4.4
Obsoletes: compat-wireless-firmware < 4.4
Requires: %{name}-amdgpu = %{version}
Requires: %{name}-atheros = %{version}
Requires: %{name}-ath10k = %{version}
Requires: %{name}-atheros = %{version}
Requires: %{name}-bluetooth = %{version}
Requires: %{name}-bnx2 = %{version}
Requires: %{name}-brcm = %{version}
@ -5689,7 +5689,7 @@ mkdir -p %{buildroot}/lib/firmware
%if "%flavor" != "compressed"
sh ./copy-firmware.sh %{buildroot}/lib/firmware
%else
sh %{_sourcedir}/install-split.sh %{_sourcedir}/topics.list %{buildroot} < WHENCE
sh %{_sourcedir}/install-split.sh -v %{_sourcedir}/topics.list %{buildroot} < WHENCE
sh %{_sourcedir}/list-license.sh < %{_sourcedir}/licenses.list
%endif
%fdupes %{buildroot}