| 1 |
Author: zmedico |
| 2 |
Date: 2008-12-25 01:27:20 +0000 (Thu, 25 Dec 2008) |
| 3 |
New Revision: 12323 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/bin/prepstrip |
| 7 |
main/branches/2.1.6/man/ebuild.5 |
| 8 |
main/branches/2.1.6/man/make.conf.5 |
| 9 |
Log: |
| 10 |
Bug #251976 - Add a QA_PRESTRIPPED variable for ebuilds to disable warnings about |
| 11 |
pre-stripped files. (trunk r12295:12300) |
| 12 |
|
| 13 |
|
| 14 |
Modified: main/branches/2.1.6/bin/prepstrip |
| 15 |
=================================================================== |
| 16 |
--- main/branches/2.1.6/bin/prepstrip 2008-12-25 01:24:26 UTC (rev 12322) |
| 17 |
+++ main/branches/2.1.6/bin/prepstrip 2008-12-25 01:27:20 UTC (rev 12323) |
| 18 |
@@ -80,12 +80,25 @@ |
| 19 |
# They prevent us from getting the splitdebug data. |
| 20 |
if ! hasq binchecks ${RESTRICT} && \ |
| 21 |
! hasq strip ${RESTRICT} ; then |
| 22 |
- f=$(scanelf -yqRBF '#k%F' -k '!.symtab' "$@") |
| 23 |
- if [[ -n ${f} ]] ; then |
| 24 |
+ log=$T/scanelf-already-stripped.log |
| 25 |
+ scanelf -yqRBF '#k%F' -k '!.symtab' "$@" | sed -e "s#^$D##" > "$log" |
| 26 |
+ if [[ -n $QA_PRESTRIPPED && -s $log && \ |
| 27 |
+ ${QA_STRICT_PRESTRIPPED-unset} = unset ]] ; then |
| 28 |
+ shopts=$- |
| 29 |
+ set -o noglob |
| 30 |
+ for x in $QA_PRESTRIPPED ; do |
| 31 |
+ sed -e "s#^${x#/}\$##" -i "$log" |
| 32 |
+ done |
| 33 |
+ set +o noglob |
| 34 |
+ set -$shopts |
| 35 |
+ fi |
| 36 |
+ sed -e "/^\$/d" -e "s#^#/#" -i "$log" |
| 37 |
+ if [[ -s $log ]] ; then |
| 38 |
vecho -e "\a\n" |
| 39 |
eqawarn "QA Notice: Pre-stripped files found:" |
| 40 |
- eqawarn "${f}" |
| 41 |
- echo "${f}" > "${T}"/scanelf-already-stripped.log |
| 42 |
+ eqawarn "$(<"$log")" |
| 43 |
+ else |
| 44 |
+ rm -f "$log" |
| 45 |
fi |
| 46 |
fi |
| 47 |
|
| 48 |
|
| 49 |
Modified: main/branches/2.1.6/man/ebuild.5 |
| 50 |
=================================================================== |
| 51 |
--- main/branches/2.1.6/man/ebuild.5 2008-12-25 01:24:26 UTC (rev 12322) |
| 52 |
+++ main/branches/2.1.6/man/ebuild.5 2008-12-25 01:27:20 UTC (rev 12323) |
| 53 |
@@ -484,6 +484,11 @@ |
| 54 |
This should contain a list of file paths, relative to the image directory, of |
| 55 |
files that contain .hash sections. The paths may contain regular expressions |
| 56 |
with escape\-quoted special characters. |
| 57 |
+.TP |
| 58 |
+\fBQA_PRESTRIPPED\fR |
| 59 |
+This should contain a list of file paths, relative to the image directory, of |
| 60 |
+files that contain pre-stripped binaries. The paths may contain regular |
| 61 |
+expressions with escape\-quoted special characters. |
| 62 |
.SH "PORTAGE DECLARATIONS" |
| 63 |
.TP |
| 64 |
.B inherit |
| 65 |
|
| 66 |
Modified: main/branches/2.1.6/man/make.conf.5 |
| 67 |
=================================================================== |
| 68 |
--- main/branches/2.1.6/man/make.conf.5 2008-12-25 01:24:26 UTC (rev 12322) |
| 69 |
+++ main/branches/2.1.6/man/make.conf.5 2008-12-25 01:27:20 UTC (rev 12323) |
| 70 |
@@ -591,6 +591,10 @@ |
| 71 |
Set this to cause portage to ignore any \fIQA_DT_HASH\fR override |
| 72 |
settings from ebuilds. See also \fBebuild\fR(5). |
| 73 |
.TP |
| 74 |
+\fBQA_STRICT_PRESTRIPPED = \fI"set"\fR |
| 75 |
+Set this to cause portage to ignore any \fIQA_PRESTRIPPED\fR override |
| 76 |
+settings from ebuilds. See also \fBebuild\fR(5). |
| 77 |
+.TP |
| 78 |
.B RESUMECOMMAND |
| 79 |
This variable contains the command used for resuming package sources that |
| 80 |
have been partially downloaded. It should be defined using the same format |
Archives