* [PATCH 0/2] kernel-yocto: 3.10.x bug fixes
@ 2013-09-06 19:47 Bruce Ashfield
2013-09-06 19:47 ` [PATCH 1/2] kernel-yocto: improve error checking on non-git repos Bruce Ashfield
2013-09-06 19:47 ` [PATCH 2/2] kern-tools: support no author patches Bruce Ashfield
0 siblings, 2 replies; 3+ messages in thread
From: Bruce Ashfield @ 2013-09-06 19:47 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
Richard/Saul,
The 1.5 kern tools managed to break TomZ's bsp script's generated patches,
so I've included a fix here for that issue.
The second one is a usablity fix for the tgz support for linux-yocto
based kernels, with this, misconfigurations are detected and reported
rather than some arcane error messages.
Bruce
The following changes since commit ed3ef0823fde89371a473d20c0127c0bd16d062b:
qemumips: fix keyboard entry in graphical boots (2013-09-05 16:27:54 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib zedd/kernel
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel
Bruce Ashfield (2):
kernel-yocto: improve error checking on non-git repos
kern-tools: support no author patches
meta/classes/kernel-yocto.bbclass | 13 ++++++++++++-
meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +-
2 files changed, 13 insertions(+), 2 deletions(-)
--
1.7.10.4
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/2] kernel-yocto: improve error checking on non-git repos
2013-09-06 19:47 [PATCH 0/2] kernel-yocto: 3.10.x bug fixes Bruce Ashfield
@ 2013-09-06 19:47 ` Bruce Ashfield
2013-09-06 19:47 ` [PATCH 2/2] kern-tools: support no author patches Bruce Ashfield
1 sibling, 0 replies; 3+ messages in thread
From: Bruce Ashfield @ 2013-09-06 19:47 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
While non-git kernel repos are not the preferred format for a kernel upstream,
they are supported. Depending on the creator of the archive the expanded
source directory name varies. If the recipe for the kernel doesn't properly
set S to the right value, a cryptic git error message is produced. We can
detect the situation and offer some advice on how to fix the issue.
A second check is also added in this commit for archive based kernel repos
which won't have a SRCREV to validate. If we have no SRCREV or SRCREV is
INVALID, we can exit the branch validation step immediately. This saves yet
another cryptic git error message and simplifies a custom tgz based recipe.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/classes/kernel-yocto.bbclass | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 26d449a..97a5fa7 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -176,7 +176,17 @@ do_kernel_checkout() {
# case 3: we have no git repository at all.
# To support low bandwidth options for building the kernel, we'll just
# convert the tree to a git repo and let the rest of the process work unchanged
+
+ # if ${S} hasn't been set to the proper subdirectory a default of "linux" is
+ # used, but we can't initialize that empty directory. So check it and throw a
+ # clear error
+
cd ${S}
+ if [ ! -f "Makefile" ]; then
+ echo "[ERROR]: S is not set to the linux source directory. Check "
+ echo " the recipe and set S to the proper extracted subdirectory"
+ exit 1
+ fi
git init
git add .
git commit -q -m "baseline commit: creating repo for ${PN}-${PV}"
@@ -288,7 +298,8 @@ do_validate_branches() {
set +e
# if SRCREV is AUTOREV it shows up as AUTOINC there's nothing to
# check and we can exit early
- if [ "${SRCREV_machine}" = "AUTOINC" ]; then
+ if [ "${SRCREV_machine}" = "AUTOINC" ] || "${SRCREV_machine}" = "INVALID" ] ||
+ [ "${SRCREV_machine}" = "" ]; then
return
fi
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] kern-tools: support no author patches
2013-09-06 19:47 [PATCH 0/2] kernel-yocto: 3.10.x bug fixes Bruce Ashfield
2013-09-06 19:47 ` [PATCH 1/2] kernel-yocto: improve error checking on non-git repos Bruce Ashfield
@ 2013-09-06 19:47 ` Bruce Ashfield
1 sibling, 0 replies; 3+ messages in thread
From: Bruce Ashfield @ 2013-09-06 19:47 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
Updating the kern-toosl SRCREV to pick up the following fix:
previous versions of the kern-tools supported the ability to import a bare
patch, with no From: Subject: or other identifying fields that are typically
in a full commit.
The same type of commit with kgit-s2q will prompt for a author ID, just
as git-quilt-import does. In build system environment that leads to an
infinite loop and the commit is never pushed.
To fix this issue, we add an interactive flag (-i), that when passed the
prompt based behaviour is used. When it isn't passed (the default), the following
name and email will be used for the git author:
GIT_AUTHOR_NAME="invalid_git config"
GIT_AUTHOR_EMAIL="<unknown@unknown>"
And a bare/incomplete header patch will be applied.
[YOCTO #5100]
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index 2c82199..6cfb624 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=d8d1d729a70c
DEPENDS = "git-native"
-SRCREV = "7fb05c54db4ce513fd961c5b71d85de5dafedb30"
+SRCREV = "9bbdd79086c164c82e4f982cbc3eb0b697ba651d"
PR = "r12"
PV = "0.2+git${SRCPV}"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-09-06 19:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-06 19:47 [PATCH 0/2] kernel-yocto: 3.10.x bug fixes Bruce Ashfield
2013-09-06 19:47 ` [PATCH 1/2] kernel-yocto: improve error checking on non-git repos Bruce Ashfield
2013-09-06 19:47 ` [PATCH 2/2] kern-tools: support no author patches Bruce Ashfield
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox