Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | # remove tasks that modify the source tree in case externalsrc is inherited |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 2 | SRCTREECOVEREDTASKS += "do_kernel_configme do_validate_branches do_kernel_configcheck do_kernel_checkout do_fetch do_unpack do_patch" |
| 3 | PATCH_GIT_USER_EMAIL ?= "kernel-yocto@oe" |
| 4 | PATCH_GIT_USER_NAME ?= "OpenEmbedded" |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5 | |
| 6 | # returns local (absolute) path names for all valid patches in the |
| 7 | # src_uri |
| 8 | def find_patches(d): |
| 9 | patches = src_patches(d) |
| 10 | patch_list=[] |
| 11 | for p in patches: |
| 12 | _, _, local, _, _, _ = bb.fetch.decodeurl(p) |
| 13 | patch_list.append(local) |
| 14 | |
| 15 | return patch_list |
| 16 | |
| 17 | # returns all the elements from the src uri that are .scc files |
| 18 | def find_sccs(d): |
| 19 | sources=src_patches(d, True) |
| 20 | sources_list=[] |
| 21 | for s in sources: |
| 22 | base, ext = os.path.splitext(os.path.basename(s)) |
| 23 | if ext and ext in [".scc", ".cfg"]: |
| 24 | sources_list.append(s) |
| 25 | elif base and base in 'defconfig': |
| 26 | sources_list.append(s) |
| 27 | |
| 28 | return sources_list |
| 29 | |
| 30 | # check the SRC_URI for "kmeta" type'd git repositories. Return the name of |
| 31 | # the repository as it will be found in WORKDIR |
| 32 | def find_kernel_feature_dirs(d): |
| 33 | feature_dirs=[] |
| 34 | fetch = bb.fetch2.Fetch([], d) |
| 35 | for url in fetch.urls: |
| 36 | urldata = fetch.ud[url] |
| 37 | parm = urldata.parm |
| 38 | type="" |
| 39 | if "type" in parm: |
| 40 | type = parm["type"] |
| 41 | if "destsuffix" in parm: |
| 42 | destdir = parm["destsuffix"] |
| 43 | if type == "kmeta": |
| 44 | feature_dirs.append(destdir) |
| 45 | |
| 46 | return feature_dirs |
| 47 | |
| 48 | # find the master/machine source branch. In the same way that the fetcher proceses |
| 49 | # git repositories in the SRC_URI we take the first repo found, first branch. |
| 50 | def get_machine_branch(d, default): |
| 51 | fetch = bb.fetch2.Fetch([], d) |
| 52 | for url in fetch.urls: |
| 53 | urldata = fetch.ud[url] |
| 54 | parm = urldata.parm |
| 55 | if "branch" in parm: |
| 56 | branches = urldata.parm.get("branch").split(',') |
Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 57 | btype = urldata.parm.get("type") |
| 58 | if btype != "kmeta": |
| 59 | return branches[0] |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 60 | |
| 61 | return default |
| 62 | |
| 63 | do_kernel_metadata() { |
| 64 | set +e |
| 65 | cd ${S} |
| 66 | export KMETA=${KMETA} |
| 67 | |
| 68 | # if kernel tools are available in-tree, they are preferred |
| 69 | # and are placed on the path before any external tools. Unless |
| 70 | # the external tools flag is set, in that case we do nothing. |
| 71 | if [ -f "${S}/scripts/util/configme" ]; then |
| 72 | if [ -z "${EXTERNAL_KERNEL_TOOLS}" ]; then |
| 73 | PATH=${S}/scripts/util:${PATH} |
| 74 | fi |
| 75 | fi |
| 76 | |
| 77 | machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}" |
| 78 | machine_srcrev="${SRCREV_machine}" |
| 79 | if [ -z "${machine_srcrev}" ]; then |
| 80 | # fallback to SRCREV if a non machine_meta tree is being built |
| 81 | machine_srcrev="${SRCREV}" |
| 82 | fi |
| 83 | |
| 84 | # In a similar manner to the kernel itself: |
| 85 | # |
| 86 | # defconfig: $(obj)/conf |
| 87 | # ifeq ($(KBUILD_DEFCONFIG),) |
| 88 | # $< --defconfig $(Kconfig) |
| 89 | # else |
| 90 | # @echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'" |
| 91 | # $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig) |
| 92 | # endif |
| 93 | # |
| 94 | # If a defconfig is specified via the KBUILD_DEFCONFIG variable, we copy it |
| 95 | # from the source tree, into a common location and normalized "defconfig" name, |
| 96 | # where the rest of the process will include and incoroporate it into the build |
| 97 | # |
| 98 | # If the fetcher has already placed a defconfig in WORKDIR (from the SRC_URI), |
| 99 | # we don't overwrite it, but instead warn the user that SRC_URI defconfigs take |
| 100 | # precendence. |
| 101 | # |
| 102 | if [ -n "${KBUILD_DEFCONFIG}" ]; then |
| 103 | if [ -f "${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG}" ]; then |
| 104 | if [ -f "${WORKDIR}/defconfig" ]; then |
| 105 | # If the two defconfig's are different, warn that we didn't overwrite the |
| 106 | # one already placed in WORKDIR by the fetcher. |
| 107 | cmp "${WORKDIR}/defconfig" "${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG}" |
| 108 | if [ $? -ne 0 ]; then |
| 109 | bbwarn "defconfig detected in WORKDIR. ${KBUILD_DEFCONFIG} skipped" |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 110 | else |
| 111 | cp -f ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${WORKDIR}/defconfig |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 112 | fi |
| 113 | else |
| 114 | cp -f ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${WORKDIR}/defconfig |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 115 | fi |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 116 | sccs="${WORKDIR}/defconfig" |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 117 | else |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 118 | bbfatal "A KBUILD_DEFCONFIG '${KBUILD_DEFCONFIG}' was specified, but not present in the source tree" |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 119 | fi |
| 120 | fi |
| 121 | |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 122 | sccs_from_src_uri="${@" ".join(find_sccs(d))}" |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 123 | patches="${@" ".join(find_patches(d))}" |
| 124 | feat_dirs="${@" ".join(find_kernel_feature_dirs(d))}" |
| 125 | |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 126 | # a quick check to make sure we don't have duplicate defconfigs |
| 127 | # If there's a defconfig in the SRC_URI, did we also have one from |
| 128 | # the KBUILD_DEFCONFIG processing above ? |
| 129 | if [ -n "$sccs" ]; then |
| 130 | # we did have a defconfig from above. remove any that might be in the src_uri |
| 131 | sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{ if ($0!="defconfig") { print $0 } }' RS=' ') |
| 132 | fi |
| 133 | sccs="$sccs $sccs_from_src_uri" |
| 134 | |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 135 | # check for feature directories/repos/branches that were part of the |
| 136 | # SRC_URI. If they were supplied, we convert them into include directives |
| 137 | # for the update part of the process |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 138 | for f in ${feat_dirs}; do |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 139 | if [ -d "${WORKDIR}/$f/meta" ]; then |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 140 | includes="$includes -I${WORKDIR}/$f/kernel-meta" |
| 141 | elif [ -d "${WORKDIR}/$f" ]; then |
| 142 | includes="$includes -I${WORKDIR}/$f" |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 143 | fi |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 144 | done |
| 145 | for s in ${sccs} ${patches}; do |
| 146 | sdir=$(dirname $s) |
| 147 | includes="$includes -I${sdir}" |
| 148 | # if a SRC_URI passed patch or .scc has a subdir of "kernel-meta", |
| 149 | # then we add it to the search path |
| 150 | if [ -d "${sdir}/kernel-meta" ]; then |
| 151 | includes="$includes -I${sdir}/kernel-meta" |
| 152 | fi |
| 153 | done |
| 154 | |
| 155 | # expand kernel features into their full path equivalents |
| 156 | bsp_definition=$(spp ${includes} --find -DKMACHINE=${KMACHINE} -DKTYPE=${LINUX_KERNEL_TYPE}) |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 157 | if [ -z "$bsp_definition" ]; then |
| 158 | echo "$sccs" | grep -q defconfig |
| 159 | if [ $? -ne 0 ]; then |
| 160 | bbfatal_log "Could not locate BSP definition for ${KMACHINE}/${LINUX_KERNEL_TYPE} and no defconfig was provided" |
| 161 | fi |
| 162 | fi |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 163 | meta_dir=$(kgit --meta) |
| 164 | |
| 165 | # run1: pull all the configuration fragments, no matter where they come from |
| 166 | elements="`echo -n ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}`" |
| 167 | if [ -n "${elements}" ]; then |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 168 | echo "${bsp_definition}" > ${S}/${meta_dir}/bsp_definition |
| 169 | scc --force -o ${S}/${meta_dir}:cfg,merge,meta ${includes} ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES} |
Brad Bishop | 37a0e4d | 2017-12-04 01:01:44 -0500 | [diff] [blame] | 170 | if [ $? -ne 0 ]; then |
| 171 | bbfatal_log "Could not generate configuration queue for ${KMACHINE}." |
| 172 | fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 173 | fi |
| 174 | |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 175 | # run2: only generate patches for elements that have been passed on the SRC_URI |
| 176 | elements="`echo -n ${sccs} ${patches} ${KERNEL_FEATURES}`" |
| 177 | if [ -n "${elements}" ]; then |
| 178 | scc --force -o ${S}/${meta_dir}:patch --cmds patch ${includes} ${sccs} ${patches} ${KERNEL_FEATURES} |
Brad Bishop | 37a0e4d | 2017-12-04 01:01:44 -0500 | [diff] [blame] | 179 | if [ $? -ne 0 ]; then |
| 180 | bbfatal_log "Could not generate configuration queue for ${KMACHINE}." |
| 181 | fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 182 | fi |
| 183 | } |
| 184 | |
| 185 | do_patch() { |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 186 | set +e |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 187 | cd ${S} |
| 188 | |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 189 | check_git_config |
| 190 | meta_dir=$(kgit --meta) |
| 191 | (cd ${meta_dir}; ln -sf patch.queue series) |
| 192 | if [ -f "${meta_dir}/series" ]; then |
| 193 | kgit-s2q --gen -v --patches .kernel-meta/ |
| 194 | if [ $? -ne 0 ]; then |
| 195 | bberror "Could not apply patches for ${KMACHINE}." |
| 196 | bbfatal_log "Patch failures can be resolved in the linux source directory ${S})" |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 197 | fi |
| 198 | fi |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 199 | |
| 200 | if [ -f "${meta_dir}/merge.queue" ]; then |
| 201 | # we need to merge all these branches |
| 202 | for b in $(cat ${meta_dir}/merge.queue); do |
| 203 | git show-ref --verify --quiet refs/heads/${b} |
| 204 | if [ $? -eq 0 ]; then |
| 205 | bbnote "Merging branch ${b}" |
| 206 | git merge -q --no-ff -m "Merge branch ${b}" ${b} |
| 207 | else |
| 208 | bbfatal "branch ${b} does not exist, cannot merge" |
| 209 | fi |
| 210 | done |
| 211 | fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 212 | } |
| 213 | |
| 214 | do_kernel_checkout() { |
| 215 | set +e |
| 216 | |
| 217 | source_dir=`echo ${S} | sed 's%/$%%'` |
| 218 | source_workdir="${WORKDIR}/git" |
| 219 | if [ -d "${WORKDIR}/git/" ]; then |
Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 220 | # case: git repository |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 221 | # if S is WORKDIR/git, then we shouldn't be moving or deleting the tree. |
| 222 | if [ "${source_dir}" != "${source_workdir}" ]; then |
Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 223 | if [ -d "${source_workdir}/.git" ]; then |
| 224 | # regular git repository with .git |
| 225 | rm -rf ${S} |
| 226 | mv ${WORKDIR}/git ${S} |
| 227 | else |
| 228 | # create source for bare cloned git repository |
| 229 | git clone ${WORKDIR}/git ${S} |
| 230 | rm -rf ${WORKDIR}/git |
| 231 | fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 232 | fi |
| 233 | cd ${S} |
| 234 | else |
| 235 | # case: we have no git repository at all. |
| 236 | # To support low bandwidth options for building the kernel, we'll just |
| 237 | # convert the tree to a git repo and let the rest of the process work unchanged |
| 238 | |
| 239 | # if ${S} hasn't been set to the proper subdirectory a default of "linux" is |
| 240 | # used, but we can't initialize that empty directory. So check it and throw a |
| 241 | # clear error |
| 242 | |
| 243 | cd ${S} |
| 244 | if [ ! -f "Makefile" ]; then |
| 245 | bberror "S is not set to the linux source directory. Check " |
| 246 | bbfatal "the recipe and set S to the proper extracted subdirectory" |
| 247 | fi |
| 248 | rm -f .gitignore |
| 249 | git init |
| 250 | git add . |
| 251 | git commit -q -m "baseline commit: creating repo for ${PN}-${PV}" |
| 252 | git clean -d -f |
| 253 | fi |
| 254 | |
| 255 | # convert any remote branches to local tracking ones |
| 256 | for i in `git branch -a --no-color | grep remotes | grep -v HEAD`; do |
| 257 | b=`echo $i | cut -d' ' -f2 | sed 's%remotes/origin/%%'`; |
| 258 | git show-ref --quiet --verify -- "refs/heads/$b" |
| 259 | if [ $? -ne 0 ]; then |
| 260 | git branch $b $i > /dev/null |
| 261 | fi |
| 262 | done |
| 263 | |
| 264 | # Create a working tree copy of the kernel by checking out a branch |
| 265 | machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}" |
| 266 | |
| 267 | # checkout and clobber any unimportant files |
| 268 | git checkout -f ${machine_branch} |
| 269 | } |
| 270 | do_kernel_checkout[dirs] = "${S}" |
| 271 | |
| 272 | addtask kernel_checkout before do_kernel_metadata after do_unpack |
| 273 | addtask kernel_metadata after do_validate_branches do_unpack before do_patch |
| 274 | do_kernel_metadata[depends] = "kern-tools-native:do_populate_sysroot" |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 275 | do_validate_branches[depends] = "kern-tools-native:do_populate_sysroot" |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 276 | |
| 277 | do_kernel_configme[dirs] += "${S} ${B}" |
| 278 | do_kernel_configme() { |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 279 | set +e |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 280 | |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 281 | # translate the kconfig_mode into something that merge_config.sh |
| 282 | # understands |
| 283 | case ${KCONFIG_MODE} in |
| 284 | *allnoconfig) |
| 285 | config_flags="-n" |
| 286 | ;; |
| 287 | *alldefconfig) |
| 288 | config_flags="" |
| 289 | ;; |
| 290 | *) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 291 | if [ -f ${WORKDIR}/defconfig ]; then |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 292 | config_flags="-n" |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 293 | fi |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 294 | ;; |
| 295 | esac |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 296 | |
| 297 | cd ${S} |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 298 | |
| 299 | meta_dir=$(kgit --meta) |
| 300 | configs="$(scc --configs -o ${meta_dir})" |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 301 | if [ $? -ne 0 ]; then |
| 302 | bberror "${configs}" |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 303 | bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" |
| 304 | fi |
| 305 | |
| 306 | CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 307 | if [ $? -ne 0 ]; then |
| 308 | bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" |
| 309 | fi |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 310 | |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 311 | echo "# Global settings from linux recipe" >> ${B}/.config |
| 312 | echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config |
| 313 | } |
| 314 | |
| 315 | addtask kernel_configme before do_configure after do_patch |
| 316 | |
| 317 | python do_kernel_configcheck() { |
| 318 | import re, string, sys |
| 319 | |
| 320 | # if KMETA isn't set globally by a recipe using this routine, we need to |
| 321 | # set the default to 'meta'. Otherwise, kconf_check is not passed a valid |
| 322 | # meta-series for processing |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 323 | kmeta = d.getVar("KMETA") or "meta" |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 324 | if not os.path.exists(kmeta): |
| 325 | kmeta = "." + kmeta |
| 326 | |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 327 | pathprefix = "export PATH=%s:%s; " % (d.getVar('PATH'), "${S}/scripts/util/") |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 328 | |
| 329 | cmd = d.expand("scc --configs -o ${S}/.kernel-meta") |
| 330 | ret, configs = oe.utils.getstatusoutput("%s%s" % (pathprefix, cmd)) |
| 331 | |
| 332 | cmd = d.expand("cd ${S}; kconf_check --report -o ${S}/%s/cfg/ ${B}/.config ${S} %s" % (kmeta,configs)) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 333 | ret, result = oe.utils.getstatusoutput("%s%s" % (pathprefix, cmd)) |
| 334 | |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 335 | config_check_visibility = int(d.getVar("KCONF_AUDIT_LEVEL") or 0) |
| 336 | bsp_check_visibility = int(d.getVar("KCONF_BSP_AUDIT_LEVEL") or 0) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 337 | |
| 338 | # if config check visibility is non-zero, report dropped configuration values |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 339 | mismatch_file = d.expand("${S}/%s/cfg/mismatch.txt" % kmeta) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 340 | if os.path.exists(mismatch_file): |
| 341 | if config_check_visibility: |
| 342 | with open (mismatch_file, "r") as myfile: |
| 343 | results = myfile.read() |
| 344 | bb.warn( "[kernel config]: specified values did not make it into the kernel's final configuration:\n\n%s" % results) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 345 | } |
| 346 | |
| 347 | # Ensure that the branches (BSP and meta) are on the locations specified by |
| 348 | # their SRCREV values. If they are NOT on the right commits, the branches |
| 349 | # are corrected to the proper commit. |
| 350 | do_validate_branches() { |
| 351 | set +e |
| 352 | cd ${S} |
| 353 | |
| 354 | machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}" |
| 355 | machine_srcrev="${SRCREV_machine}" |
| 356 | |
| 357 | # if SRCREV is AUTOREV it shows up as AUTOINC there's nothing to |
| 358 | # check and we can exit early |
| 359 | if [ "${machine_srcrev}" = "AUTOINC" ]; then |
| 360 | bbnote "SRCREV validation is not required for AUTOREV" |
| 361 | elif [ "${machine_srcrev}" = "" ]; then |
| 362 | if [ "${SRCREV}" != "AUTOINC" ] && [ "${SRCREV}" != "INVALID" ]; then |
| 363 | # SRCREV_machine_<MACHINE> was not set. This means that a custom recipe |
| 364 | # that doesn't use the SRCREV_FORMAT "machine_meta" is being built. In |
| 365 | # this case, we need to reset to the give SRCREV before heading to patching |
| 366 | bbnote "custom recipe is being built, forcing SRCREV to ${SRCREV}" |
| 367 | force_srcrev="${SRCREV}" |
| 368 | fi |
| 369 | else |
| 370 | git cat-file -t ${machine_srcrev} > /dev/null |
| 371 | if [ $? -ne 0 ]; then |
| 372 | bberror "${machine_srcrev} is not a valid commit ID." |
| 373 | bbfatal_log "The kernel source tree may be out of sync" |
| 374 | fi |
| 375 | force_srcrev=${machine_srcrev} |
| 376 | fi |
| 377 | |
| 378 | git checkout -q -f ${machine_branch} |
| 379 | if [ -n "${force_srcrev}" ]; then |
| 380 | # see if the branch we are about to patch has been properly reset to the defined |
| 381 | # SRCREV .. if not, we reset it. |
| 382 | branch_head=`git rev-parse HEAD` |
| 383 | if [ "${force_srcrev}" != "${branch_head}" ]; then |
| 384 | current_branch=`git rev-parse --abbrev-ref HEAD` |
| 385 | git branch "$current_branch-orig" |
| 386 | git reset --hard ${force_srcrev} |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 387 | # We've checked out HEAD, make sure we cleanup kgit-s2q fence post check |
| 388 | # so the patches are applied as expected otherwise no patching |
| 389 | # would be done in some corner cases. |
| 390 | kgit-s2q --clean |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 391 | fi |
| 392 | fi |
| 393 | } |
| 394 | |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 395 | OE_TERMINAL_EXPORTS += "KBUILD_OUTPUT" |
| 396 | KBUILD_OUTPUT = "${B}" |
| 397 | |
| 398 | python () { |
| 399 | # If diffconfig is available, ensure it runs after kernel_configme |
| 400 | if 'do_diffconfig' in d: |
| 401 | bb.build.addtask('do_diffconfig', None, 'do_kernel_configme', d) |
| 402 | } |