diff options
author | Mikhail Kashkarov <m.kashkarov@partner.samsung.com> | 2019-08-30 20:10:05 +0300 |
---|---|---|
committer | Mikhail Kashkarov <m.kashkarov@partner.samsung.com> | 2019-09-05 13:50:59 +0300 |
commit | 493da2f83626b4b6bbf7eee43b85697e3a7d5ee3 (patch) | |
tree | 2cfb59749c28cca8b25de194186c8f6fb4d22af2 | |
parent | 8f0ee60217da3a2d0df589852eea03cdbfc3ec6e (diff) | |
download | qemu-accel-493da2f83626b4b6bbf7eee43b85697e3a7d5ee3.tar.gz qemu-accel-493da2f83626b4b6bbf7eee43b85697e3a7d5ee3.tar.bz2 qemu-accel-493da2f83626b4b6bbf7eee43b85697e3a7d5ee3.zip |
[W] Disable ton of warnings with double-listed files for python-accel
/usr/lib(64) listed in python-accel.list forces rpm to include all the
files under these directories even if not specified in list:
[ 76s] warning: File listed twice: /emul/usr/lib64/python2.7/BaseHTTPServer.py
[ 76s] warning: File listed twice: /emul/usr/lib64/python2.7/Bastion.py
...
1. Remove /usr/lib(64)/python2.7 directories from python.list
2. SCons directory was not explicitly added in python.list
Eliminate 392 more warnings.
Change-Id: Ie8ea5417fafd4ba7e414955a5896134659af961e
-rw-r--r-- | packaging/qemu-accel-aarch64.spec | 4 | ||||
-rw-r--r-- | packaging/qemu-accel-armv7hl.spec | 4 | ||||
-rw-r--r-- | packaging/qemu-accel-armv7l.spec | 4 | ||||
-rw-r--r-- | packaging/qemu-accel.spec.in | 4 |
4 files changed, 12 insertions, 4 deletions
diff --git a/packaging/qemu-accel-aarch64.spec b/packaging/qemu-accel-aarch64.spec index 06bac58..2327525 100644 --- a/packaging/qemu-accel-aarch64.spec +++ b/packaging/qemu-accel-aarch64.spec @@ -349,6 +349,7 @@ ln -s ${host_python} ${buildroot_emul_path}%{_libdir}/python #create symlinks for Scons mkdir -p ${buildroot_emul_path}%{libdir}/${host_python}/site-packages ln -sf %{libdir}/${host_python}/site-packages/SCons ${buildroot_emul_path}%{libdir}/${host_python}/site-packages/SCons +echo "%{libdir}/${host_python}/site-packages/SCons" >> python.list # rpmlint acceleration mkdir -p ${buildroot_emul_path}/opt/testing/bin @@ -371,7 +372,8 @@ mkdir -p ${buildroot_emul_path}%{_libdir}/${host_python}/encodings/ cp %{_libdir}/${host_python}/site-packages/rpm/*.py ${buildroot_emul_path}%{_libdir}/${host_python}/site-packages/rpm/ cp %{_libdir}/${host_python}/*.py ${buildroot_emul_path}%{_libdir}/${host_python}/ cp %{_libdir}/${host_python}/encodings/*.py ${buildroot_emul_path}%{_libdir}/${host_python}/encodings/ -find %{buildroot} -name 'python*' | sed -e "s|${buildroot_emul_path}||" | tee -a python.list +# Skip directories to not glob all inside them during #files processing +find %{buildroot} ! -type d -name 'python*' | sed -e "s|${buildroot_emul_path}||" | tee -a python.list # rename gcc binaries for bin in c++ g++ gcc gcc-${gcc_version} gfortran cpp gcc-ar gcc-nm gcc-ranlib gcov diff --git a/packaging/qemu-accel-armv7hl.spec b/packaging/qemu-accel-armv7hl.spec index 131e959..2326d57 100644 --- a/packaging/qemu-accel-armv7hl.spec +++ b/packaging/qemu-accel-armv7hl.spec @@ -349,6 +349,7 @@ ln -s ${host_python} ${buildroot_emul_path}%{_libdir}/python #create symlinks for Scons mkdir -p ${buildroot_emul_path}%{libdir}/${host_python}/site-packages ln -sf %{libdir}/${host_python}/site-packages/SCons ${buildroot_emul_path}%{libdir}/${host_python}/site-packages/SCons +echo "%{libdir}/${host_python}/site-packages/SCons" >> python.list # rpmlint acceleration mkdir -p ${buildroot_emul_path}/opt/testing/bin @@ -371,7 +372,8 @@ mkdir -p ${buildroot_emul_path}%{_libdir}/${host_python}/encodings/ cp %{_libdir}/${host_python}/site-packages/rpm/*.py ${buildroot_emul_path}%{_libdir}/${host_python}/site-packages/rpm/ cp %{_libdir}/${host_python}/*.py ${buildroot_emul_path}%{_libdir}/${host_python}/ cp %{_libdir}/${host_python}/encodings/*.py ${buildroot_emul_path}%{_libdir}/${host_python}/encodings/ -find %{buildroot} -name 'python*' | sed -e "s|${buildroot_emul_path}||" | tee -a python.list +# Skip directories to not glob all inside them during #files processing +find %{buildroot} ! -type d -name 'python*' | sed -e "s|${buildroot_emul_path}||" | tee -a python.list # rename gcc binaries for bin in c++ g++ gcc gcc-${gcc_version} gfortran cpp gcc-ar gcc-nm gcc-ranlib gcov diff --git a/packaging/qemu-accel-armv7l.spec b/packaging/qemu-accel-armv7l.spec index a156bb6..fa43670 100644 --- a/packaging/qemu-accel-armv7l.spec +++ b/packaging/qemu-accel-armv7l.spec @@ -349,6 +349,7 @@ ln -s ${host_python} ${buildroot_emul_path}%{_libdir}/python #create symlinks for Scons mkdir -p ${buildroot_emul_path}%{libdir}/${host_python}/site-packages ln -sf %{libdir}/${host_python}/site-packages/SCons ${buildroot_emul_path}%{libdir}/${host_python}/site-packages/SCons +echo "%{libdir}/${host_python}/site-packages/SCons" >> python.list # rpmlint acceleration mkdir -p ${buildroot_emul_path}/opt/testing/bin @@ -371,7 +372,8 @@ mkdir -p ${buildroot_emul_path}%{_libdir}/${host_python}/encodings/ cp %{_libdir}/${host_python}/site-packages/rpm/*.py ${buildroot_emul_path}%{_libdir}/${host_python}/site-packages/rpm/ cp %{_libdir}/${host_python}/*.py ${buildroot_emul_path}%{_libdir}/${host_python}/ cp %{_libdir}/${host_python}/encodings/*.py ${buildroot_emul_path}%{_libdir}/${host_python}/encodings/ -find %{buildroot} -name 'python*' | sed -e "s|${buildroot_emul_path}||" | tee -a python.list +# Skip directories to not glob all inside them during #files processing +find %{buildroot} ! -type d -name 'python*' | sed -e "s|${buildroot_emul_path}||" | tee -a python.list # rename gcc binaries for bin in c++ g++ gcc gcc-${gcc_version} gfortran cpp gcc-ar gcc-nm gcc-ranlib gcov diff --git a/packaging/qemu-accel.spec.in b/packaging/qemu-accel.spec.in index a64dc7a..d8ce343 100644 --- a/packaging/qemu-accel.spec.in +++ b/packaging/qemu-accel.spec.in @@ -346,6 +346,7 @@ ln -s ${host_python} ${buildroot_emul_path}%{_libdir}/python #create symlinks for Scons mkdir -p ${buildroot_emul_path}%{libdir}/${host_python}/site-packages ln -sf %{libdir}/${host_python}/site-packages/SCons ${buildroot_emul_path}%{libdir}/${host_python}/site-packages/SCons +echo "%{libdir}/${host_python}/site-packages/SCons" >> python.list # rpmlint acceleration mkdir -p ${buildroot_emul_path}/opt/testing/bin @@ -368,7 +369,8 @@ mkdir -p ${buildroot_emul_path}%{_libdir}/${host_python}/encodings/ cp %{_libdir}/${host_python}/site-packages/rpm/*.py ${buildroot_emul_path}%{_libdir}/${host_python}/site-packages/rpm/ cp %{_libdir}/${host_python}/*.py ${buildroot_emul_path}%{_libdir}/${host_python}/ cp %{_libdir}/${host_python}/encodings/*.py ${buildroot_emul_path}%{_libdir}/${host_python}/encodings/ -find %{buildroot} -name 'python*' | sed -e "s|${buildroot_emul_path}||" | tee -a python.list +# Skip directories to not glob all inside them during #files processing +find %{buildroot} ! -type d -name 'python*' | sed -e "s|${buildroot_emul_path}||" | tee -a python.list # rename gcc binaries for bin in c++ g++ gcc gcc-${gcc_version} gfortran cpp gcc-ar gcc-nm gcc-ranlib gcov |