[5/7] Remove redundant '/' before ${our_path} variable

${our_path} already has leading '/'.
(%define our_path /emul)

Change-Id: If365a4951bf3f64ba6fefcb128f196d519f10ff3

4 files changed, 20 insertions, 20 deletions

diff --git a/packaging/qemu-accel-aarch64.spec b/packaging/qemu-accel-aarch64.spec
index 779b5a5..027ae19 100644
--- a/packaging/qemu-accel-aarch64.spec
+++ b/packaging/qemu-accel-aarch64.spec
@@ -228,7 +228,7 @@ function patch_binary {
   local filetype=`file --brief $binary`
   [[ x"$filetype" == x"POSIX shell script"* ]] && return
 
-  local outfile=%{buildroot}/%{our_path}/$binary
+  local outfile=%{buildroot}%{our_path}$binary
   [[ ! -e $binary ]] && echo "WARNING: File '${binary}' not found, ignoring" && return
   [[ -f $outfile ]] && echo "WARNING: File '${outfile}' exists, ignoring" && return
   mkdir -p ${outfile%/*}
@@ -266,8 +266,8 @@ for f in $(rpm -ql glibc-32bit) \
   $(rpm -ql libgcc-32bit)
 do
  fdir=$(dirname $f)
- [ ! -d %{buildroot}/%{our_path}/$fdir ] && mkdir -p %{buildroot}/%{our_path}/$fdir
- cp -a $f %{buildroot}/%{our_path}/$f
+ [ ! -d %{buildroot}%{our_path}/$fdir ] && mkdir -p %{buildroot}%{our_path}/$fdir
+ cp -a $f %{buildroot}%{our_path}/$f
  echo "%{our_path}$f" >> %{_sourcedir}/multilib-accel.list
 done
 
@@ -320,7 +320,7 @@ do
   echo "%{our_path}%{_bindir}/$binary" >> %{_sourcedir}/all-accel.list
 done
 
-mkdir -p %{buildroot}/%{our_path}/%{_prefix}/%{target_arch}/bin
+mkdir -p %{buildroot}%{our_path}/%{_prefix}/%{target_arch}/bin
 for binary in ar as ld{,.bfd,.gold} nm obj{copy,dump} ranlib strip; do
   ln -sf %{our_path}%{_bindir}/$binary %{buildroot}%{our_path}%{_prefix}/%{target_arch}/bin/$binary
   echo "%{our_path}%{_bindir}/$binary" >> %{_sourcedir}/all-accel.list
@@ -374,7 +374,7 @@ find %{buildroot} -name 'python*' | sed -e 's|%{buildroot}%{our_path}||' | tee -
 # rename gcc binaries
 for bin in c++ g++ gcc gfortran cpp gcc-ar gcc-nm gcc-ranlib
 do
-  mv %{buildroot}%{our_path}%{_bindir}/%{target_arch}-$bin %{buildroot}/%{our_path}%{_bindir}/$bin
+  mv %{buildroot}%{our_path}%{_bindir}/%{target_arch}-$bin %{buildroot}%{our_path}%{_bindir}/$bin
   ln -s $bin %{buildroot}%{our_path}%{_bindir}/%{target_arch}-$bin
   echo "%{our_path}%{_bindir}/$bin" >> %{_sourcedir}/all-accel.list
 done
diff --git a/packaging/qemu-accel-armv7hl.spec b/packaging/qemu-accel-armv7hl.spec
index 22d0300..6fb378e 100644
--- a/packaging/qemu-accel-armv7hl.spec
+++ b/packaging/qemu-accel-armv7hl.spec
@@ -228,7 +228,7 @@ function patch_binary {
   local filetype=`file --brief $binary`
   [[ x"$filetype" == x"POSIX shell script"* ]] && return
 
-  local outfile=%{buildroot}/%{our_path}/$binary
+  local outfile=%{buildroot}%{our_path}$binary
   [[ ! -e $binary ]] && echo "WARNING: File '${binary}' not found, ignoring" && return
   [[ -f $outfile ]] && echo "WARNING: File '${outfile}' exists, ignoring" && return
   mkdir -p ${outfile%/*}
@@ -266,8 +266,8 @@ for f in $(rpm -ql glibc-32bit) \
   $(rpm -ql libgcc-32bit)
 do
  fdir=$(dirname $f)
- [ ! -d %{buildroot}/%{our_path}/$fdir ] && mkdir -p %{buildroot}/%{our_path}/$fdir
- cp -a $f %{buildroot}/%{our_path}/$f
+ [ ! -d %{buildroot}%{our_path}/$fdir ] && mkdir -p %{buildroot}%{our_path}/$fdir
+ cp -a $f %{buildroot}%{our_path}/$f
  echo "%{our_path}$f" >> %{_sourcedir}/multilib-accel.list
 done
 
@@ -320,7 +320,7 @@ do
   echo "%{our_path}%{_bindir}/$binary" >> %{_sourcedir}/all-accel.list
 done
 
-mkdir -p %{buildroot}/%{our_path}/%{_prefix}/%{target_arch}/bin
+mkdir -p %{buildroot}%{our_path}/%{_prefix}/%{target_arch}/bin
 for binary in ar as ld{,.bfd,.gold} nm obj{copy,dump} ranlib strip; do
   ln -sf %{our_path}%{_bindir}/$binary %{buildroot}%{our_path}%{_prefix}/%{target_arch}/bin/$binary
   echo "%{our_path}%{_bindir}/$binary" >> %{_sourcedir}/all-accel.list
@@ -374,7 +374,7 @@ find %{buildroot} -name 'python*' | sed -e 's|%{buildroot}%{our_path}||' | tee -
 # rename gcc binaries
 for bin in c++ g++ gcc gfortran cpp gcc-ar gcc-nm gcc-ranlib
 do
-  mv %{buildroot}%{our_path}%{_bindir}/%{target_arch}-$bin %{buildroot}/%{our_path}%{_bindir}/$bin
+  mv %{buildroot}%{our_path}%{_bindir}/%{target_arch}-$bin %{buildroot}%{our_path}%{_bindir}/$bin
   ln -s $bin %{buildroot}%{our_path}%{_bindir}/%{target_arch}-$bin
   echo "%{our_path}%{_bindir}/$bin" >> %{_sourcedir}/all-accel.list
 done
diff --git a/packaging/qemu-accel-armv7l.spec b/packaging/qemu-accel-armv7l.spec
index a02abd9..e82e3a2 100644
--- a/packaging/qemu-accel-armv7l.spec
+++ b/packaging/qemu-accel-armv7l.spec
@@ -228,7 +228,7 @@ function patch_binary {
   local filetype=`file --brief $binary`
   [[ x"$filetype" == x"POSIX shell script"* ]] && return
 
-  local outfile=%{buildroot}/%{our_path}/$binary
+  local outfile=%{buildroot}%{our_path}$binary
   [[ ! -e $binary ]] && echo "WARNING: File '${binary}' not found, ignoring" && return
   [[ -f $outfile ]] && echo "WARNING: File '${outfile}' exists, ignoring" && return
   mkdir -p ${outfile%/*}
@@ -266,8 +266,8 @@ for f in $(rpm -ql glibc-32bit) \
   $(rpm -ql libgcc-32bit)
 do
  fdir=$(dirname $f)
- [ ! -d %{buildroot}/%{our_path}/$fdir ] && mkdir -p %{buildroot}/%{our_path}/$fdir
- cp -a $f %{buildroot}/%{our_path}/$f
+ [ ! -d %{buildroot}%{our_path}/$fdir ] && mkdir -p %{buildroot}%{our_path}/$fdir
+ cp -a $f %{buildroot}%{our_path}/$f
  echo "%{our_path}$f" >> %{_sourcedir}/multilib-accel.list
 done
 
@@ -320,7 +320,7 @@ do
   echo "%{our_path}%{_bindir}/$binary" >> %{_sourcedir}/all-accel.list
 done
 
-mkdir -p %{buildroot}/%{our_path}/%{_prefix}/%{target_arch}/bin
+mkdir -p %{buildroot}%{our_path}/%{_prefix}/%{target_arch}/bin
 for binary in ar as ld{,.bfd,.gold} nm obj{copy,dump} ranlib strip; do
   ln -sf %{our_path}%{_bindir}/$binary %{buildroot}%{our_path}%{_prefix}/%{target_arch}/bin/$binary
   echo "%{our_path}%{_bindir}/$binary" >> %{_sourcedir}/all-accel.list
@@ -374,7 +374,7 @@ find %{buildroot} -name 'python*' | sed -e 's|%{buildroot}%{our_path}||' | tee -
 # rename gcc binaries
 for bin in c++ g++ gcc gfortran cpp gcc-ar gcc-nm gcc-ranlib
 do
-  mv %{buildroot}%{our_path}%{_bindir}/%{target_arch}-$bin %{buildroot}/%{our_path}%{_bindir}/$bin
+  mv %{buildroot}%{our_path}%{_bindir}/%{target_arch}-$bin %{buildroot}%{our_path}%{_bindir}/$bin
   ln -s $bin %{buildroot}%{our_path}%{_bindir}/%{target_arch}-$bin
   echo "%{our_path}%{_bindir}/$bin" >> %{_sourcedir}/all-accel.list
 done
diff --git a/packaging/qemu-accel.spec.in b/packaging/qemu-accel.spec.in
index 26b0b63..6c62f6e 100644
--- a/packaging/qemu-accel.spec.in
+++ b/packaging/qemu-accel.spec.in
@@ -225,7 +225,7 @@ function patch_binary {
   local filetype=`file --brief $binary`
   [[ x"$filetype" == x"POSIX shell script"* ]] && return
 
-  local outfile=%{buildroot}/%{our_path}/$binary
+  local outfile=%{buildroot}%{our_path}$binary
   [[ ! -e $binary ]] && echo "WARNING: File '${binary}' not found, ignoring" && return
   [[ -f $outfile ]] && echo "WARNING: File '${outfile}' exists, ignoring" && return
   mkdir -p ${outfile%/*}
@@ -263,8 +263,8 @@ for f in $(rpm -ql glibc-32bit) \
   $(rpm -ql libgcc-32bit)
 do
  fdir=$(dirname $f)
- [ ! -d %{buildroot}/%{our_path}/$fdir ] && mkdir -p %{buildroot}/%{our_path}/$fdir
- cp -a $f %{buildroot}/%{our_path}/$f
+ [ ! -d %{buildroot}%{our_path}/$fdir ] && mkdir -p %{buildroot}%{our_path}/$fdir
+ cp -a $f %{buildroot}%{our_path}/$f
  echo "%{our_path}$f" >> %{_sourcedir}/multilib-accel.list
 done
 
@@ -317,7 +317,7 @@ do
   echo "%{our_path}%{_bindir}/$binary" >> %{_sourcedir}/all-accel.list
 done
 
-mkdir -p %{buildroot}/%{our_path}/%{_prefix}/%{target_arch}/bin
+mkdir -p %{buildroot}%{our_path}/%{_prefix}/%{target_arch}/bin
 for binary in ar as ld{,.bfd,.gold} nm obj{copy,dump} ranlib strip; do
   ln -sf %{our_path}%{_bindir}/$binary %{buildroot}%{our_path}%{_prefix}/%{target_arch}/bin/$binary
   echo "%{our_path}%{_bindir}/$binary" >> %{_sourcedir}/all-accel.list
@@ -371,7 +371,7 @@ find %{buildroot} -name 'python*' | sed -e 's|%{buildroot}%{our_path}||' | tee -
 # rename gcc binaries
 for bin in c++ g++ gcc gfortran cpp gcc-ar gcc-nm gcc-ranlib
 do
-  mv %{buildroot}%{our_path}%{_bindir}/%{target_arch}-$bin %{buildroot}/%{our_path}%{_bindir}/$bin
+  mv %{buildroot}%{our_path}%{_bindir}/%{target_arch}-$bin %{buildroot}%{our_path}%{_bindir}/$bin
   ln -s $bin %{buildroot}%{our_path}%{_bindir}/%{target_arch}-$bin
   echo "%{our_path}%{_bindir}/$bin" >> %{_sourcedir}/all-accel.list
 done