| 1 |
From: Michał Górny <mgorny@g.o> |
| 2 |
|
| 3 |
--- |
| 4 |
bin/misc-functions.sh | 3 ++- |
| 5 |
bin/phase-helpers.sh | 2 ++ |
| 6 |
bin/save-ebuild-env.sh | 2 +- |
| 7 |
3 files changed, 5 insertions(+), 2 deletions(-) |
| 8 |
|
| 9 |
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh |
| 10 |
index a7af3ec73..30e911fd6 100755 |
| 11 |
--- a/bin/misc-functions.sh |
| 12 |
+++ b/bin/misc-functions.sh |
| 13 |
@@ -224,7 +224,8 @@ install_qa_check() { |
| 14 |
ecompressdir --dequeue |
| 15 |
ecompress --dequeue |
| 16 |
|
| 17 |
- "${PORTAGE_BIN_PATH}"/estrip --queue / |
| 18 |
+ "${PORTAGE_BIN_PATH}"/estrip --queue "${PORTAGE_DOSTRIP[@]}" |
| 19 |
+ "${PORTAGE_BIN_PATH}"/estrip --ignore "${PORTAGE_DOSTRIP_SKIP[@]}" |
| 20 |
"${PORTAGE_BIN_PATH}"/estrip --dequeue |
| 21 |
|
| 22 |
# Create NEEDED.ELF.2 regardless of RESTRICT=binchecks, since this info is |
| 23 |
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh |
| 24 |
index 5eeecfef7..f1f8d3992 100644 |
| 25 |
--- a/bin/phase-helpers.sh |
| 26 |
+++ b/bin/phase-helpers.sh |
| 27 |
@@ -20,6 +20,8 @@ export MOPREFIX=${PN} |
| 28 |
export PORTAGE_DOCOMPRESS_SIZE_LIMIT="128" |
| 29 |
declare -a PORTAGE_DOCOMPRESS=( /usr/share/{doc,info,man} ) |
| 30 |
declare -a PORTAGE_DOCOMPRESS_SKIP=( /usr/share/doc/${PF}/html ) |
| 31 |
+declare -a PORTAGE_DOSTRIP=( / ) |
| 32 |
+declare -a PORTAGE_DOSTRIP_SKIP=() |
| 33 |
|
| 34 |
into() { |
| 35 |
if [ "$1" == "/" ]; then |
| 36 |
diff --git a/bin/save-ebuild-env.sh b/bin/save-ebuild-env.sh |
| 37 |
index e5ae8af88..f624f44ec 100644 |
| 38 |
--- a/bin/save-ebuild-env.sh |
| 39 |
+++ b/bin/save-ebuild-env.sh |
| 40 |
@@ -15,7 +15,7 @@ __save_ebuild_env() { |
| 41 |
if has --exclude-init-phases $* ; then |
| 42 |
unset S _E_DESTTREE _E_INSDESTTREE _E_DOCDESTTREE_ _E_EXEDESTTREE_ \ |
| 43 |
PORTAGE_DOCOMPRESS_SIZE_LIMIT PORTAGE_DOCOMPRESS \ |
| 44 |
- PORTAGE_DOCOMPRESS_SKIP |
| 45 |
+ PORTAGE_DOCOMPRESS_SKIP PORTAGE_DOSTRIP PORTAGE_DOSTRIP_SKIP |
| 46 |
if [[ -n $PYTHONPATH && |
| 47 |
${PYTHONPATH%%:*} -ef $PORTAGE_PYM_PATH ]] ; then |
| 48 |
if [[ $PYTHONPATH == *:* ]] ; then |
| 49 |
-- |
| 50 |
2.13.6 |
Archives