Remove egrep from the list of binaries to patch

With grep 2.19, egrep is no longer a binary but a shell script.
So it doesn't need to be patched using patchelf (and furthermore it
must be removed from the binaries list, otherwise it makes the
build fail).

Bug-Tizen: TC-2375
Bug-Tizen: TC-1828/related

Change-Id: I51019421bfe8b32b82b58bd8f7fcb121297ef66c
Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>

diff --git a/packaging/qemu-accel-aarch64.spec b/packaging/qemu-accel-aarch64.spec
index ba22ae7..62c294f 100644 (file)
--- a/packaging/qemu-accel-aarch64.spec
+++ b/packaging/qemu-accel-aarch64.spec
@@ -136,7 +136,7 @@ for executable in \
    /usr/bin/{tar,gzip,bzip2,xz,xzdec} \
 %endif # use_cross_archivators
 %if 0%{?use_cross_stream_editors}
-   /usr/bin/{grep,egrep,sed} \
+   /usr/bin/{grep,sed} \
 %endif # use_cross_stream_editors
 %if 0%{use_cross_nss}
 %ifarch %ix86

diff --git a/packaging/qemu-accel-armv7el.spec b/packaging/qemu-accel-armv7el.spec
index 1482e00..96a8e46 100644 (file)
--- a/packaging/qemu-accel-armv7el.spec
+++ b/packaging/qemu-accel-armv7el.spec
@@ -81,14 +81,14 @@ binaries="/%_lib/libnsl.so.1 /%_lib/libnss_compat.so.2" # loaded via dlopen by g
 #     /opt/testing/bin/python: error while loading shared libraries: libpython2.7.so.1.0: wrong ELF class: ELFCLASS32
 
 for executable in $LD \
-   /bin/{bash,grep,egrep,gzip,sed,tar,rpm} \
+   /bin/{bash,grep,gzip,sed,tar,rpm} \
    /usr/lib64/libnssdbm3.so /usr/lib64/libsoftokn3.so /lib64/libfreebl3.so \
    /usr/bin/{bzip2,cat,expr,make,m4,mkdir,msgexec,msgfmt,msgcat,msgmerge,mv,patch,rm,rmdir,rpmbuild,xz,xzdec} \
 %if %use_icecream
    /usr/sbin/iceccd /usr/bin/icecc /usr/bin/schroot \
 %endif
    /usr/arm-tizen-linux-gnueabi/bin/{as,ar,ld,ld.bfd,objcopy,objdump}
-do  
+do
   binaries="$binaries $executable `ldd $executable | sed -n 's,.*=> \(/[^ ]*\) .*,\1,p'`"
 done
 
@@ -120,11 +120,11 @@ mkdir -p %buildroot/%_lib/security
 # as soon as we have lib64 in arm, we're doomed :)
 cp /lib64/security/pam_permit.so %buildroot/%_lib/security
 mkdir -p %buildroot/etc/pam.d/
-for i in auth session account password session; do 
+for i in auth session account password session; do
   echo "$i    optional  pam_permit.so" >> %buildroot/etc/pam.d/schroot
 done
 
-# Install 
+# Install
 mkdir -p %buildroot/usr/share/icecream-envs/%{icecream_cross_env}
 pushd %buildroot/usr/share/icecream-envs/%{icecream_cross_env}
 tar xvf /usr/share/icecream-envs/%{icecream_cross_env}.tar.gz
@@ -139,15 +139,15 @@ echo "#export ICECC_DEBUG=debug"           >> %{buildroot}/etc/profile.d/icecrea
 echo 'export PATH=/opt/icecream/bin:$PATH' >> %{buildroot}/etc/profile.d/icecream.sh
 
 mkdir -p %{buildroot}/etc/schroot
