| 1 |
commit: aa20110bde339046fc3d57538ca8ad47227fba99 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 24 03:21:12 2020 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 24 03:30:04 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=aa20110b |
| 7 |
|
| 8 |
Adjust mangling of "arch" value from scanelf output |
| 9 |
|
| 10 |
scanelf may generate output that looks like this: |
| 11 |
|
| 12 |
``` |
| 13 |
UNKNOWN_TYPE;lib/firmware/ath10k/WCN3990/hw1.0/wlanmdsp.mbn;; - ; |
| 14 |
EM_ARM;lib/firmware/mediatek/mt8183/scp.img;; - ; |
| 15 |
... |
| 16 |
``` |
| 17 |
|
| 18 |
Previously, we removed the first 3 characters of the first field and |
| 19 |
stored this as the "arch" in NEEDED.ELF.2. This unintentionally |
| 20 |
changes "UNKNOWN_TYPE" to "NOWN_TYPE". |
| 21 |
|
| 22 |
Instead, let's just remove the string "EM_" from the front. |
| 23 |
|
| 24 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 25 |
|
| 26 |
bin/misc-functions.sh | 2 +- |
| 27 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 28 |
|
| 29 |
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh |
| 30 |
index c2a16cbe0..d7009d7eb 100755 |
| 31 |
--- a/bin/misc-functions.sh |
| 32 |
+++ b/bin/misc-functions.sh |
| 33 |
@@ -194,7 +194,7 @@ install_qa_check() { |
| 34 |
fi |
| 35 |
|
| 36 |
echo "${obj} ${needed}" >> "${PORTAGE_BUILDDIR}"/build-info/NEEDED |
| 37 |
- echo "${arch:3};${obj};${soname};${rpath};${needed}" >> "${PORTAGE_BUILDDIR}"/build-info/NEEDED.ELF.2 |
| 38 |
+ echo "${arch#EM_};${obj};${soname};${rpath};${needed}" >> "${PORTAGE_BUILDDIR}"/build-info/NEEDED.ELF.2 |
| 39 |
done } |
| 40 |
|
| 41 |
[ -n "${QA_SONAME_NO_SYMLINK}" ] && \ |
Archives