From 48e36efbfc38dbad5e407d10db060a23c98d5ba9bcf5149b98256cc90e40e60e Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.com>
Date: Sun, 11 Oct 2020 21:35:11 +0000
Subject: [PATCH] Accepting request 841090 from home:tiwai:branches:Kernel:HEAD

- 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
---
 install-split.sh        | 30 +++---------------------------
 kernel-firmware.changes |  6 ++++++
 kernel-firmware.spec    |  4 ++--
 3 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/install-split.sh b/install-split.sh
index ad1adf2..d22cdda 100644
--- a/install-split.sh
+++ b/install-split.sh
@@ -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
diff --git a/kernel-firmware.changes b/kernel-firmware.changes
index 66890db..11a9f26 100644
--- a/kernel-firmware.changes
+++ b/kernel-firmware.changes
@@ -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
 
diff --git a/kernel-firmware.spec b/kernel-firmware.spec
index 1fad200..5e0cb17 100644
--- a/kernel-firmware.spec
+++ b/kernel-firmware.spec
@@ -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}