rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

stop using the obsolete forms of grep shortcuts.

This commit is contained in:
Dave Jones 2010-10-26 13:49:21 -04:00 committed by Kyle McMartin
parent d555d677e1
commit b89c80f6e2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel.spec
View File

@ -917,7 +917,7 @@ ApplyPatch()
exit 1 exit 1
fi fi
%if !%{using_upstream_branch} %if !%{using_upstream_branch}
if ! egrep "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME%%%%%{?variant}}.spec ; then if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME%%%%%{?variant}}.spec ; then
if [ "${patch:0:10}" != "patch-2.6." ] ; then if [ "${patch:0:10}" != "patch-2.6." ] ; then
echo "ERROR: Patch $patch not listed as a source patch in specfile" echo "ERROR: Patch $patch not listed as a source patch in specfile"
exit 1 exit 1
@ -1324,7 +1324,7 @@ for i in *.config
do do
mv $i .config mv $i .config
Arch=`head -1 .config | cut -b 3-` Arch=`head -1 .config | cut -b 3-`
make ARCH=$Arch listnewconfig | egrep '^CONFIG_' >.newoptions || true make ARCH=$Arch listnewconfig | grep -E '^CONFIG_' >.newoptions || true
%if %{listnewconfig_fail} %if %{listnewconfig_fail}
if [ -s .newoptions ]; then if [ -s .newoptions ]; then
cat .newoptions cat .newoptions
@ -1521,7 +1521,7 @@ BuildKernel() {
# Generate a list of modules for block and networking. # Generate a list of modules for block and networking.
fgrep /drivers/ modnames | xargs --no-run-if-empty nm -upA | grep -F /drivers/ modnames | xargs --no-run-if-empty nm -upA |
sed -n 's,^.*/\([^/]*\.ko\): *U \(.*\)$,\1 \2,p' > drivers.undef sed -n 's,^.*/\([^/]*\.ko\): *U \(.*\)$,\1 \2,p' > drivers.undef
collect_modules_list() collect_modules_list()
@ -1547,7 +1547,7 @@ BuildKernel() {
/sbin/modinfo -l $i >> modinfo /sbin/modinfo -l $i >> modinfo
done < modnames done < modnames
egrep -v \ grep -E -v \
'GPL( v2)?$|Dual BSD/GPL$|Dual MPL/GPL$|GPL and additional rights$' \ 'GPL( v2)?$|Dual BSD/GPL$|Dual MPL/GPL$|GPL and additional rights$' \
modinfo && exit 1 modinfo && exit 1