diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-11-21 23:51:58 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-20 11:24:04 +0000 |
| commit | d5451dda1b8cfbbe8b6a779b0cd9b1397ebf1a07 (patch) | |
| tree | 93264feb918a2e2abed3adbd5b67e99c54a4035e | |
| parent | 7f934946fdb3184a06ce1a2cdc29559e7c468492 (diff) | |
| download | openembedded-core-d5451dda1b8cfbbe8b6a779b0cd9b1397ebf1a07.tar.gz openembedded-core-d5451dda1b8cfbbe8b6a779b0cd9b1397ebf1a07.tar.bz2 openembedded-core-d5451dda1b8cfbbe8b6a779b0cd9b1397ebf1a07.zip | |
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.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
| -rw-r--r-- | meta/classes/kernel-yocto.bbclass | 4 |
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() { bberror "S is not set to the linux source directory. Check " bbfatal "the recipe and set S to the proper extracted subdirectory" fi + rm -f .gitignore git init git add . git commit -q -m "baseline commit: creating repo for ${PN}-${PV}" + git clean -d -f fi # end debare @@ -287,7 +289,7 @@ do_validate_branches() { if [ "${machine_srcrev}" = "AUTOINC" ]; then bbnote "SRCREV validation is not required for AUTOREV" elif [ "${machine_srcrev}" = "" ]; then - if [ "${SRCREV}" != "AUTOINC" ]; then + if [ "${SRCREV}" != "AUTOINC" ] && [ "${SRCREV}" != "INVALID" ]; then # SRCREV_machine_<MACHINE> was not set. This means that a custom recipe # that doesn't use the SRCREV_FORMAT "machine_meta" is being built. In # this case, we need to reset to the give SRCREV before heading to patching |