[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rpm-devel
Subject:    Re: [CVS] RPM: rpm/ CHANGES rpm/scripts/ find-debuginfo.sh
From:       Jeff Johnson <n3npq () mac ! com>
Date:       2011-05-18 13:35:31
Message-ID: 20BAC73F-D46A-4FAA-A5A7-677B48A14868 () mac ! com
[Download RAW message or body]

Nice!

You beat me to the fix ;-)

I was staring at just how gawd awful find-debuginfo.sh really is.

That script is really really twisty and in need of writing in C, not shell.

73 de Jeff

On May 18, 2011, at 9:32 AM, Pinto Elia wrote:

>  RPM Package Manager, CVS Repository
>  http://rpm5.org/cvs/
>  ____________________________________________________________________________
> 
>  Server: rpm5.org                         Name:   Pinto Elia
>  Root:   /v/rpm/cvs                       Email:  devzero2000@rpm5.org
>  Module: rpm                              Date:   18-May-2011 15:32:50
>  Branch: HEAD                             Handle: 2011051813324901
> 
>  Modified files:
>    rpm                     CHANGES
>    rpm/scripts             find-debuginfo.sh
> 
>  Log:
>    Sort file list for debuginfo extraction.
>    (inspired by Robert Schiele http://lists.rpm.org/pipermail/rpm-list/2011-May/000894.html)
> 
>    Submitted by: Elia Pinto
> 
>  Summary:
>    Revision    Changes     Path
>    1.3642      +2  -0      rpm/CHANGES
>    1.15        +7  -7      rpm/scripts/find-debuginfo.sh
>  ____________________________________________________________________________
> 
>  patch -p0 <<'@@ .'
>  Index: rpm/CHANGES
>  ============================================================================
>  $ cvs diff -u -r1.3641 -r1.3642 CHANGES
>  --- rpm/CHANGES	16 May 2011 00:33:13 -0000	1.3641
>  +++ rpm/CHANGES	18 May 2011 13:32:49 -0000	1.3642
>  @@ -1,4 +1,6 @@
>   5.4.0 -> 5.4.1:
>  +    - devzero2000: Sort file list for debuginfo extraction. 
>  +      (inspired by Robert Schiele http://lists.rpm.org/pipermail/rpm-list/2011-May/000894.html)
>       - proyvind: update doxygen input filename paths.
>       - proyvind: fix assertion error when trying to install packages without
>   	required permissions.
>  @@ .
>  patch -p0 <<'@@ .'
>  Index: rpm/scripts/find-debuginfo.sh
>  ============================================================================
>  $ cvs diff -u -r1.14 -r1.15 find-debuginfo.sh
>  --- rpm/scripts/find-debuginfo.sh	10 Aug 2010 12:18:52 -0000	1.14
>  +++ rpm/scripts/find-debuginfo.sh	18 May 2011 13:32:50 -0000	1.15
>  @@ -176,7 +176,7 @@
>   # Strip ELF binaries
>   find "$RPM_BUILD_ROOT" ! -path "${debugdir}/*.debug" -type f \
>        		     \( -perm -0100 -or -perm -0010 -or -perm -0001 \) \
>  -		     -print |
>  +		     -print | LANG=C sort |
>   file -N -f - | sed -n -e 's/^\(.*\):[ 	]*.*ELF.*, not stripped/\1/p' |
>   xargs --no-run-if-empty stat -c '%h %D_%i %n' |
>   while read nlinks inum f; do
>  @@ -232,7 +232,7 @@
> 
>   # For each symlink whose target has a .debug file,
>   # make a .debug symlink to that file.
>  -find $RPM_BUILD_ROOT ! -path "${debugdir}/*" -type l -print |
>  +find $RPM_BUILD_ROOT ! -path "${debugdir}/*" -type l -print | LANG=C sort |
>   while read f
>   do
>     t=$(readlink -m "$f").debug
>  @@ -249,19 +249,19 @@
>     LC_ALL=C sort -z -u "$SOURCEFILE" | egrep -v -z '(<internal>|<built-in>)$' |
>     (cd "$RPM_BUILD_DIR"; cpio -pd0mL "${RPM_BUILD_ROOT}/usr/src/debug")
>     # stupid cpio creates new directories in mode 0700, fixup
>  -  find "${RPM_BUILD_ROOT}/usr/src/debug" -type d -print0 |
>  +  find "${RPM_BUILD_ROOT}/usr/src/debug" -type d -print0 | LANG=C sort |
>     xargs --no-run-if-empty -0 chmod a+rx
>   fi
> 
>   if [ -d "${RPM_BUILD_ROOT}/usr/lib" -o -d "${RPM_BUILD_ROOT}/usr/src" ]; then
>     ((nout > 0)) ||
>     test ! -d "${RPM_BUILD_ROOT}/usr/lib" ||
>  -  (cd "${RPM_BUILD_ROOT}/usr/lib"; find debug -type d) |
>  +  (cd "${RPM_BUILD_ROOT}/usr/lib"; find debug -type d) | LANG=C sort |
>     sed 's,^,%dir /usr/lib/,' >> "$LISTFILE"
> 
>     (cd "${RPM_BUILD_ROOT}/usr"
>  -   test ! -d lib/debug || find lib/debug ! -type d
>  -   test ! -d src/debug || find src/debug -mindepth 1 -maxdepth 1
>  +   test ! -d lib/debug || find lib/debug ! -type d | LANG=C sort
>  +   test ! -d src/debug || find src/debug -mindepth 1 -maxdepth 1 | LANG=C sort
>     ) | sed 's,^,/usr/,' >> "$LISTFILE"
>   fi
> 
>  @@ -321,7 +321,7 @@
>   done
>   if ((nout > 0)); then
>     # Now add the right %dir lines to each output list.
>  -  (cd "${RPM_BUILD_ROOT}"; find usr/lib/debug -type d) |
>  +  (cd "${RPM_BUILD_ROOT}"; find usr/lib/debug -type d) | LANG=C sort
>     sed 's#^.*$#\\@^/&/@{h;s@^.*$@%dir /&@p;g;}#' |
>     LC_ALL=C sort -ur > "${LISTFILE}.dirs.sed"
>     i=0
>  @@ .
> ______________________________________________________________________
> RPM Package Manager                                    http://rpm5.org
> CVS Sources Repository                                rpm-cvs@rpm5.org


["smime.p7s" (smime.p7s)]

0	*H
 010	+0	*H
 x00v n0
	*H
010	UIL10U

StartCom Ltd.1+0)U"Secure Digital Certificate Signing1806U/StartCom Class 1 \
Primary Intermediate Client CA0 100711153118Z
110712040640Z01 0U
224562-QYU8yAHNAs8olx1F10U
Persona Not Validated1)0'U StartCom Free Certificate Member10	*H
	
