maxpeterkaya/LicheeRV-Nano-Build
1
0
Fork 0
Code Issues 53 Pull requests 9 Projects Releases 43 Packages Wiki Activity Actions

Add NanoKVM support #44

Open
scpcom wants to merge 201 commits from scpcom/nanokvm into main
pull from: scpcom/nanokvm
merge into: maxpeterkaya:main
Conversation 0 Commits 201 Files changed 89 +2997 -65
scpcom commented 2024-09-01 10:12:44 -04:00 (Migrated from github.com)
Copy link

This will add the nanokvm app to the buildroot and some init script enhancements to build an image for NanoKVM.
The init scripts can be controlled by adding the files /boot.usb.hid and /boot/usb.disk0.
Currently I did not want to add an extra defconfig, I use this build script (not included in the pull request) to run the nanokvm build:
https://raw.githubusercontent.com/scpcom/LicheeRV-Nano-Build/develop/build-nanokvm.sh

This will add the nanokvm app to the buildroot and some init script enhancements to build an image for NanoKVM. The init scripts can be controlled by adding the files /boot.usb.hid and /boot/usb.disk0. Currently I did not want to add an extra defconfig, I use this build script (not included in the pull request) to run the nanokvm build: https://raw.githubusercontent.com/scpcom/LicheeRV-Nano-Build/develop/build-nanokvm.sh
This pull request has changes conflicting with the target branch.
  • buildroot/configs/cvitek_SG200X_musl_riscv64_defconfig
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin scpcom/nanokvm:scpcom/nanokvm
git switch scpcom/nanokvm

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff scpcom/nanokvm
git switch scpcom/nanokvm
git rebase main
git switch main
git merge --ff-only scpcom/nanokvm
git switch scpcom/nanokvm
git rebase main
git switch main
git merge --no-ff scpcom/nanokvm
git switch main
git merge --squash scpcom/nanokvm
git switch main
git merge --ff-only scpcom/nanokvm
git switch main
git merge scpcom/nanokvm
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug
Something isn't working

  
documentation
Improvements or additions to documentation

  
duplicate
This issue or pull request already exists

  
enhancement
New feature or request

  
good first issue
Good for newcomers

  
help wanted
Extra attention is needed

  
invalid
This doesn't seem right

  
question
Further information is requested

  
wontfix
This will not be worked on

No labels
bug
documentation
duplicate
enhancement
good first issue
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
maxpeterkaya/LicheeRV-Nano-Build!44
No description provided.