From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Tue, 31 Aug 2010 12:18:00 +0400 From: "Alexey I. Froloff" To: ALT Devel discussion list Message-ID: <20100831081800.GA17966@altlinux.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="QKdGvSO+nmPlgiQ/" Content-Disposition: inline User-Agent: Mutt/1.5.20 (2010-08-04) Subject: [devel] =?koi8-r?b?STogW1NPTFZFRF0gYXJlcG8gySBnbGliYy1sb2NhbGVz?= X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux Team development discussions List-Id: ALT Linux Team development discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Aug 2010 08:18:01 -0000 Archived-At: List-Archive: List-Post: --QKdGvSO+nmPlgiQ/ Content-Type: multipart/mixed; boundary="7JfCtLOvnd9MIVvH" Content-Disposition: inline --7JfCtLOvnd9MIVvH Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable =F1 =CE=C1=DB=A3=CC =C2=C1=C7=D5 =D7 arepo, =CB=CF=D4=CF=D2=C1=D1 =CE=C5 = =C4=C1=D7=C1=CC=C1 =D0=C5=D2=C5=D3=CF=C2=D2=C1=D4=D8 glibc-locales (=C9 =C4=D2=D5=C7=C9=C5 =D0=C1=CB=C5=D4=D9 =D3 =C2=CF=CC=D8=DB=C9=CD =D0=CF= =CC=C9=DE=C5=D3=D4=D7=CF=CD =C6=C1=CA=CC=CF=D7). =F0=D2=CF=C2=CC=C5=CD=C1 =D7 =D3=C1=CD=CF=C4=C5=D1=D4=C5=CC=D8=CE=CF=CD are= po'=D7=D3=CB=CF=CD =D3=CB=D2=C9=D0=D4=C5 find-requires, =CE=C1 stdin =CB=CF=D4=CF=D2=CF=CD=D5 =CF=D4=C4=C1=A3=D4=D3=D1 =D3=D0=C9=D3=CF=CB = =C6=C1=CA=CC=CF=D7. =E5=D3=CC=C9 =DC=D4=CF=D4 =D3=D0=C9=D3=CF=CB =C4=CF=D3=D4=C1=D4=CF=DE=CE=CF =C2=CF=CC=D8=DB=CF=CA, =D3=CB=D2=C9=D0=D4 = =DA=C1=D7=C5=D2=DB=C1=C5=D4=D3=D1 =D2=C5=CE=D8=DB=C5 =DE=C5=CD rpm =D5=D3= =D0=C5=C5=D4 =DA=C1=D0=C9=D3=C1=D4=D8 =D7=D3=C5 =C4=C1=CE=CE=D9=C5 =D7 =D0=C1=CA=D0. =F0=C1=D4=DE=C9 =D0=D2=C9=CC=CF=D6=C5=CE=D9, =CB=CF=D3=D4=D9=CC=D8 i586-gli= bc-locales =CD=CF=D6=CE=CF =D7=D9=CE=CF=D3=C9=D4=D8 =C9=DA =D3=C9=DA=C9=C6=C1. --=20 Regards, -- Sir Raorn. --- http://thousandsofhate.blogspot.com/ --7JfCtLOvnd9MIVvH Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-Do-not-process-non-ELF-s-with-ldd.patch" Content-Transfer-Encoding: quoted-printable =46rom e6bbf8437cd24d664c3583f7714ef6c450016fd9 Mon Sep 17 00:00:00 2001 =46rom: Alexey I. Froloff Date: Tue, 31 Aug 2010 12:14:50 +0400 Subject: [PATCH 1/2] Do not process non-ELF's with ldd Signed-off-by: Alexey I. Froloff --- arepo.py | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/arepo.py b/arepo.py index 2cb7ec8..b41b938 100755 --- a/arepo.py +++ b/arepo.py @@ -554,15 +554,21 @@ for file in "$@"; do install -d -- "%buildroot$file" else echo =3D=3D=3D $file - list=3D"${list} `ldd "$file"|cut -d '>' -f 2|grep \.so|cut -f = 1 -d '('`" + case "$(file -L -- "$file")" in + 'ELF '*' shared object'|'ELF '*' executable') + list=3D"${list} `ldd "$file"|cut -d '>' -f 2|grep \.so|cut= -f 1 -d '('`" + ;; + esac mkdir -p -- "`dirname %buildroot$file`" cp -a -- "$file" "%buildroot$file" fi done -list=3D`for l in $list; do echo $l; done|sort|uniq` -list=3D`for l in $list; do rpm -qf --queryformat '%{NAME}\n' $l; done|sort= |uniq` -echo search for $pkg in $list -for l in $list; do [ $l =3D $pkg ] && echo skip $l || echo i586-$l >> ${TM= P:-/tmp}/${pkg}-requires; done +if [ -n "$list" ]; then + list=3D`for l in $list; do echo $l; done|sort|uniq` + list=3D`for l in $list; do rpm -qf --queryformat '%{NAME}\n' $l; done|= sort|uniq` + echo search for $pkg in $list + for l in $list; do [ $l =3D $pkg ] && echo skip $l || echo i586-$l >> = ${TMP:-/tmp}/${pkg}-requires; done +fi EOF chmod +x install.sh =20 --=20 1.7.1.1 --7JfCtLOvnd9MIVvH Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0002-Swallow-filelist-passed-by-rpm-to-avoid-SIGPIPE.patch" Content-Transfer-Encoding: quoted-printable =46rom bfe1977293b61fb2a88d07377abb172a0d704593 Mon Sep 17 00:00:00 2001 =46rom: Alexey I. Froloff Date: Tue, 31 Aug 2010 12:15:59 +0400 Subject: [PATCH 2/2] Swallow filelist passed by rpm to avoid SIGPIPE Signed-off-by: Alexey I. Froloff --- arepo.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/arepo.py b/arepo.py index b41b938..6f4b605 100755 --- a/arepo.py +++ b/arepo.py @@ -594,6 +594,7 @@ chmod +x find-deps.sh =20 cat >find-requires <<'EOF' #!/bin/sh -e +cat >/dev/null pkg=3D~(pkgname)s file=3D${TMP:-/tmp}/${pkg}-requires cat $file --=20 1.7.1.1 --7JfCtLOvnd9MIVvH-- --QKdGvSO+nmPlgiQ/ Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAkx8urEACgkQVqT7+fkT8wpSogCbBsXMK+ElO9g9V4G77k0BUXHs wbIAnj/Hth8Be2VxYwzLVnAlHpq2kiL+ =uz4f -----END PGP SIGNATURE----- --QKdGvSO+nmPlgiQ/--