sinjuginas/rpm-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s/egrep/grep -E/

Browse Source
This commit is contained in:
Дмитрий Левин 2022-04-26 08:00:00 +00:00
parent 61e11d51a2
commit 93297e9c33
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -665,9 +665,9 @@ AC_CHECK_FUNC(lchown,
AC_ARG_ENABLE([broken-chown], AC_ARG_ENABLE([broken-chown],
[ --enable-broken-chown this system's chown follows symbolic links], [ --enable-broken-chown this system's chown follows symbolic links],
result=$enableval, result=unknown) result=$enableval, result=unknown)
if echo "$build" | egrep "(aix)|(hpux)|(linux)" > /dev/null ; then if echo "$build" | grep -E "(aix)|(hpux)|(linux)" > /dev/null ; then
result=yes result=yes
elif echo "$build" | egrep "(nextstep)" > /dev/null ; then elif echo "$build" | grep -E "(nextstep)" > /dev/null ; then
result=no result=no
fi fi
if test $result = unknown; then if test $result = unknown; then

2
rpm-4_0.spec
View File

@ -281,7 +281,7 @@ if [ -s /lib/libc.so.6 -a -s /lib/libz.so.1 -a -s /lib/librt.so.1 -a -n "$(getco
fi > all-funcs fi > all-funcs
sed -r -n 's/^(.+)64(_.*|$)/\1\2/p' all-funcs | sed -r -n 's/^(.+)64(_.*|$)/\1\2/p' all-funcs |
sort -u | sort -u |
egrep -v '^(wcs|str)' | grep -E -v '^(wcs|str)' |
comm -12 - all-funcs | comm -12 - all-funcs |
LC_ALL=C sort -u \ LC_ALL=C sort -u \
> %buildroot%_rpmlibdir/verify-elf-non-lfs-funcs.list > %buildroot%_rpmlibdir/verify-elf-non-lfs-funcs.list

2
scripts/brp-debuginfo.in
View File

@ -97,7 +97,7 @@ if [ -s .tmp/no_debug_info ]; then
Warning "$howmuch non-stripped binaries don't contain .debug sections making -debuginfo" Warning "$howmuch non-stripped binaries don't contain .debug sections making -debuginfo"
Warning "package less relevant. An excerpt from the list of affected files follows:" Warning "package less relevant. An excerpt from the list of affected files follows:"
sed 's/^/ /; 10q' < .tmp/no_debug_info >&2 sed 's/^/ /; 10q' < .tmp/no_debug_info >&2
if egrep -q '/lib/modules/.*(/vmlinux|\.ko)$' .tmp/no_debug_info; then if grep -E -q '/lib/modules/.*(/vmlinux|\.ko)$' .tmp/no_debug_info; then
Warning "Please enable CONFIG_DEBUG_INFO=y in the kernel package!" Warning "Please enable CONFIG_DEBUG_INFO=y in the kernel package!"
fi fi
[ -z "$RPM_DEBUGINFO_STRIPPED_TERMINATE" ] \ [ -z "$RPM_DEBUGINFO_STRIPPED_TERMINATE" ] \

2
scripts/cpp.req.in
View File

@ -31,7 +31,7 @@ InitPackagedFiles()
PkgconfigCflags() PkgconfigCflags()
{ {
egrep "^$RPM_LIBDIR/pkgconfig/[^/]+[.]pc\$" $tmpdir/PF >$tmpdir/pc || [ $? = 1 ] grep -E "^$RPM_LIBDIR/pkgconfig/[^/]+[.]pc\$" $tmpdir/PF >$tmpdir/pc || [ $? = 1 ]
if [ -n "${RPM_BUILD_ROOT-}" ]; then if [ -n "${RPM_BUILD_ROOT-}" ]; then
# Process subpackage *.pc files before other *.pc files. # Process subpackage *.pc files before other *.pc files.
sed "s|^/|0 $RPM_BUILD_ROOT/|" <$tmpdir/pc >$tmpdir/PF-pc sed "s|^/|0 $RPM_BUILD_ROOT/|" <$tmpdir/pc >$tmpdir/PF-pc

4
scripts/lib.req.in
View File

@ -73,9 +73,9 @@ LibReq()
# GNU_HASH. # GNU_HASH.
if printf '%s\n' "$segments" | if printf '%s\n' "$segments" |
egrep -qs '[[:space:]]\.gnu\.hash([[:space:]]|$)' && grep -E -qs '[[:space:]]\.gnu\.hash([[:space:]]|$)' &&
! printf '%s\n' "$segments" | ! printf '%s\n' "$segments" |
egrep -qs '[[:space:]]\.hash([[:space:]]|$)'; then grep -E -qs '[[:space:]]\.hash([[:space:]]|$)'; then
echo 'rtld(GNU_HASH)' echo 'rtld(GNU_HASH)'
fi fi

2
scripts/shell.req.in
View File

@ -50,7 +50,7 @@ ShellReq()
# We are almost dead. The last chance to escape is to see # We are almost dead. The last chance to escape is to see
# if the shell is used only to re-exec another interpreter, e.g. # if the shell is used only to re-exec another interpreter, e.g.
# exec tclsh "$0" "$@" # exec tclsh "$0" "$@"
if line1=$(egrep -m1 -v '^[[:space:]]*(#|$)' "$f"); then if line1=$(grep -E -m1 -v '^[[:space:]]*(#|$)' "$f"); then
set -- $line1 set -- $line1
if [ $# -gt 1 ] && [ "$1" = exec ]; then if [ $# -gt 1 ] && [ "$1" = exec ]; then
Info "$f is $2 script!" Info "$f is $2 script!"