-( 
-echo "[cross]" 
-echo "directory=/usr/share/icecream-envs/%{icecream_cross_env}" 
+(
+echo "[cross]"
+echo "directory=/usr/share/icecream-envs/%{icecream_cross_env}"
 echo "users=abuild"
 ) > %{buildroot}/etc/schroot/schroot.conf
 %endif
 
 %if %hijack_gcc
-# Install 
+# Install
 mkdir -p %buildroot%{our_path}/usr/share/icecream-envs/%{icecream_cross_env}
 cp -a /usr/share/icecream-envs/%{icecream_cross_env}.tar.gz \
       %buildroot%{our_path}/usr/share/icecream-envs
@@ -320,7 +320,7 @@ if [ -e /proc/sys/fs/binfmt_misc/arm ]; then
     builtin echo ':arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/qemu/qemu-arm-binfmt:P' > /proc/sys/fs/binfmt_misc/register
 fi
 
-if [ $did_mount_it ]; then 
+if [ $did_mount_it ]; then
   builtin echo "Unmounting again.";
   umount /proc/sys/fs/binfmt_misc
 fi
@@ -332,7 +332,7 @@ rm -rf /usr/armv7el-tizen-linux-gnueabi/lib
 ln -s /lib /usr/armv7el-tizen-linux-gnueabi/lib
 
 %files
-%defattr(-,root,root)  
+%defattr(-,root,root)
 %if %use_icecream
 /etc/profile.d
 /etc/pam.d

diff --git a/packaging/qemu-accel-armv7hl.spec b/packaging/qemu-accel-armv7hl.spec
index 25d5e62..e89d854 100644 (file)
--- a/packaging/qemu-accel-armv7hl.spec
+++ b/packaging/qemu-accel-armv7hl.spec
@@ -77,11 +77,11 @@ binaries="/%_lib/libnsl.so.1 /%_lib/libnss_compat.so.2 %{_libdir}/rpm-plugins/ms
 
 for executable in $LD \
    /usr/bin/{bash,rpm,rpmdb} \
-   /usr/bin/{gzip,grep,egrep,sed,tar} \
+   /usr/bin/{gzip,grep,sed,tar} \
    /usr/lib64/libnssdbm3.so /usr/lib64/libsoftokn3.so /lib64/libfreebl3.so \
    /usr/bin/{bzip2,cat,expr,make,m4,mkdir,msgexec,msgfmt,msgcat,msgmerge,mv,patch,rm,rmdir,rpmbuild,xz,xzdec} \
    /usr/arm-tizen-linux-gnueabi/bin/{as,ar,ld,ld.bfd,objcopy,objdump}
-do  
+do
   binaries="$binaries $executable `ldd $executable | sed -n 's,.*=> \(/[^ ]*\) .*,\1,p'`"
 done
 
@@ -97,7 +97,7 @@ done
 
 
 %if %hijack_gcc
-# Install 
+# Install
 mkdir -p %buildroot%{our_path}/usr/share/icecream-envs/%{icecream_cross_env}
 cp -a /usr/share/icecream-envs/%{icecream_cross_env}.tar.gz \
       %buildroot%{our_path}/usr/share/icecream-envs
@@ -265,7 +265,7 @@ if [ -e /proc/sys/fs/binfmt_misc/arm ]; then
     builtin echo ':arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/qemu/qemu-arm-binfmt:P' > /proc/sys/fs/binfmt_misc/register
 fi
 
-if [ $did_mount_it ]; then 
+if [ $did_mount_it ]; then
   builtin echo "Unmounting again.";
   umount /proc/sys/fs/binfmt_misc
 fi
@@ -277,7 +277,7 @@ rm -rf /usr/armv7hl-tizen-linux-gnueabi/lib
 ln -s /lib /usr/armv7hl-tizen-linux-gnueabi/usr/lib
 
 %files
-%defattr(-,root,root)  
+%defattr(-,root,root)
 %dir /usr/armv7hl-tizen-linux-gnueabi
 /usr/armv7hl-tizen-linux-gnueabi/usr
 /emul

diff --git a/packaging/qemu-accel-armv7l.spec b/packaging/qemu-accel-armv7l.spec
index e05f6b7..23fff95 100644 (file)
--- a/packaging/qemu-accel-armv7l.spec
+++ b/packaging/qemu-accel-armv7l.spec
@@ -90,7 +90,7 @@ binaries="/%_lib/libnsl.so.1 /%_lib/libnss_compat.so.2 %{_libdir}/rpm-plugins/ms
 
 for executable in $LD \
    /usr/bin/{bash,rpm,rpmdb} \
-   /usr/bin/{gzip,grep,egrep,sed,tar} \
+   /usr/bin/{gzip,grep,sed,tar} \
 %ifarch %ix86
    /usr/lib/libnssdbm3.so /usr/lib/libsoftokn3.so /lib/libfreebl3.so \
 %else
@@ -98,7 +98,7 @@ for executable in $LD \
 %endif
    /usr/bin/{bzip2,cat,expr,make,m4,mkdir,msgexec,msgfmt,msgcat,msgmerge,mv,patch,rm,rmdir,rpmbuild,xz,xzdec} \
    /usr/arm-tizen-linux-gnueabi/bin/{as,ar,ld,ld.bfd,objcopy,objdump}
-do  
+do
   binaries="$binaries $executable `ldd $executable | sed -n 's,.*=> \(/[^ ]*\) .*,\1,p'`"
 done
 
@@ -114,7 +114,7 @@ done
 
 
 %if %hijack_gcc
-# Install 
+# Install
 mkdir -p %buildroot%{our_path}/usr/share/icecream-envs/%{icecream_cross_env}
 cp -a /usr/share/icecream-envs/%{icecream_cross_env}.tar.gz \
       %buildroot%{our_path}/usr/share/icecream-envs

diff --git a/packaging/qemu-accel.spec b/packaging/qemu-accel.spec
index e07a39d..71a5afc 100644 (file)
--- a/packaging/qemu-accel.spec
+++ b/packaging/qemu-accel.spec
@@ -59,7 +59,7 @@ binaries="/%_lib/libnsl.so.1 /%_lib/libnss_compat.so.2" # loaded via dlopen by g
 
 for executable in $LD \
    /usr/bin/{bash,rpm} \
-   /usr/bin/{gzip,grep,egrep,sed,tar} \
+   /usr/bin/{gzip,grep,sed,tar} \
    /usr/lib64/libnssdbm3.so /usr/lib64/libsoftokn3.so /usr/lib64/libfreebl3.so \
    /usr/bin/{bzip2,cat,expr,make,m4,mkdir,msgexec,msgfmt,msgcat,msgmerge,mv,patch,rm,rmdir,rpmbuild,xz,xzdec} \
    /usr/arm-tizen-linux-gnueabi/bin/{as,ar,ld,ld.bfd,objcopy,objdump}