Skip to content

Commit

Permalink
Merge pull request #252 from VisorFolks/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
shubhangi47 authored Nov 30, 2023
2 parents 3a53a42 + ee89b84 commit cd28431
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,6 @@ Connect with us over VisorFolks discord server: < [**JOIN**](https://discord.gg/
* linker script

### Help
Please visit [**Github Wiki**](https://github.com/VisorFolks/cyancore/wiki/)
For more information, please visit [**Github Wiki**](https://github.com/VisorFolks/cyancore/wiki/), here are few more links:
- [**Getting Started**](https://github.com/VisorFolks/cyancore/wiki/Getting-Started)
- [**QEMU Test**](https://github.com/VisorFolks/cyancore/wiki/qemu-test)
2 changes: 1 addition & 1 deletion mk/copy_to_remote.mk
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ SSH_PATH ?=
--cpremote: $(ELF)
@echo "< ! > Copying to remote ($(SSH_HOST))..."
ssh -p $(SSH_PORT) $(R_UNAME)@$(SSH_HOST) "mkdir -p $(SSH_PATH)/$(PROJECT)"
scp -r -P $(SSH_PORT) $(^:.elf=.*) $(R_UNAM)@$(SSH_HOST):$(SSH_PATH)/$(PROJECT)
scp -r -P $(SSH_PORT) $(^:.elf=.*) $(R_UNAME)@$(SSH_HOST):$(SSH_PATH)/$(PROJECT)

--rmremote:
@echo "< ! > Cleaning remote ($(SSH_HOST))..."
Expand Down
2 changes: 0 additions & 2 deletions mk/project.mk
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,10 @@ $(info < ! > Run `make list` to get list of projects)
$(error < x > Build Failed!)
endif

ifeq ($(findstring $(MAKECMDGOALS),$(T_ALLOWLIST)),)
include $(SRC)/sources.mk
include mk/tc.mk
include mk/copy_to_remote.mk
endif
endif

ifeq ($(findstring $(CMD),$(T_ALLOWLIST) $(P_TARGETS)),)
$(CMD): $(filter %/$(CMD),$(DEP_LIBS) $(DEP_OBJS))
Expand Down
3 changes: 2 additions & 1 deletion mk/qemu.mk
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,13 @@ $(QEMU_OUT_PATH): $(QEMU_PATH)
rm -rf $(QEMU_PATH)
@echo "< ! > Adding load_qemu alias to bashrc ..."
@echo "< ! > run 'load_qemu' before trying to launch qemu!"
echo "alias load_qemu='export PATH=\"\$$PATH\":$@/bin/'" >> ~/.bashrc
echo "alias load_qemu='export PATH=\"\$$PATH\":$@/bin/'" >> ~/.bash_aliases
@echo "< / > Done !"

clean_qemu:
@echo "< ! > Removing cc-qemu installation ..."
rm -rf $(QEMU_OUT_PATH) $(QEMU_PATH)
sed "/cc_qemu/d" -i ~/.bash_aliases
@echo "< / > Done!"

qemu_test:
Expand Down

0 comments on commit cd28431

Please sign in to comment.