summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-11-21 23:51:58 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-21 12:37:53 +0000
commit5b71b69355836687bbba5c12954a677d80070266 (patch)
tree10fb638c4bc891288821c8331f49f38793cf8285 /meta/classes
parent2214cb2e2c148df465b94b3fad1b243ab89bae5c (diff)
downloadpoky-5b71b69355836687bbba5c12954a677d80070266.tar.gz
kernel-yocto: fix non-git builds
The ability to build non-git repositories was broken by two changes: - The existence of an empty 'patches' directory created during the unpack phase. This dir was incorrectly identified as a valid meta directory and broke the build. By ensuring that it is removed before creating the empty repository, it will no longer be found instead of the real meta directory. - The attempt to reset the git repository to a specific SRCREV when no SRCREV was provided. By checking for a SRCREV of 'INVALID', we avoid any processing and failed git operations. (From OE-Core rev: d5451dda1b8cfbbe8b6a779b0cd9b1397ebf1a07) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/kernel-yocto.bbclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 45bdc9670a..5706a9e4e3 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -179,9 +179,11 @@ do_kernel_checkout() {
179 bberror "S is not set to the linux source directory. Check " 179 bberror "S is not set to the linux source directory. Check "
180 bbfatal "the recipe and set S to the proper extracted subdirectory" 180 bbfatal "the recipe and set S to the proper extracted subdirectory"
181 fi 181 fi
182 rm -f .gitignore
182 git init 183 git init
183 git add . 184 git add .
184 git commit -q -m "baseline commit: creating repo for ${PN}-${PV}" 185 git commit -q -m "baseline commit: creating repo for ${PN}-${PV}"
186 git clean -d -f
185 fi 187 fi
186 # end debare 188 # end debare
187 189
@@ -287,7 +289,7 @@ do_validate_branches() {
287 if [ "${machine_srcrev}" = "AUTOINC" ]; then 289 if [ "${machine_srcrev}" = "AUTOINC" ]; then
288 bbnote "SRCREV validation is not required for AUTOREV" 290 bbnote "SRCREV validation is not required for AUTOREV"
289 elif [ "${machine_srcrev}" = "" ]; then 291 elif [ "${machine_srcrev}" = "" ]; then
290 if [ "${SRCREV}" != "AUTOINC" ]; then 292 if [ "${SRCREV}" != "AUTOINC" ] && [ "${SRCREV}" != "INVALID" ]; then
291 # SRCREV_machine_<MACHINE> was not set. This means that a custom recipe 293 # SRCREV_machine_<MACHINE> was not set. This means that a custom recipe
292 # that doesn't use the SRCREV_FORMAT "machine_meta" is being built. In 294 # that doesn't use the SRCREV_FORMAT "machine_meta" is being built. In
293 # this case, we need to reset to the give SRCREV before heading to patching 295 # this case, we need to reset to the give SRCREV before heading to patching