From 2bb11d461315bc0375d6aed00bdc7ffe910dbd13 Mon Sep 17 00:00:00 2001 From: Mikhail Kashkarov Date: Fri, 31 May 2019 10:28:19 +0300 Subject: [PATCH] [W/S] Remove dublicates in $binaries variable Decrease $binaries size from 3328 to 372 files to significantly speed up processing with patch_binary (especially with sanitized environment). This change also removes 2961 warnings from patch_binary: [ 421s] WARNING: File '...' exists, ignoring Change-Id: I146cc9495f65387894df212f13a3f34cb317a62e --- packaging/qemu-accel-aarch64.spec | 2 +- packaging/qemu-accel-armv7hl.spec | 2 +- packaging/qemu-accel-armv7l.spec | 2 +- packaging/qemu-accel.spec.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packaging/qemu-accel-aarch64.spec b/packaging/qemu-accel-aarch64.spec index 2327525..3df2138 100644 --- a/packaging/qemu-accel-aarch64.spec +++ b/packaging/qemu-accel-aarch64.spec @@ -200,7 +200,7 @@ function prepare_package_list { ## Store the resulting list for packaging, setting up the right prefix cat $name.list | sed -e 's|^|%{emul_path}|;s| |\n%{emul_path}|g' | sort -u > %{_sourcedir}/$name-accel.list - binaries="$binaries $bins" + binaries=$(tr ' ' '\n' <<< "$binaries $bins" | sort -u) } prepare_package_list all \ diff --git a/packaging/qemu-accel-armv7hl.spec b/packaging/qemu-accel-armv7hl.spec index 2326d57..7f8e7db 100644 --- a/packaging/qemu-accel-armv7hl.spec +++ b/packaging/qemu-accel-armv7hl.spec @@ -200,7 +200,7 @@ function prepare_package_list { ## Store the resulting list for packaging, setting up the right prefix cat $name.list | sed -e 's|^|%{emul_path}|;s| |\n%{emul_path}|g' | sort -u > %{_sourcedir}/$name-accel.list - binaries="$binaries $bins" + binaries=$(tr ' ' '\n' <<< "$binaries $bins" | sort -u) } prepare_package_list all \ diff --git a/packaging/qemu-accel-armv7l.spec b/packaging/qemu-accel-armv7l.spec index fa43670..d40458d 100644 --- a/packaging/qemu-accel-armv7l.spec +++ b/packaging/qemu-accel-armv7l.spec @@ -200,7 +200,7 @@ function prepare_package_list { ## Store the resulting list for packaging, setting up the right prefix cat $name.list | sed -e 's|^|%{emul_path}|;s| |\n%{emul_path}|g' | sort -u > %{_sourcedir}/$name-accel.list - binaries="$binaries $bins" + binaries=$(tr ' ' '\n' <<< "$binaries $bins" | sort -u) } prepare_package_list all \ diff --git a/packaging/qemu-accel.spec.in b/packaging/qemu-accel.spec.in index d8ce343..ff25752 100644 --- a/packaging/qemu-accel.spec.in +++ b/packaging/qemu-accel.spec.in @@ -197,7 +197,7 @@ function prepare_package_list { ## Store the resulting list for packaging, setting up the right prefix cat $name.list | sed -e 's|^|%{emul_path}|;s| |\n%{emul_path}|g' | sort -u > %{_sourcedir}/$name-accel.list - binaries="$binaries $bins" + binaries=$(tr ' ' '\n' <<< "$binaries $bins" | sort -u) } prepare_package_list all \ -- 2.7.4