meta: rename kernel to Magenta
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
cmake_minimum_required(VERSION 3.13)
|
||||
project(mango-tools C)
|
||||
project(magenta-tools C)
|
||||
|
||||
set(tool_dirs e64patch)
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@ floppy_bootsig_check: disabled=0
|
||||
floppya: type=1_44
|
||||
# no floppyb
|
||||
ata0: enabled=true, ioaddr1=0x1f0, ioaddr2=0x3f0, irq=14
|
||||
ata0-master: type=cdrom, path="build/mango-kernel.iso", status=inserted, model="Generic 1234", biosdetect=auto
|
||||
ata0-master: type=cdrom, path="build/magenta-kernel.iso", status=inserted, model="Generic 1234", biosdetect=auto
|
||||
ata0-slave: type=none
|
||||
ata1: enabled=true, ioaddr1=0x170, ioaddr2=0x370, irq=15
|
||||
ata1-master: type=none
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
menuentry "Mango Kernel" {
|
||||
multiboot /boot/mango_kernel
|
||||
menuentry "Magenta Kernel" {
|
||||
multiboot /boot/magenta_kernel
|
||||
boot
|
||||
}
|
||||
|
||||
@@ -5,9 +5,9 @@ lldb_cfg=$2
|
||||
shift 2
|
||||
|
||||
if command -v gdb &> /dev/null; then
|
||||
printf " \033[93;1mGDB\033[0m boot/mango_kernel\n"
|
||||
printf " \033[93;1mGDB\033[0m boot/magenta_kernel\n"
|
||||
tmux \
|
||||
new-session -d -s mango-debug "sleep 0.3; gdb -tui -x $gdb_cfg" \; \
|
||||
new-session -d -s magenta-debug "sleep 0.3; gdb -tui -x $gdb_cfg" \; \
|
||||
split-window -h -l 80 \; \
|
||||
split-window -v -l 25 "$@"\; \
|
||||
select-pane -t 1 \; \
|
||||
@@ -15,9 +15,9 @@ if command -v gdb &> /dev/null; then
|
||||
select-pane -t 0
|
||||
|
||||
elif command -v lldb &> /dev/null; then
|
||||
printf " \033[93;1mLLDB\033[0m boot/mango_kernel\n"
|
||||
printf " \033[93;1mLLDB\033[0m boot/magenta_kernel\n"
|
||||
tmux \
|
||||
new-session -d -s mango-debug "sleep 0.1; lldb --source $lldb_cfg" \; \
|
||||
new-session -d -s magenta-debug "sleep 0.1; lldb --source $lldb_cfg" \; \
|
||||
split-window -h -l 160 \; \
|
||||
split-window -v -l 25 "$@"\; \
|
||||
select-pane -t 1 \; \
|
||||
@@ -28,6 +28,6 @@ else
|
||||
exit -1
|
||||
fi
|
||||
|
||||
tmux a -t mango-debug
|
||||
tmux kill-session -t mango-debug
|
||||
tmux a -t magenta-debug
|
||||
tmux kill-session -t magenta-debug
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
set confirm off
|
||||
symbol-file mango_kernel.debug
|
||||
symbol-file magenta_kernel.debug
|
||||
target remote localhost:1234
|
||||
set confirm on
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
file mango_kernel.debug
|
||||
file magenta_kernel.debug
|
||||
gdb-remote localhost:1234
|
||||
|
||||
@@ -116,7 +116,7 @@ def choice_options(num_devices):
|
||||
return '1-{}'.format(num_devices)
|
||||
|
||||
|
||||
if not os.path.isfile('build/mango-kernel.iso'):
|
||||
if not os.path.isfile('build/magenta-kernel.iso'):
|
||||
print('No system ISO image found.')
|
||||
print('Please run \'make cd\' to generate an ISO image')
|
||||
exit(-1)
|
||||
@@ -157,7 +157,7 @@ disk_prewrite(devices[choice][0])
|
||||
dd_args = [
|
||||
'sudo',
|
||||
'dd',
|
||||
'if=build/mango-kernel.iso',
|
||||
'if=build/magenta-kernel.iso',
|
||||
'of={}'.format(devices[choice][0]),
|
||||
'bs=1{}'.format('m' if sys.platform == 'darwin' else 'M')
|
||||
]
|
||||
@@ -7,22 +7,22 @@ import sys
|
||||
import os
|
||||
import shutil
|
||||
|
||||
kernel_src_path = os.path.join('build', 'mango_kernel')
|
||||
kernel_src_path = os.path.join('build', 'magenta_kernel')
|
||||
grub_cfg_src_path = os.path.join('tools', 'boot-image', 'grub.cfg')
|
||||
iso_build_dir = os.path.join('build', 'mango-kernel.iso-build')
|
||||
iso_path = os.path.join('build', 'mango-kernel.iso')
|
||||
iso_build_dir = os.path.join('build', 'magenta-kernel.iso-build')
|
||||
iso_path = os.path.join('build', 'magenta-kernel.iso')
|
||||
|
||||
|
||||
def in_source_tree():
|
||||
return os.path.isfile('tools/mango.sync')
|
||||
return os.path.isfile('tools/magenta.sync')
|
||||
|
||||
|
||||
if not in_source_tree():
|
||||
print('This script must be executed from the root of the Mango source tree')
|
||||
print('This script must be executed from the root of the Magenta source tree')
|
||||
exit(-1)
|
||||
|
||||
if not os.path.isdir('build'):
|
||||
print('Please build the Mango kernel before using this tool')
|
||||
print('Please build the Magenta kernel before using this tool')
|
||||
exit(-1)
|
||||
|
||||
if os.path.isdir(iso_build_dir):
|
||||
@@ -33,7 +33,7 @@ os.mkdir(iso_build_dir)
|
||||
os.mkdir(os.path.join(iso_build_dir, 'boot'))
|
||||
os.mkdir(os.path.join(iso_build_dir, 'boot', 'grub'))
|
||||
|
||||
shutil.copyfile(kernel_src_path, os.path.join(iso_build_dir, 'boot', 'mango_kernel'))
|
||||
shutil.copyfile(kernel_src_path, os.path.join(iso_build_dir, 'boot', 'magenta_kernel'))
|
||||
shutil.copyfile(grub_cfg_src_path, os.path.join(iso_build_dir, 'boot', 'grub', 'grub.cfg'))
|
||||
|
||||
subprocess.run(['grub-mkrescue', '-o', iso_path, iso_build_dir])
|
||||
@@ -16,7 +16,7 @@ rsync_path = os.getenv('RSYNC_PATH', default = 'rsync')
|
||||
|
||||
|
||||
def in_source_tree():
|
||||
return os.path.isfile('tools/mango.sync')
|
||||
return os.path.isfile('tools/magenta.sync')
|
||||
|
||||
|
||||
def create_sample_config():
|
||||
@@ -78,7 +78,7 @@ def print_available_targets(targets):
|
||||
|
||||
|
||||
if not in_source_tree():
|
||||
print('This script must be executed from the root of the Mango source tree')
|
||||
print('This script must be executed from the root of the Magenta source tree')
|
||||
exit(-1)
|
||||
|
||||
config = read_config()
|
||||
Reference in New Issue
Block a user