jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rectif port telnet

Browse source
This commit is contained in:
wescande 2018-02-09 14:54:01 +01:00
parent 56c937e620
commit be1b0def36
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
kernel-rs/Makefile
View file

@ -1,8 +1,16 @@
SHELL := /bin/bash
ifeq ($(shell whoami), william)
PORT := 4321
else
PORT := 1234
endif
project := bluesnow project := bluesnow
arch ?= x86 arch ?= x86
NASM := nasm -f elf NASM := nasm -f elf
LD := ld -m elf_i386 -n --gc-sections LD := ld -m elf_i386 -n --gc-sections
QEMU := qemu-system-x86_64 -enable-kvm -monitor telnet:127.0.0.1:1234,server,nowait QEMU := qemu-system-x86_64 -enable-kvm -monitor telnet:127.0.0.1:$(PORT),server,nowait
kernel := build/kernel-$(arch).bin kernel := build/kernel-$(arch).bin
iso := build/os-$(arch).iso iso := build/os-$(arch).iso
@ -10,7 +18,6 @@ DIRISO := build/isofiles
target ?= $(arch)-$(project) target ?= $(arch)-$(project)
rust_os := target/$(target)/debug/lib$(project).a rust_os := target/$(target)/debug/lib$(project).a
SHELL := /bin/bash
linker_script := src/arch/$(arch)/linker.ld linker_script := src/arch/$(arch)/linker.ld
grub.cfg := src/arch/$(arch)/grub.cfg grub.cfg := src/arch/$(arch)/grub.cfg
@ -34,7 +41,7 @@ $(iso): $(kernel) $(grub.cfg) Makefile
run: $(iso) Makefile run: $(iso) Makefile
@tmux info >&- || { echo -e "\033[38;5;16m ~~ NOT IN A VALID TMUX SESSION ~~\033[0m" ; exit 1; } @tmux info >&- || { echo -e "\033[38;5;16m ~~ NOT IN A VALID TMUX SESSION ~~\033[0m" ; exit 1; }
@tmux split-window "tmux resize-pane -y 20; sleep 0.5; telnet 127.0.0.1 1234" @tmux split-window "tmux resize-pane -y 20; sleep 0.5; telnet 127.0.0.1 $(PORT)"
@$(QEMU) -curses -cdrom $(iso) @$(QEMU) -curses -cdrom $(iso)
clean: clean: