From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <yocto@mindchasers.com>
Received: by yocto-www.yoctoproject.org (Postfix, from userid 118)
	id 22E56E008EA; Thu,  1 Jan 2015 20:15:32 -0800 (PST)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	yocto-www.yoctoproject.org
X-Spam-Level: 
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham
	version=3.3.1
X-Spam-HAM-Report: * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%
	*      [score: 0.0000]
Received: from smtp.webfaction.com (mail6.webfaction.com [74.55.86.74])
	by yocto-www.yoctoproject.org (Postfix) with ESMTP id C93A5E00757
	for <meta-freescale@yoctoproject.org>;
	Thu,  1 Jan 2015 20:15:28 -0800 (PST)
Received: from [192.168.1.10] (c-73-194-208-34.hsd1.nj.comcast.net
	[73.194.208.34])
	by smtp.webfaction.com (Postfix) with ESMTP id 3A48A20A0B78
	for <meta-freescale@yoctoproject.org>;
	Fri,  2 Jan 2015 04:15:27 +0000 (UTC)
Message-ID: <54A61B5D.9010205@mindchasers.com>
Date: Thu, 01 Jan 2015 23:15:25 -0500
From: Bob Cochran <yocto@mindchasers.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64;
	rv:31.0) Gecko/20100101 Thunderbird/31.3.0
MIME-Version: 1.0
To: "meta-freescale@yoctoproject.org" <meta-freescale@yoctoproject.org>
Subject: linux-qoriq, scmversion: do_configure_prepend() causes error with master...
X-BeenThere: meta-freescale@yoctoproject.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: Usage and development list for the meta-fsl-* layers
	<meta-freescale.yoctoproject.org>
List-Unsubscribe: <https://lists.yoctoproject.org/options/meta-freescale>,
	<mailto:meta-freescale-request@yoctoproject.org?subject=unsubscribe>
List-Archive: <http://lists.yoctoproject.org/pipermail/meta-freescale>
List-Post: <mailto:meta-freescale@yoctoproject.org>
List-Help: <mailto:meta-freescale-request@yoctoproject.org?subject=help>
List-Subscribe: <https://lists.yoctoproject.org/listinfo/meta-freescale>,
	<mailto:meta-freescale-request@yoctoproject.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Jan 2015 04:15:32 -0000
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit

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