Re: [gentoo-portage-dev] [PATCH] Adjust mangling of "arch" value from scanelf output
On Thu, Dec 24, 2020 at 1:31 AM Zac Medico wrote:
>
> On 12/23/20 7:34 PM, Mike Gilbert wrote:
> > 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
> > ---
> > bin/misc-functions.sh | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > 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}" ] && \
> >
>
> Look good. This won't cause any problems for portage since these files
> are outside of the known multilib categories.
Thanks, pushed.
Re: [gentoo-portage-dev] [PATCH] Adjust mangling of "arch" value from scanelf output
On 12/23/20 7:34 PM, Mike Gilbert wrote:
> 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
> ---
> bin/misc-functions.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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}" ] && \
>
Look good. This won't cause any problems for portage since these files
are outside of the known multilib categories.
--
Thanks,
Zac
signature.asc
Description: OpenPGP digital signature
[gentoo-portage-dev] [PATCH] 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
---
bin/misc-functions.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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}" ] && \
--
2.30.0.rc1
