Revision 82b6a25c kernel/kernelsetup.sh

View differences:

kernel/kernelsetup.sh
502 502
    cd $chibiosdir
503 503
    git checkout -b "$git_branch_patched" 2>&1 | tee -a $LOG_FILE
504 504
    for patch in $patches; do
505
      cp $patch .
506
      patch=$(basename $patch)
507
      printInfo "applying ${patch}...\n"
505
      printInfo "applying $(basename ${patch})...\n"
508 506
      git apply --whitespace=nowarn --ignore-space-change --ignore-whitespace < $patch 2>&1 | tee -a $LOG_FILE
509
      rm $patch
510 507
#      # These lines are disabled for safety reasons:
511 508
#      #   Filed commits are detected as valid changes by the super-project.
512
#      #   This may lead to errorneous updates of the super-project, as to point to one of these commit hashes.
509
#      #   This would lead to errorneous updates of the super-project, so to point to one of those (local) commits.
513 510
#      #   Since these commits are not pushed upstream, initialization of the super-project will therefore fail, because
514
#      #   the referenced hashed (after patching) do not exist in a clean copy of this sub-project.
511
#      #   the referenced hashes (after patching) do not exist in a clean copy of this sub-project.
515 512
#      git add $(git ls-files -dmo --exclude-standard --exclude=/doc) $(git diff --name-only) 2>&1 | tee -a $LOG_FILE
516 513
#      git commit --message="$patch applied" 2>&1 | tee -a $LOG_FILE
517 514
    done

Also available in: Unified diff