[W] Disable ton of warnings with double-listed files for qemu-accel

/usr/bin and /usr/lib(64) listed in qemu-accel.list forces rpm to include all the
files under these directories even if not specified in list. Specify dirs during
%files section.

[   76s] warning: File listed twice: /emul/usr/lib/gcc/armv7l-tizen-linux-gnueabi/6.2.1/cc1
[   76s] warning: File listed twice: /emul/usr/lib/gcc/armv7l-tizen-linux-gnueabi/6.2.1/cc1plus
[   76s] warning: File listed twice: /emul/usr/lib/gcc/armv7l-tizen-linux-gnueabi/6.2.1/collect2
...

1. Remove directories from the accel list
2. Add /usr/lib/cpp to the list as it was not covered explicitly
3. Eliminate 168 more warnings.

qemu-accel changes:
(removed python-accel dependencies and duplicated liecences for libgcc-32bit)

Removed shared libraries:
  /emul/usr/lib64/libcrypt-2.24.so
  /emul/usr/lib64/libcrypt.so.1
  /emul/usr/lib64/libpython2.7.so.1.0
  /emul/usr/lib64/libreadline.so.5
  /emul/usr/lib64/libreadline.so.5.2
  /emul/usr/lib64/libssl.so.1.0.0
  /emul/usr/lib64/libutil-2.24.so
  /emul/usr/lib64/libutil.so.1

Removed symbolic links:
  /emul/usr/lib/COPYING.RUNTIME
  /emul/usr/lib/COPYING3
  /emul/usr/lib/libgcc-32bit
  /emul/usr/lib/python2.7/site-packages/SCons
  /emul/usr/lib64/python

Removed directories:
  /emul/usr/lib/python2.7
  /emul/usr/lib/python2.7/site-packages
  /emul/usr/lib64/python2.7

Change-Id: I7c09e2e84c3871b78292943ae478aa2d61bb1cd2

4 files changed, 40 insertions, 36 deletions

diff --git a/packaging/qemu-accel-aarch64.spec b/packaging/qemu-accel-aarch64.spec
index d21f4a6..06bac58 100644
--- a/packaging/qemu-accel-aarch64.spec
+++ b/packaging/qemu-accel-aarch64.spec
@@ -289,7 +289,9 @@ echo "${i686_libdir}/${cross_ld_symlink}" >> %{_sourcedir}/multilib-accel.list
 
 # create symlinks for libgcc-32bit
 # libgcc-32bit library is placed under ${gcc_install_dir}32/ not just /lib for 32bit
-for f in $(rpm -ql libgcc-32bit)
+# Process lib*.so files only, we expect that licenses are already in the
+# multilib-accel.list.
+for f in $(rpm -ql libgcc-32bit | grep "\/lib[^\/]*\.so.*")
 do
   filename=$(basename $f)
   ln -sf %{emul_path}/$f %{buildroot}${i686_libdir}/${filename}
@@ -299,20 +301,17 @@ done
 
 # create symlinks for bash
 ln -s usr/bin "${buildroot_emul_path}/bin"
