[S] Remove dead block with host information checking

Block with grep command was never executed due to missed whitespace and
undefined HOST_ARCH, so parsing .(ro)data content was wasted. Moreover, when
this routine is enable - we have warnings for about 30% of total packages count.

Just drop it to speed up build.

Change-Id: I0706d247ff1eb40324555ed6c1c4400a6ea46511

diff --git a/packaging/qemu-accel-aarch64.spec b/packaging/qemu-accel-aarch64.spec
index 3df2138..621343d 100644 (file)
--- a/packaging/qemu-accel-aarch64.spec
+++ b/packaging/qemu-accel-aarch64.spec
@@ -236,17 +236,9 @@ function patch_binary {
   [[ -f $outfile ]] && echo "WARNING: File '${outfile}' exists, ignoring" && return
   mkdir -p ${outfile%/*}
   cp -aL $binary $outfile
-  objdump -s -j .rodata -j .data $outfile | sed 's/^ *\([a-z0-9]*\)/\1:/' | \
-      grep ': ' | grep -v 'file format' | grep -v 'Contents of section' | \
-      xxd -g4 -r - $outfile.data
-  if grep -q "%{HOST_ARCH}"$outfile.data; then
-    echo "ERROR file $binary leaks host information into the guest"
-    exit 1
-  fi
-  rm -f $outfile.data
   [ "$binary" == "$rtld" ] && return
   patchelf --set-rpath "%{emul_path}/%{_libdir}" $outfile
-# not all binaries have an .interp section
+  # not all binaries have an .interp section
   if patchelf --print-interpreter $outfile 1>/dev/null 2>/dev/null; then
     patchelf --set-interpreter %{emul_path}$rtld $outfile
   fi

diff --git a/packaging/qemu-accel-armv7hl.spec b/packaging/qemu-accel-armv7hl.spec
index 7f8e7db..0af6571 100644 (file)
--- a/packaging/qemu-accel-armv7hl.spec
+++ b/packaging/qemu-accel-armv7hl.spec
@@ -236,17 +236,9 @@ function patch_binary {
   [[ -f $outfile ]] && echo "WARNING: File '${outfile}' exists, ignoring" && return
   mkdir -p ${outfile%/*}
   cp -aL $binary $outfile
-  objdump -s -j .rodata -j .data $outfile | sed 's/^ *\([a-z0-9]*\)/\1:/' | \
-      grep ': ' | grep -v 'file format' | grep -v 'Contents of section' | \
-      xxd -g4 -r - $outfile.data
-  if grep -q "%{HOST_ARCH}"$outfile.data; then
-    echo "ERROR file $binary leaks host information into the guest"
-    exit 1
-  fi
-  rm -f $outfile.data
   [ "$binary" == "$rtld" ] && return
   patchelf --set-rpath "%{emul_path}/%{_libdir}" $outfile
-# not all binaries have an .interp section
+  # not all binaries have an .interp section
   if patchelf --print-interpreter $outfile 1>/dev/null 2>/dev/null; then
     patchelf --set-interpreter %{emul_path}$rtld $outfile
   fi

diff --git a/packaging/qemu-accel-armv7l.spec b/packaging/qemu-accel-armv7l.spec
index d40458d..70012d1 100644 (file)
--- a/packaging/qemu-accel-armv7l.spec
+++ b/packaging/qemu-accel-armv7l.spec
@@ -236,17 +236,9 @@ function patch_binary {
   [[ -f $outfile ]] && echo "WARNING: File '${outfile}' exists, ignoring" && return
   mkdir -p ${outfile%/*}
   cp -aL $binary $outfile
-  objdump -s -j .rodata -j .data $outfile | sed 's/^ *\([a-z0-9]*\)/\1:/' | \
-      grep ': ' | grep -v 'file format' | grep -v 'Contents of section' | \
-      xxd -g4 -r - $outfile.data
-  if grep -q "%{HOST_ARCH}"$outfile.data; then
-    echo "ERROR file $binary leaks host information into the guest"
-    exit 1
-  fi
-  rm -f $outfile.data
   [ "$binary" == "$rtld" ] && return
   patchelf --set-rpath "%{emul_path}/%{_libdir}" $outfile
-# not all binaries have an .interp section
+  # not all binaries have an .interp section
   if patchelf --print-interpreter $outfile 1>/dev/null 2>/dev/null; then
     patchelf --set-interpreter %{emul_path}$rtld $outfile
   fi

diff --git a/packaging/qemu-accel.spec.in b/packaging/qemu-accel.spec.in
index ff25752..e5fc9b8 100644 (file)
--- a/packaging/qemu-accel.spec.in
+++ b/packaging/qemu-accel.spec.in
@@ -233,17 +233,9 @@ function patch_binary {
   [[ -f $outfile ]] && echo "WARNING: File '${outfile}' exists, ignoring" && return
   mkdir -p ${outfile%/*}
   cp -aL $binary $outfile
-  objdump -s -j .rodata -j .data $outfile | sed 's/^ *\([a-z0-9]*\)/\1:/' | \
-      grep ': ' | grep -v 'file format' | grep -v 'Contents of section' | \
-      xxd -g4 -r - $outfile.data
-  if grep -q "%{HOST_ARCH}"$outfile.data; then
-    echo "ERROR file $binary leaks host information into the guest"
-    exit 1
-  fi
-  rm -f $outfile.data
   [ "$binary" == "$rtld" ] && return
   patchelf --set-rpath "%{emul_path}/%{_libdir}" $outfile
-# not all binaries have an .interp section
+  # not all binaries have an .interp section
   if patchelf --print-interpreter $outfile 1>/dev/null 2>/dev/null; then
     patchelf --set-interpreter %{emul_path}$rtld $outfile
   fi