-
Notifications
You must be signed in to change notification settings - Fork 51
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into qemu-network
Merging final parallelJobs files in to avoid duplicate commits + other master changes
- Loading branch information
Showing
3 changed files
with
13 additions
and
6 deletions.
There are no files selected for viewing
Submodule riscv-pk
updated
from 5d9ed2 to 0d3339
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,6 @@ | ||
#!/bin/bash | ||
set -e | ||
|
||
if [ ! -d linux ]; then | ||
rsync --exclude ".git" -r ../../boards/default/linux . | ||
patch linux/kernel/reboot.c < test.patch | ||
fi | ||
rsync --exclude ".git" -r ../../boards/default/linux . | ||
# rsync --exclude ".git" -r ./deleteme/linux . | ||
patch linux/kernel/reboot.c < test.patch |