diff options
-rw-r--r-- | meta/classes/kernel-yocto.bbclass | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index d51748e556..087fbb0c37 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass | |||
@@ -111,10 +111,6 @@ do_patch() { | |||
111 | done | 111 | done |
112 | fi | 112 | fi |
113 | 113 | ||
114 | if [ "${machine_branch}" != "${KBRANCH_DEFAULT}" ]; then | ||
115 | updateme_flags="--branch ${machine_branch}" | ||
116 | fi | ||
117 | |||
118 | # updates or generates the target description | 114 | # updates or generates the target description |
119 | updateme ${updateme_flags} -DKDESC=${KMACHINE}:${LINUX_KERNEL_TYPE} \ | 115 | updateme ${updateme_flags} -DKDESC=${KMACHINE}:${LINUX_KERNEL_TYPE} \ |
120 | ${includes} ${addon_features} ${ARCH} ${KMACHINE} ${sccs} ${patches} | 116 | ${includes} ${addon_features} ${ARCH} ${KMACHINE} ${sccs} ${patches} |
@@ -152,18 +148,6 @@ do_patch() { | |||
152 | exit 1 | 148 | exit 1 |
153 | fi | 149 | fi |
154 | fi | 150 | fi |
155 | |||
156 | # Perform a final check. If something other than the default kernel | ||
157 | # branch was requested, and that's not where we ended up, then we | ||
158 | # should thrown an error, since we aren't building what was expected | ||
159 | final_branch="$(git symbolic-ref HEAD 2>/dev/null)" | ||
160 | final_branch=${final_branch##refs/heads/} | ||
161 | if [ "${machine_branch}" != "${KBRANCH_DEFAULT}" ] && | ||
162 | [ "${final_branch}" != "${machine_branch}" ]; then | ||
163 | echo "ERROR: branch ${machine_branch} was requested, but was not properly" | ||
164 | echo " configured to be built. The current branch is ${final_branch}" | ||
165 | exit 1 | ||
166 | fi | ||
167 | } | 151 | } |
168 | 152 | ||
169 | do_kernel_checkout() { | 153 | do_kernel_checkout() { |