| 1 |
commit: 89a8b8bc44af7664d1a5d9b064f4442ed7c845bb |
| 2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 3 12:34:35 2011 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 3 12:34:35 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=89a8b8bc |
| 7 |
|
| 8 |
Wrap all binaries in /bin /usr/bin /sbin and /usr/sbin |
| 9 |
|
| 10 |
--- |
| 11 |
bin/auto-multilib.sh | 8 ++++---- |
| 12 |
1 files changed, 4 insertions(+), 4 deletions(-) |
| 13 |
|
| 14 |
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh |
| 15 |
index 4cafc35..67b53e1 100755 |
| 16 |
--- a/bin/auto-multilib.sh |
| 17 |
+++ b/bin/auto-multilib.sh |
| 18 |
@@ -72,8 +72,8 @@ prep_ml_binaries() { |
| 19 |
mv ${binary} ${binary}-${ABI} || die |
| 20 |
_debug ${binary} ${binary}-${ABI} |
| 21 |
if [[ ${ABI} == ${DEFAULT_ABI} ]]; then |
| 22 |
- ln -s /usr/bin/abi-wrapper ${binary} || die |
| 23 |
- _debug /usr/bin/abi-wrapper ${binary} |
| 24 |
+ ln -s /bin/abi-wrapper ${binary} || die |
| 25 |
+ _debug /bin/abi-wrapper ${binary} |
| 26 |
fi |
| 27 |
done |
| 28 |
} |
| 29 |
@@ -277,14 +277,14 @@ _finalize_abi_install() { |
| 30 |
|
| 31 |
# Create wrapper symlink for *-config files |
| 32 |
local i= |
| 33 |
- prep_ml_binaries $(find "${D}"usr/bin -type f -name '*-config' 2>/dev/null) |
| 34 |
+ prep_ml_binaries $(find "${D}"usr/bin "${D}"usr/sbin "${D}"bin "${D}"sbin -type f -name '*-config' 2>/dev/null) |
| 35 |
|
| 36 |
local noabi=() |
| 37 |
for i in ${MULTILIB_ABIS}; do |
| 38 |
noabi+=( ! -name '*-'${i} ) |
| 39 |
done |
| 40 |
if [[ ${MULTILIB_BINARIES} == *${CATEGORY}/${PN}* ]]; then |
| 41 |
- for i in $(find "${D}"usr/bin/ -type f ${noabi[@]}) $(find "${D}"bin/ -type f ${noabi[@]}); do |
| 42 |
+ for i in $(find "${D}"usr/bin/ "${D}"usr/sbin "${D}"bin "${D}"sbin -type f ${noabi[@]}) ); do |
| 43 |
prep_ml_binaries "${i}" |
| 44 |
done |
| 45 |
fi |
Archives