linux-qoriq, scmversion: do_configure_prepend() causes error with master...

linux-qoriq, scmversion: do_configure_prepend() causes error with master...

[Bob Cochran]

Hi,

Inside linux-qoriq.inc:do_configure_prepend() there is a section that 
builds an scmversion string and writes it to ${S}/.scmversion.

The section of script assumes it's in the source directory and executes 
'git rev-parse --verify --short HEAD' to get the SHA, but this fails and 
the baking abruptly comes to an end.

With a 3.12 kernel, do we need to worry about manually generating an 
scmversion string?  Looking at the default config, LOCALVERSION_AUTO is 
enabled.

However, my generated kernel after I removed the scmversion generation 
logic from do_configure_prepend() didn't show the -gxxxxxxxx suffix when 
I ran uname.  So, it's not clear to me whether this kernel feature is 
broken by the environment.

In summary, I think linux-qoriq.inc needs a patch to 
do_configure_prepend(), but I'm not sure what's actually needed.  In the 
the interim, I'm using a modified linux-qoriq.inc as shown below.

Thanks

Bob


@@ -28,17 +28,6 @@ do_configure_prepend() {
                             ${S}/arch/powerpc/configs/${deltacfg}
                 fi
         done
-
-    #add git revision to the local version
-    if [ "${SCMVERSION}" = "y" ]; then
-            # append sdk version if SDK_VERSION is defined
-            sdkversion=''
-            if [ -n "${SDK_VERSION}" ]; then
-                sdkversion="-${SDK_VERSION}"
-            fi
-            head=`git rev-parse --verify --short HEAD 2> /dev/null`
-            printf "%s%s%s" $sdkversion +g $head > ${S}/.scmversion
-    fi
  }

  # make everything compatible for the time being

Re: linux-qoriq, scmversion: do_configure_prepend() causes error with master...

[Otavio Salvador]

Hello Bob,

On Fri, Jan 2, 2015 at 2:15 AM, Bob Cochran <yocto@mindchasers.com> wrote:
> Inside linux-qoriq.inc:do_configure_prepend() there is a section that builds
> an scmversion string and writes it to ${S}/.scmversion.
>
> The section of script assumes it's in the source directory and executes 'git
> rev-parse --verify --short HEAD' to get the SHA, but this fails and the
> baking abruptly comes to an end.
>
> With a 3.12 kernel, do we need to worry about manually generating an
> scmversion string?  Looking at the default config, LOCALVERSION_AUTO is
> enabled.
>
> However, my generated kernel after I removed the scmversion generation logic
> from do_configure_prepend() didn't show the -gxxxxxxxx suffix when I ran
> uname.  So, it's not clear to me whether this kernel feature is broken by
> the environment.
>
> In summary, I think linux-qoriq.inc needs a patch to do_configure_prepend(),
> but I'm not sure what's actually needed.  In the the interim, I'm using a
> modified linux-qoriq.inc as shown below.

This is necessary because master has changed the way kernel build
happens. If you take a look at meta-fsl-arm, I fixed this changing the
fsl-kernel-localversion class.

So if you are willing to look at this, please copy the class to
meta-fsl-ppc and change the recipes to use it. This reduces code
duplication and allow for easy fixing in those specific use cases.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750