summaryrefslogtreecommitdiff
path: root/scripts/create-pull-request
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2012-05-08 23:42:24 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-09 20:40:51 +0100
commitbd794b92d12ceda2728520701e980b7a3cabd23d (patch)
tree962167b153ebde256d1e7b1a0cbe774f263cad93 /scripts/create-pull-request
parent87249372b4a9951f9e4dc6acece950718382a164 (diff)
downloadopenembedded-core-bd794b92d12ceda2728520701e980b7a3cabd23d.tar.gz
openembedded-core-bd794b92d12ceda2728520701e980b7a3cabd23d.tar.bz2
openembedded-core-bd794b92d12ceda2728520701e980b7a3cabd23d.tar.xz
openembedded-core-bd794b92d12ceda2728520701e980b7a3cabd23d.zip
kern-tools: fix do_patch errors
The linux-yocto repository and scripts can support a mode of meta data management that merges a base meta branch to every BSP branch. In this case, the scripts don't have to restore a checkpoint for the meta data to be globally accessible. The decision to restore or not is made based on whether or not the meta branch is part of all branches or not. The linux-yocto recipes have a sanity check to determine if the requested SRCREV for meta data matches the head of the meta branch (via do_validate_branches). If the wrong commit is at the head, the meta branch is moved aside and the branch reset to the right commit. This creates two meta branches that contain the base meta data. The test for integrated meta data mistakes this for a globally merged set of meta data and doesn't restore the checkpoint, which leads to build failures. The immediate fix is to allow two branches to have the meta data. The long term fix is to make the detection only consider if the build branch contains the meta data. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'scripts/create-pull-request')
0 files changed, 0 insertions, 0 deletions
href='#n117'>117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393