n3npq@mac.com0"0
	*H
0
ejh0fZ'FK`%sWY2 T)|#rbl$!;0lcZ-409ݛmi \
ht|ܯ"X~e!BńGbQ#e&o9̄K8ٛu)F>##x4Բ[{U4 \
WPf=jX}th˺RƀeEY$:)<0+*&9^/;MvV \
RQA00	U00U0U%0++0U
 e{12tPX^0U#0Sr풜\|~5NԸQ0U0
n3npq@mac.com0BU 90501+70 \
0.+"http://www.startssl.com/policy.pdf04+(http://www.startssl.com/intermediate.pdf0+00
 StartCom Ltd.0Limited Liability, see section *Legal Limitations* of the \
StartCom Certification Authority Policy available at \
http://www.startssl.com/policy.pdf0cU\0Z0+ ) \
'%http://www.startssl.com/crtu1-crl.crl0+ ) \
'%http://crl.startssl.com/crtu1-crl.crl0+009+0-http://ocsp.st \
artssl.com/sub/class1/client/ca0B+06http://www.startssl.com/certs/sub.class1.client.ca.crt0#U0http://www.startssl.com/0
 	*H
5˯4QN8V2T \
#1V0D8ZDHz=%m}1\5HE3V=	ɑ٪MdzC~"grHA>|Ǹ \
/2Dd<1](:ؔx&5gA(_Ka0cO%i1Lb?QT3~s@E}de} \
@<XMh,On,-ҫw3gumπ`:ϩ$ZYko00 
0
	*H
0}10	UIL10U

StartCom Ltd.1+0)U"Secure Digital Certificate Signing1)0'U StartCom \
Certification Authority0 071024210154Z
121022210154Z010	UIL10U

StartCom Ltd.1+0)U"Secure Digital Certificate Signing1806U/StartCom Class 1 \
Primary Intermediate Client CA0"0 	*H
0
	-).2AUGo#G
B|NDRpM-B=o-we5JQpa>O.# ._<V
[~**pz~3WG.ᘟMlr[<Ce6fqO"uxfWN#uic \
gkv$Lb%y`_{`xK'GN[0W0U00U0USr풜\|~5NԸQ0U# \
0N@[i04hCA򡁁0}10	UIL10U 
StartCom Ltd.1+0)U"Secure Digital Certificate Signing1)0'U StartCom \
Certification Authority0	U00=+10/0-+0!http://www.startssl.com/sfsca.crt0`UY0W0, \
* (&http://cert.startcom.org/sfsca-crl.crl0' % \
#!http://crl.startssl.com/sfsca.crl0]U \
T0P0L+70;0/+#http://cert.startcom.org/policy.pdf05+)http://cert.startcom.org/intermediate.pdf0+00' \
Start Commercial (StartCom) Ltd.0Limited Liability, read the section *Legal \
Limitations* of the StartCom Certification Authority Policy available at \
http://cert.startcom.org/policy.pdf0	`HB0P	`HB CAStartCom Class \
1 Primary Intermediate Free SSL Email Certificates0 	*H
[,0  &()04 \
~}ANӲ1	"ObT:d>ijkI:n$ir++vD 鄅GN$74 \
il*N5Y4eh.|ReF8!t|{t/`8CSa│R"܃.pi \
|sBI Z,&౼	=QCsvt⫆Qc:6"iAμy \
л'4sQ@@Vۉ0ǛHILƈ6FC8(P98'(V7 \
Ý3W4lV/KFQG 4u۪,2	l \
ZHx'%:8:(hP)/ܳjGBXbgnm%3:f \
9<_W1o0k0010	UIL10U 
StartCom Ltd.1+0)U"Secure Digital Certificate Signing1806U/StartCom Class 1 \
Primary Intermediate Client CAn0	+ 0	*H 	1	*H
0	*H
	1
110518133532Z0#	*H
	1+1G{<SD6l:.0	+710010	UIL10U

StartCom Ltd.1+0)U"Secure Digital Certificate Signing1806U/StartCom Class 1 \
Primary Intermediate Client CAn0*H 	1 010	UIL10U

StartCom Ltd.1+0)U"Secure Digital Certificate Signing1806U/StartCom Class 1 \
Primary Intermediate Client CAn0 	*H
,b?wPe~~K)ضJIKt{'sڐk(>s6Rsڭ>C9<2 \
՘**3&s+DѻD1Plٓ2^+ \
/:i,mWNoz̨Md"E|2z^z-<91N	e6##T}tJi_v`3E,ͱl-b
 <dMEE\a 7


______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
Developer Communication List                        rpm-devel@rpm5.org

[prev in list] [next in list] [prev in thread] [next in thread]

Configure | About | News | Add a list | Sponsored by KoreLogic