Re: [gentoo-dev] [PATCH] linux-info.eclass: account for lack of trailing slash

[Marty E. Plummer]

On Sat, Jul 14, 2018 at 08:21:42AM +0200, Ulrich Mueller wrote:
> >>>>> On Fri, 13 Jul 2018, Marty E Plummer wrote:
>
> > In EAPI 7, D, ED, ROOT, EROOT no longer have a trailing slash[1]. This
> > makes finding /usr/src/linux not work properly as it currently stands.
>
> > Use the form "${ROOT%/}/" where apropos in order to unify behavior across
> > EAPIs.
>
> > 1: https://dev.gentoo.org/~ulm/pms/head/pms.html#x1-113001r7
>
> Please use https://projects.gentoo.org/pms/7/pms.html if you want the
> fragment identifier to be stable (which is not guaranteed for the
> version in my home directory).
>
Ok, will do.
> > @@ -554,7 +554,7 @@ get_version() {
> >  	# caught before this if they are.
> >  	if [[ -z ${OUTPUT_DIR} ]] ; then
> >  		# Try to locate a kernel that is most relevant for us.
> > -		for OUTPUT_DIR in "${SYSROOT}" "${ROOT}" "" ; do
> > +		for OUTPUT_DIR in "${SYSROOT}" "${ROOT%/}/" "" ; do
>
> Shouldn't it be "${ROOT%/}" here? Otherwise OUTPUT_DIR may begin with
> a double slash.
>
Ah, good point. I didn't check that well enough, will fix it up.
> >  			OUTPUT_DIR+="/lib/modules/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}/build"
> >  			if [[ -e ${OUTPUT_DIR} ]] ; then
> >  				break