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

minor code cleanups

Browse Source
This commit is contained in:
Дмитрий Левин 2003-04-22 13:48:31 +00:00
parent 74bc2bed73
commit bce1c8a40e
2 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
autodeps/linux.prov.in
View File

@ -1,10 +1,11 @@
#!/bin/sh -ef
#
# Copyright (C) 2000-2003 Dmitry V. Levin <ldv@altlinux.org>
# $Id$
#
# find-provides - generate list of linux-specific package provides.
# Inspired by tool with same name from RPM distribution.
#
# Copyright (C) 2000,2001,2002 Dmitry V. Levin <ldv@altlinux.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
@ -79,7 +80,7 @@ ParseMethod $RPM_FINDPROV_METHOD
if [ -z "$FIND_LIBS" -a -z "$FIND_PAM" -a -z "$FIND_PERL" ]; then
# Nothing to do
cat &>/dev/null
cat >/dev/null 2>&1
exit 0
fi
@ -99,8 +100,9 @@ LIST_PERL=
ListScriptProvs()
{
local f="$1"
local t="$2"
local f t
f="$1"
t="$2"
if [ -z "${t##ASCII *text*}" -a -z "${f%%$RPM_BUILD_ROOT/etc/pam.d/*}" ]; then
if [ -n "$FIND_PAM" ]; then
local r
@ -118,12 +120,12 @@ $f"
FindPerlProvs()
{
if [ -n "$LIST_PERL" ]; then
local r
r="$(echo "$LIST_PERL" |@RPMCONFIGDIR@/perl.prov)" || return 1
[ -z "$FOUND_PROVS" ] && FOUND_PROVS="$r" || FOUND_PROVS="$FOUND_PROVS
[ -n "$LIST_PERL" ] || return 0
local r
r="$(echo "$LIST_PERL" |@RPMCONFIGDIR@/perl.prov)" || return 1
[ -z "$FOUND_PROVS" ] && FOUND_PROVS="$r" || FOUND_PROVS="$FOUND_PROVS
$r"
fi
}
# Note this works for both a.out and ELF executables.
@ -132,8 +134,10 @@ $r"
FindLibProvs()
{
[ -n "$FIND_LIBS" ] || return 0
local f="$1"
local d
local f d
f="$1"
if d="$(objdump -p "$f")"; then
local soname
soname="$(echo -E "$d" |awk '/SONAME/ {print $2}')" || return 1
@ -190,4 +194,4 @@ done
FindPerlProvs
# Finally sort and print them.
echo "$FOUND_PROVS" |sort -u
echo "$FOUND_PROVS" |LC_COLLATE=C sort -u

39
autodeps/linux.req.in
View File

@ -3,7 +3,7 @@
# find-requires - generate list of linux-specific package requires.
# Inspired by tool with same name from RPM distribution.
#
# Copyright (C) 2000,2001,2002 Dmitry V. Levin <ldv@altlinux.org>
# Copyright (C) 2000-2003 Dmitry V. Levin <ldv@altlinux.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -22,15 +22,15 @@
PROG="${0##*/}"
Exit()
exit_handler()
{
RETVAL=$?
trap '' EXIT
cat &>/dev/null
exit $RETVAL
local rc=$?
trap - EXIT
cat >/dev/null 2>&1
exit $rc
}
trap "Exit " EXIT
trap exit_handler EXIT
# If using normal root, avoid changing anything.
if [ -z "$(echo "$RPM_BUILD_ROOT" |tr -d ' /.')" ]; then
@ -151,11 +151,13 @@ LIST_PERL=
ListScriptReqs()
{
[ -n "$FIND_SCRIPT" ] || return 0
local f="$1"
local t="$2"
local f t
f="$1"
t="$2"
if [ -x "$f" ]; then
local r
r="$(FindPackage "$f" "$(head -1 "$f" |sed -n 's|^#![ ]*\(/[^ ]\+\).*|\1|p')")" || return 1
r="$(FindPackage "$f" "$(head -1 "$f" |sed -n 's|^#![[:space:]]*\(/[^[:space:]]\+\).*|\1|p')")" || return 1
[ -z "$FOUND_REQS" ] && FOUND_REQS="$r" || FOUND_REQS="$FOUND_REQS
$r"
fi
@ -183,12 +185,12 @@ $f"
FindPerlReqs()
{
if [ -n "$LIST_PERL" ]; then
local r
r="$(echo "$LIST_PERL" |@RPMCONFIGDIR@/perl.req)" || return 1
[ -z "$FOUND_REQS" ] && FOUND_REQS="$r" || FOUND_REQS="$FOUND_REQS
[ -n "$LIST_PERL" ] || return 0
local r
r="$(echo "$LIST_PERL" |@RPMCONFIGDIR@/perl.req)" || return 1
[ -z "$FOUND_REQS" ] && FOUND_REQS="$r" || FOUND_REQS="$FOUND_REQS
$r"
fi
}
# Note this works for both a.out and ELF executables.
@ -197,8 +199,9 @@ $r"
FindLibReqs()
{
[ -n "$FIND_LIBS" ] || return 0
local f="$1"
local d
local f d
f="$1"
if d="$(objdump -p "$f")"; then
# Shared library dependencies, glibc version references.
@ -285,4 +288,4 @@ done
FindPerlReqs
# Finally sort and print them.
echo "$FOUND_REQS" |sort -u
echo "$FOUND_REQS" |LC_COLLATE=C sort -u