-echo '%{our_path}/bin' >> %{_sourcedir}/all-accel.list
 ln -sf bash "${buildroot_emul_path}%{_bindir}/sh"
 echo '%{emul_path}%{_bindir}/sh' >> %{_sourcedir}/all-accel.list
 
 mv ${buildroot_emul_path}/%{_lib}/* ${buildroot_emul_path}%{_libdir}/
 rm -rf ${buildroot_emul_path}/%{_lib}
 ln -sf usr/%{_lib} ${buildroot_emul_path}/%{_lib}
-echo '%{emul_path}/%{_lib}' >> %{_sourcedir}/all-accel.list
 %{?multilib:
 mv ${buildroot_emul_path}/lib/* ${buildroot_emul_path}%{_prefix}/lib/
 rm -rf ${buildroot_emul_path}/lib
 ln -sf usr/lib ${buildroot_emul_path}/lib
 sed -e 's|%{emul_path}/lib|%{emul_path}/usr/lib|' -i %{_sourcedir}/multilib-accel.list
-echo '%{emul_path}/usr/lib' >> %{_sourcedir}/multilib-accel.list
 }
 
 # rename binutils binaries
@@ -416,6 +415,7 @@ echo "%{emul_path}${gcc_build_dir}/gcc/xg++" >> %{_sourcedir}/all-accel.list
 
 # support /lib/cpp
 ln -sf %{emul_path}%{_bindir}/cpp ${buildroot_emul_path}/usr/lib/cpp
+echo '%{emul_path}/usr/lib/cpp' >> %{_sourcedir}/all-accel.list
 
 # generate baselibs.conf for current architecture to prevent rpm overwriting in download repo
 echo  %{cross}
@@ -468,11 +468,6 @@ sed -e 's|^|%{emul_path}|;s|%{emul_path}/%{_lib}|%{emul_path}%{_libdir}|' clang.
 # Remove common files from clang-accel
 comm -13 %{_sourcedir}/qemu-accel.list clang-full.list > %{_sourcedir}/clang-accel.list
 
-# Add symlinks to qemu-accel packaging
-echo '%{emul_path}/bin' >> %{_sourcedir}/qemu-accel.list
-echo '%{emul_path}/%{_lib}' >> %{_sourcedir}/qemu-accel.list
-%{?multilib:echo '%{emul_path}/lib' >> %{_sourcedir}/qemu-accel.list}
-
 %fdupes %{buildroot}
 %filter_provides_in %{emul_path}
 
@@ -491,6 +486,12 @@ ldconfig
 %files -f %{_sourcedir}/qemu-accel.list
 %defattr(-,root,root)
 %exclude %{emul_path}%{py_libdir}/*
+# Add symlinks to qemu-accel packaging
+%dir %{emul_path}/bin
+%dir %{emul_path}/%{_lib}
+%{?multilib:
+  %dir %{emul_path}/lib
+}
 
 %files -n python-accel -f %{_sourcedir}/python-accel.list
 %defattr(-,root,root)
diff --git a/packaging/qemu-accel-armv7hl.spec b/packaging/qemu-accel-armv7hl.spec
index 8898301..131e959 100644
--- a/packaging/qemu-accel-armv7hl.spec
+++ b/packaging/qemu-accel-armv7hl.spec
@@ -289,7 +289,9 @@ echo "${i686_libdir}/${cross_ld_symlink}" >> %{_sourcedir}/multilib-accel.list
 
 # create symlinks for libgcc-32bit
 # libgcc-32bit library is placed under ${gcc_install_dir}32/ not just /lib for 32bit
-for f in $(rpm -ql libgcc-32bit)
+# Process lib*.so files only, we expect that licenses are already in the
+# multilib-accel.list.
+for f in $(rpm -ql libgcc-32bit | grep "\/lib[^\/]*\.so.*")
 do
   filename=$(basename $f)
   ln -sf %{emul_path}/$f %{buildroot}${i686_libdir}/${filename}
@@ -299,20 +301,17 @@ done
 
 # create symlinks for bash
 ln -s usr/bin "${buildroot_emul_path}/bin"
-echo '%{our_path}/bin' >> %{_sourcedir}/all-accel.list
 ln -sf bash "${buildroot_emul_path}%{_bindir}/sh"
 echo '%{emul_path}%{_bindir}/sh' >> %{_sourcedir}/all-accel.list
 
 mv ${buildroot_emul_path}/%{_lib}/* ${buildroot_emul_path}%{_libdir}/
 rm -rf ${buildroot_emul_path}/%{_lib}
 ln -sf usr/%{_lib} ${buildroot_emul_path}/%{_lib}
-echo '%{emul_path}/%{_lib}' >> %{_sourcedir}/all-accel.list
 %{?multilib:
 mv ${buildroot_emul_path}/lib/* ${buildroot_emul_path}%{_prefix}/lib/
 rm -rf ${buildroot_emul_path}/lib
 ln -sf usr/lib ${buildroot_emul_path}/lib
 sed -e 's|%{emul_path}/lib|%{emul_path}/usr/lib|' -i %{_sourcedir}/multilib-accel.list
-echo '%{emul_path}/usr/lib' >> %{_sourcedir}/multilib-accel.list
 }
 
 # rename binutils binaries
@@ -416,6 +415,7 @@ echo "%{emul_path}${gcc_build_dir}/gcc/xg++" >> %{_sourcedir}/all-accel.list
 
 # support /lib/cpp
 ln -sf %{emul_path}%{_bindir}/cpp ${buildroot_emul_path}/usr/lib/cpp
+echo '%{emul_path}/usr/lib/cpp' >> %{_sourcedir}/all-accel.list
 
 # generate baselibs.conf for current architecture to prevent rpm overwriting in download repo
 echo  %{cross}
@@ -468,11 +468,6 @@ sed -e 's|^|%{emul_path}|;s|%{emul_path}/%{_lib}|%{emul_path}%{_libdir}|' clang.
 # Remove common files from clang-accel
 comm -13 %{_sourcedir}/qemu-accel.list clang-full.list > %{_sourcedir}/clang-accel.list
 
-# Add symlinks to qemu-accel packaging
-echo '%{emul_path}/bin' >> %{_sourcedir}/qemu-accel.list
-echo '%{emul_path}/%{_lib}' >> %{_sourcedir}/qemu-accel.list
-%{?multilib:echo '%{emul_path}/lib' >> %{_sourcedir}/qemu-accel.list}
-
 %fdupes %{buildroot}
 %filter_provides_in %{emul_path}
 
@@ -491,6 +486,12 @@ ldconfig
 %files -f %{_sourcedir}/qemu-accel.list
 %defattr(-,root,root)
 %exclude %{emul_path}%{py_libdir}/*
+# Add symlinks to qemu-accel packaging
+%dir %{emul_path}/bin
+%dir %{emul_path}/%{_lib}
+%{?multilib:
+  %dir %{emul_path}/lib
+}
 
 %files -n python-accel -f %{_sourcedir}/python-accel.list
 %defattr(-,root,root)
diff --git a/packaging/qemu-accel-armv7l.spec b/packaging/qemu-accel-armv7l.spec
index f8eebaa..a156bb6 100644
--- a/packaging/qemu-accel-armv7l.spec
+++ b/packaging/qemu-accel-armv7l.spec
@@ -289,7 +289,9 @@ echo "${i686_libdir}/${cross_ld_symlink}" >> %{_sourcedir}/multilib-accel.list
 
 # create symlinks for libgcc-32bit
 # libgcc-32bit library is placed under ${gcc_install_dir}32/ not just /lib for 32bit
-for f in $(rpm -ql libgcc-32bit)
+# Process lib*.so files only, we expect that licenses are already in the
+# multilib-accel.list.
+for f in $(rpm -ql libgcc-32bit | grep "\/lib[^\/]*\.so.*")
 do
   filename=$(basename $f)
   ln -sf %{emul_path}/$f %{buildroot}${i686_libdir}/${filename}
@@ -299,20 +301,17 @@ done
 
 # create symlinks for bash
 ln -s usr/bin "${buildroot_emul_path}/bin"
-echo '%{our_path}/bin' >> %{_sourcedir}/all-accel.list
 ln -sf bash "${buildroot_emul_path}%{_bindir}/sh"
 echo '%{emul_path}%{_bindir}/sh' >> %{_sourcedir}/all-accel.list
 
 mv ${buildroot_emul_path}/%{_lib}/* ${buildroot_emul_path}%{_libdir}/
 rm -rf ${buildroot_emul_path}/%{_lib}
 ln -sf usr/%{_lib} ${buildroot_emul_path}/%{_lib}
-echo '%{emul_path}/%{_lib}' >> %{_sourcedir}/all-accel.list
 %{?multilib:
 mv ${buildroot_emul_path}/lib/* ${buildroot_emul_path}%{_prefix}/lib/
 rm -rf ${buildroot_emul_path}/lib
 ln -sf usr/lib ${buildroot_emul_path}/lib
 sed -e 's|%{emul_path}/lib|%{emul_path}/usr/lib|' -i %{_sourcedir}/multilib-accel.list
-echo '%{emul_path}/usr/lib' >> %{_sourcedir}/multilib-accel.list
 }
 
 # rename binutils binaries
@@ -416,6 +415,7 @@ echo "%{emul_path}${gcc_build_dir}/gcc/xg++" >> %{_sourcedir}/all-accel.list
 
 # support /lib/cpp
 ln -sf %{emul_path}%{_bindir}/cpp ${buildroot_emul_path}/usr/lib/cpp
+echo '%{emul_path}/usr/lib/cpp' >> %{_sourcedir}/all-accel.list
 
 # generate baselibs.conf for current architecture to prevent rpm overwriting in download repo
 echo  %{cross}
@@ -468,11 +468,6 @@ sed -e 's|^|%{emul_path}|;s|%{emul_path}/%{_lib}|%{emul_path}%{_libdir}|' clang.
 # Remove common files from clang-accel
 comm -13 %{_sourcedir}/qemu-accel.list clang-full.list > %{_sourcedir}/clang-accel.list
 
-# Add symlinks to qemu-accel packaging
-echo '%{emul_path}/bin' >> %{_sourcedir}/qemu-accel.list
-echo '%{emul_path}/%{_lib}' >> %{_sourcedir}/qemu-accel.list
-%{?multilib:echo '%{emul_path}/lib' >> %{_sourcedir}/qemu-accel.list}
-
 %fdupes %{buildroot}
 %filter_provides_in %{emul_path}
 
@@ -491,6 +486,12 @@ ldconfig
 %files -f %{_sourcedir}/qemu-accel.list
 %defattr(-,root,root)
 %exclude %{emul_path}%{py_libdir}/*
+# Add symlinks to qemu-accel packaging
+%dir %{emul_path}/bin
+%dir %{emul_path}/%{_lib}
+%{?multilib:
+  %dir %{emul_path}/lib
+}
 
 %files -n python-accel -f %{_sourcedir}/python-accel.list
 %defattr(-,root,root)
diff --git a/packaging/qemu-accel.spec.in b/packaging/qemu-accel.spec.in
index 4044bb6..a64dc7a 100644
--- a/packaging/qemu-accel.spec.in
+++ b/packaging/qemu-accel.spec.in
@@ -286,7 +286,9 @@ echo "${i686_libdir}/${cross_ld_symlink}" >> %{_sourcedir}/multilib-accel.list
 
 # create symlinks for libgcc-32bit
 # libgcc-32bit library is placed under ${gcc_install_dir}32/ not just /lib for 32bit
-for f in $(rpm -ql libgcc-32bit)
+# Process lib*.so files only, we expect that licenses are already in the
+# multilib-accel.list.
+for f in $(rpm -ql libgcc-32bit | grep "\/lib[^\/]*\.so.*")
 do
   filename=$(basename $f)
   ln -sf %{emul_path}/$f %{buildroot}${i686_libdir}/${filename}
@@ -296,20 +298,17 @@ done
 
 # create symlinks for bash
 ln -s usr/bin "${buildroot_emul_path}/bin"
-echo '%{our_path}/bin' >> %{_sourcedir}/all-accel.list
 ln -sf bash "${buildroot_emul_path}%{_bindir}/sh"
 echo '%{emul_path}%{_bindir}/sh' >> %{_sourcedir}/all-accel.list
 
 mv ${buildroot_emul_path}/%{_lib}/* ${buildroot_emul_path}%{_libdir}/
 rm -rf ${buildroot_emul_path}/%{_lib}
 ln -sf usr/%{_lib} ${buildroot_emul_path}/%{_lib}
-echo '%{emul_path}/%{_lib}' >> %{_sourcedir}/all-accel.list
 %{?multilib:
 mv ${buildroot_emul_path}/lib/* ${buildroot_emul_path}%{_prefix}/lib/
 rm -rf ${buildroot_emul_path}/lib
 ln -sf usr/lib ${buildroot_emul_path}/lib
 sed -e 's|%{emul_path}/lib|%{emul_path}/usr/lib|' -i %{_sourcedir}/multilib-accel.list
-echo '%{emul_path}/usr/lib' >> %{_sourcedir}/multilib-accel.list
 }
 
 # rename binutils binaries
@@ -413,6 +412,7 @@ echo "%{emul_path}${gcc_build_dir}/gcc/xg++" >> %{_sourcedir}/all-accel.list
 
 # support /lib/cpp
 ln -sf %{emul_path}%{_bindir}/cpp ${buildroot_emul_path}/usr/lib/cpp
+echo '%{emul_path}/usr/lib/cpp' >> %{_sourcedir}/all-accel.list
 
 # generate baselibs.conf for current architecture to prevent rpm overwriting in download repo
 echo  %{cross}
@@ -465,11 +465,6 @@ sed -e 's|^|%{emul_path}|;s|%{emul_path}/%{_lib}|%{emul_path}%{_libdir}|' clang.
 # Remove common files from clang-accel
 comm -13 %{_sourcedir}/qemu-accel.list clang-full.list > %{_sourcedir}/clang-accel.list
 
-# Add symlinks to qemu-accel packaging
-echo '%{emul_path}/bin' >> %{_sourcedir}/qemu-accel.list
-echo '%{emul_path}/%{_lib}' >> %{_sourcedir}/qemu-accel.list
-%{?multilib:echo '%{emul_path}/lib' >> %{_sourcedir}/qemu-accel.list}
-
 %fdupes %{buildroot}
 %filter_provides_in %{emul_path}
 
@@ -488,6 +483,12 @@ ldconfig
 %files -f %{_sourcedir}/qemu-accel.list
 %defattr(-,root,root)
 %exclude %{emul_path}%{py_libdir}/*
+# Add symlinks to qemu-accel packaging
+%dir %{emul_path}/bin
+%dir %{emul_path}/%{_lib}
+%{?multilib:
+  %dir %{emul_path}/lib
+}
 
 %files -n python-accel -f %{_sourcedir}/python-accel.list
 %defattr(-,root,root)