Re: [gentoo-portage-dev] [PATCH] multilib-strict: fix for Prefix
On 25-07-2022 19:38:57 -0400, Mike Gilbert wrote: > On Mon, Jul 25, 2022 at 12:26 PM Fabian Groffen wrote: > > > > bin/install-qa-check.d/80multilib-strict: use file/find from Prefix > > > > diff --git a/bin/install-qa-check.d/80multilib-strict > > b/bin/install-qa-check.d/80multilib-strict > > index afd223250..3db4ecce3 100644 > > --- a/bin/install-qa-check.d/80multilib-strict > > +++ b/bin/install-qa-check.d/80multilib-strict > > @@ -1,7 +1,7 @@ > > # Strict multilib directory checks > > multilib_strict_check() { > > if has multilib-strict ${FEATURES} && \ > > - [[ -x /usr/bin/file && -x /usr/bin/find ]] && \ > > + [[ -x ${EPREFIX}/usr/bin/file && -x ${EPREFIX}/usr/bin/find ]] > > && \ > >[[ -n ${MULTILIB_STRICT_DIRS} && -n ${MULTILIB_STRICT_DENY} ]] > > then > > rm -f "${T}/multilib-strict.log" > > Seems good to me. https://github.com/gentoo/portage/pull/868 Thanks -- Fabian Groffen Gentoo on a different level signature.asc Description: PGP signature
Re: [gentoo-portage-dev] [PATCH] multilib-strict: fix for Prefix
On Mon, Jul 25, 2022 at 12:26 PM Fabian Groffen wrote: > > bin/install-qa-check.d/80multilib-strict: use file/find from Prefix > > diff --git a/bin/install-qa-check.d/80multilib-strict > b/bin/install-qa-check.d/80multilib-strict > index afd223250..3db4ecce3 100644 > --- a/bin/install-qa-check.d/80multilib-strict > +++ b/bin/install-qa-check.d/80multilib-strict > @@ -1,7 +1,7 @@ > # Strict multilib directory checks > multilib_strict_check() { > if has multilib-strict ${FEATURES} && \ > - [[ -x /usr/bin/file && -x /usr/bin/find ]] && \ > + [[ -x ${EPREFIX}/usr/bin/file && -x ${EPREFIX}/usr/bin/find ]] && \ >[[ -n ${MULTILIB_STRICT_DIRS} && -n ${MULTILIB_STRICT_DENY} ]] > then > rm -f "${T}/multilib-strict.log" Seems good to me.
[gentoo-portage-dev] [PATCH] multilib-strict: fix for Prefix
bin/install-qa-check.d/80multilib-strict: use file/find from Prefix diff --git a/bin/install-qa-check.d/80multilib-strict b/bin/install-qa-check.d/80multilib-strict index afd223250..3db4ecce3 100644 --- a/bin/install-qa-check.d/80multilib-strict +++ b/bin/install-qa-check.d/80multilib-strict @@ -1,7 +1,7 @@ # Strict multilib directory checks multilib_strict_check() { if has multilib-strict ${FEATURES} && \ - [[ -x /usr/bin/file && -x /usr/bin/find ]] && \ + [[ -x ${EPREFIX}/usr/bin/file && -x ${EPREFIX}/usr/bin/find ]] && \ [[ -n ${MULTILIB_STRICT_DIRS} && -n ${MULTILIB_STRICT_DENY} ]] then rm -f "${T}/multilib-strict.log" -- Fabian Groffen Gentoo on a different level signature.asc Description: PGP signature