diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2020-12-23 22:21:12 -0500 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2020-12-23 22:30:04 -0500 |
| commit | aa20110bde339046fc3d57538ca8ad47227fba99 (patch) | |
| tree | ddc728d4f38b674d4402a99c52c049531a646d49 | |
| parent | Updates for portage-3.0.12 release (diff) | |
| download | portage-aa20110bde339046fc3d57538ca8ad47227fba99.tar.gz portage-aa20110bde339046fc3d57538ca8ad47227fba99.tar.bz2 portage-aa20110bde339046fc3d57538ca8ad47227fba99.zip | |
Adjust mangling of "arch" value from scanelf output
scanelf may generate output that looks like this:
```
UNKNOWN_TYPE;lib/firmware/ath10k/WCN3990/hw1.0/wlanmdsp.mbn;; - ;
EM_ARM;lib/firmware/mediatek/mt8183/scp.img;; - ;
...
```
Previously, we removed the first 3 characters of the first field and
stored this as the "arch" in NEEDED.ELF.2. This unintentionally
changes "UNKNOWN_TYPE" to "NOWN_TYPE".
Instead, let's just remove the string "EM_" from the front.
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
| -rwxr-xr-x | bin/misc-functions.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index c2a16cbe0..d7009d7eb 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -194,7 +194,7 @@ install_qa_check() { fi echo "${obj} ${needed}" >> "${PORTAGE_BUILDDIR}"/build-info/NEEDED - echo "${arch:3};${obj};${soname};${rpath};${needed}" >> "${PORTAGE_BUILDDIR}"/build-info/NEEDED.ELF.2 + echo "${arch#EM_};${obj};${soname};${rpath};${needed}" >> "${PORTAGE_BUILDDIR}"/build-info/NEEDED.ELF.2 done } [ -n "${QA_SONAME_NO_SYMLINK}" ] && \ |