diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2010-10-13 22:41:50 -0400 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-11-10 21:22:27 +0800 |
commit | 570cf02a833ea93a0935b68aa01d49ffb2e2c2ff (patch) | |
tree | e3363c15b763bdd3a677b1891200ed8b97a20cb9 | |
parent | bca56bfcc9a9cf745a5864f000a8af0f0421c1be (diff) | |
download | poky-570cf02a833ea93a0935b68aa01d49ffb2e2c2ff.tar.gz |
linux-wrs: rename force_revisions and allow override
It is useful to override revision checking from a layer or other
recipe. In order to show the global nature of the variable rename
it KERNEL_REVISION_CHECKING and make it a weak assignment.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r-- | meta/recipes-kernel/linux/linux-wrs_git.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-wrs_git.bb b/meta/recipes-kernel/linux/linux-wrs_git.bb index c43ae11226..1f2b11e975 100644 --- a/meta/recipes-kernel/linux/linux-wrs_git.bb +++ b/meta/recipes-kernel/linux/linux-wrs_git.bb | |||
@@ -34,7 +34,7 @@ S = "${WORKDIR}/linux" | |||
34 | B = "${WORKDIR}/linux-${WRMACHINE}-${LINUX_KERNEL_TYPE}-build" | 34 | B = "${WORKDIR}/linux-${WRMACHINE}-${LINUX_KERNEL_TYPE}-build" |
35 | 35 | ||
36 | # functionality flags | 36 | # functionality flags |
37 | force_revisions = "t" | 37 | KERNEL_REVISION_CHECKING ?= "t" |
38 | KERNEL_FEATURES=features/netfilter | 38 | KERNEL_FEATURES=features/netfilter |
39 | 39 | ||
40 | do_patch() { | 40 | do_patch() { |
@@ -75,7 +75,7 @@ validate_branches() { | |||
75 | target_meta_head="${SRCREV_meta}" | 75 | target_meta_head="${SRCREV_meta}" |
76 | 76 | ||
77 | if [ -n "$target_branch_head" ] && [ "$branch_head" != "$target_branch_head" ]; then | 77 | if [ -n "$target_branch_head" ] && [ "$branch_head" != "$target_branch_head" ]; then |
78 | if [ -n "${force_revisions}" ]; then | 78 | if [ -n "${KERNEL_REVISION_CHECKING}" ]; then |
79 | git show ${target_branch_head} > /dev/null 2>&1 | 79 | git show ${target_branch_head} > /dev/null 2>&1 |
80 | if [ $? -eq 0 ]; then | 80 | if [ $? -eq 0 ]; then |
81 | echo "Forcing branch ${WRMACHINE}-${LINUX_KERNEL_TYPE} to ${target_branch_head}" | 81 | echo "Forcing branch ${WRMACHINE}-${LINUX_KERNEL_TYPE} to ${target_branch_head}" |
@@ -90,7 +90,7 @@ validate_branches() { | |||
90 | fi | 90 | fi |
91 | 91 | ||
92 | if [ "$meta_head" != "$target_meta_head" ]; then | 92 | if [ "$meta_head" != "$target_meta_head" ]; then |
93 | if [ -n "${force_revisions}" ]; then | 93 | if [ -n "${KERNEL_REVISION_CHECKING}" ]; then |
94 | git show ${target_meta_head} > /dev/null 2>&1 | 94 | git show ${target_meta_head} > /dev/null 2>&1 |
95 | if [ $? -eq 0 ]; then | 95 | if [ $? -eq 0 ]; then |
96 | echo "Forcing branch wrs_meta to ${target_meta_head}" | 96 | echo "Forcing branch wrs_meta to ${target_meta_head}" |