From bb303088aa2ed0693e19e93158155dd85783ce76 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Sat, 29 Nov 2025 17:35:23 -0500 Subject: chore: pack scripts into a directory. Signed-off-by: Amlal El Mahrouss --- .github/workflows/kernel-ahci-dev.yml | 2 +- .github/workflows/kernel-ahci.yml | 2 +- .github/workflows/kernel-pio-dev.yml | 2 +- .github/workflows/kernel-pio.yml | 2 +- README.md | 6 +++--- debug_ahci_arm64.sh | 16 ---------------- debug_ahci_x64.sh | 16 ---------------- debug_ata_x64.sh | 16 ---------------- format.sh | 10 ---------- gdb.sh | 3 --- kernel_ci_x64.sh | 9 --------- lldb.sh | 5 ----- modules_ahci_x64.sh | 11 ----------- modules_pio_x64.sh | 11 ----------- release_ahci_x64.sh | 13 ------------- release_ata_x64.sh | 13 ------------- scripts/debug_ahci_arm64.sh | 16 ++++++++++++++++ scripts/debug_ahci_x64.sh | 16 ++++++++++++++++ scripts/debug_ata_x64.sh | 16 ++++++++++++++++ scripts/format.sh | 10 ++++++++++ scripts/gdb.sh | 3 +++ scripts/kernel_ci_x64.sh | 9 +++++++++ scripts/lldb.sh | 5 +++++ scripts/modules_ahci_x64.sh | 11 +++++++++++ scripts/modules_pio_x64.sh | 11 +++++++++++ scripts/release_ahci_x64.sh | 13 +++++++++++++ scripts/release_ata_x64.sh | 13 +++++++++++++ scripts/setup_arm64_project.sh | 5 +++++ scripts/setup_x64_project.sh | 16 ++++++++++++++++ setup_arm64_project.sh | 5 ----- setup_x64_project.sh | 16 ---------------- 31 files changed, 151 insertions(+), 151 deletions(-) delete mode 100755 debug_ahci_arm64.sh delete mode 100755 debug_ahci_x64.sh delete mode 100755 debug_ata_x64.sh delete mode 100755 format.sh delete mode 100755 gdb.sh delete mode 100755 kernel_ci_x64.sh delete mode 100755 lldb.sh delete mode 100755 modules_ahci_x64.sh delete mode 100755 modules_pio_x64.sh delete mode 100755 release_ahci_x64.sh delete mode 100755 release_ata_x64.sh create mode 100755 scripts/debug_ahci_arm64.sh create mode 100755 scripts/debug_ahci_x64.sh create mode 100755 scripts/debug_ata_x64.sh create mode 100755 scripts/format.sh create mode 100755 scripts/gdb.sh create mode 100755 scripts/kernel_ci_x64.sh create mode 100755 scripts/lldb.sh create mode 100755 scripts/modules_ahci_x64.sh create mode 100755 scripts/modules_pio_x64.sh create mode 100755 scripts/release_ahci_x64.sh create mode 100755 scripts/release_ata_x64.sh create mode 100755 scripts/setup_arm64_project.sh create mode 100755 scripts/setup_x64_project.sh delete mode 100755 setup_arm64_project.sh delete mode 100755 setup_x64_project.sh diff --git a/.github/workflows/kernel-ahci-dev.yml b/.github/workflows/kernel-ahci-dev.yml index 4c7b04d9..4b91edf6 100644 --- a/.github/workflows/kernel-ahci-dev.yml +++ b/.github/workflows/kernel-ahci-dev.yml @@ -15,4 +15,4 @@ jobs: - uses: actions/checkout@v4 - name: Build CI run: sudo curl https://github.com/nekernel-org/nebuild/releases/download/v0.0.6-apple-m1/nebuild-debian -o /bin/nebuild && sudo chmod +x /bin/nebuild && sudo apt update && sudo apt install mingw-w64 qemu-utils nasm && - ./modules_ahci_x64.sh && ./setup_x64_project.sh && ./kernel_ci_x64.sh \ No newline at end of file + ./scripts/modules_ahci_x64.sh && ./scripts/setup_x64_project.sh && ./scripts/kernel_ci_x64.sh \ No newline at end of file diff --git a/.github/workflows/kernel-ahci.yml b/.github/workflows/kernel-ahci.yml index 77e8db74..0afd32ea 100644 --- a/.github/workflows/kernel-ahci.yml +++ b/.github/workflows/kernel-ahci.yml @@ -15,5 +15,5 @@ jobs: - uses: actions/checkout@v4 - name: Build CI run: sudo curl https://github.com/nekernel-org/nebuild/releases/download/v0.0.6-apple-m1/nebuild-debian -o /bin/nebuild && sudo chmod +x /bin/nebuild && sudo apt update && sudo apt install mingw-w64 qemu-utils nasm && - ./modules_ahci_x64.sh && ./setup_x64_project.sh && ./kernel_ci_x64.sh + ./scripts/modules_ahci_x64.sh && ./scripts/setup_x64_project.sh && ./scripts/kernel_ci_x64.sh diff --git a/.github/workflows/kernel-pio-dev.yml b/.github/workflows/kernel-pio-dev.yml index a768c0ce..50babd11 100644 --- a/.github/workflows/kernel-pio-dev.yml +++ b/.github/workflows/kernel-pio-dev.yml @@ -15,5 +15,5 @@ jobs: - uses: actions/checkout@v4 - name: Build CI run: sudo curl https://github.com/nekernel-org/nebuild/releases/download/v0.0.6-apple-m1/nebuild-debian -o /bin/nebuild && sudo chmod +x /bin/nebuild && sudo apt update && sudo apt install mingw-w64 qemu-utils nasm && - ./modules_pio_x64.sh && ./setup_x64_project.sh && ./kernel_ci_x64.sh + ./scripts/modules_pio_x64.sh && ./scripts/setup_x64_project.sh && ./scripts/kernel_ci_x64.sh \ No newline at end of file diff --git a/.github/workflows/kernel-pio.yml b/.github/workflows/kernel-pio.yml index 5037ae2b..4e3621ca 100644 --- a/.github/workflows/kernel-pio.yml +++ b/.github/workflows/kernel-pio.yml @@ -15,5 +15,5 @@ jobs: - uses: actions/checkout@v4 - name: Build CI run: sudo curl https://github.com/nekernel-org/nebuild/releases/download/v0.0.6-apple-m1/nebuild-debian -o /bin/nebuild && sudo chmod +x /bin/nebuild && sudo apt update && sudo apt install mingw-w64 qemu-utils nasm && - ./modules_pio_x64.sh && ./setup_x64_project.sh && ./kernel_ci_x64.sh + ./scripts/modules_pio_x64.sh && ./scripts/setup_x64_project.sh && ./scripts/kernel_ci_x64.sh \ No newline at end of file diff --git a/README.md b/README.md index c1f63740..39010c9e 100644 --- a/README.md +++ b/README.md @@ -60,9 +60,9 @@ ```sh git clone https://github.com/nekernel-org/nekernel.git cd nekernel -./setup_x64_project.sh -./modules_ahci_x64.sh -./debug_ahci_x64.sh # For generic ATA PIO target (QEMU) +./scripts/setup_x64_project.sh +./scripts/modules_ahci_x64.sh +./scripts/debug_ahci_x64.sh # For generic ATA PIO target (QEMU) ``` - For ARM64 or other targets, see the scripts in `src/boot/`. diff --git a/debug_ahci_arm64.sh b/debug_ahci_arm64.sh deleted file mode 100755 index dcf4f145..00000000 --- a/debug_ahci_arm64.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -export AHCI_SUPPORT=1 -export ATA_PIO_SUPPORT= -export ATA_DMA_SUPPORT= -export DEBUG_SUPPORT=1 - -cd src/kernel -make -f arm64-desktop.make all -cd ../boot -make -f arm64-desktop.make all -make -f arm64-desktop.make disk -cd ../../ -./tools/mk_img.py ./src/boot/src/nekernel-esp.img ./src/boot/src/root -cd src/boot -make -f arm64-desktop.make run-efi-arm64 diff --git a/debug_ahci_x64.sh b/debug_ahci_x64.sh deleted file mode 100755 index 8e1ed083..00000000 --- a/debug_ahci_x64.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -export AHCI_SUPPORT=1 -export ATA_PIO_SUPPORT= -export ATA_DMA_SUPPORT= -export DEBUG_SUPPORT=1 - -cd src/kernel -make -f amd64-desktop.make all -cd ../boot -make -f amd64-desktop.make all -make -f amd64-desktop.make disk -cd ../../ -./tools/mk_img.py ./src/boot/src/nekernel-esp.img ./src/boot/src/root -cd src/boot -make -f amd64-desktop.make run-efi-amd64-ahci \ No newline at end of file diff --git a/debug_ata_x64.sh b/debug_ata_x64.sh deleted file mode 100755 index dc133614..00000000 --- a/debug_ata_x64.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -export AHCI_SUPPORT= -export ATA_PIO_SUPPORT=1 -export ATA_DMA_SUPPORT= -export DEBUG_SUPPORT=1 - -cd src/kernel -make -f amd64-desktop.make all -cd ../boot -make -f amd64-desktop.make all -make -f amd64-desktop.make disk -cd ../../ -./tools/mk_img.py ./src/boot/src/nekernel-esp.img ./src/boot/src/root -cd src/boot -make -f amd64-desktop.make run-efi-amd64-ata-pio diff --git a/format.sh b/format.sh deleted file mode 100755 index f36943cd..00000000 --- a/format.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -THIS_PATH="$(realpath "$0")" -THIS_DIR="$(dirname "$THIS_PATH")" - -FILE_LIST="$(find "$THIS_DIR" | grep -E ".*(\.cc|\.c|\.h|\.inl)$")" - -echo -e "Files found to format = \n\"\"\"\n$FILE_LIST\n\"\"\"" - -clang-format --verbose -i --style=file $FILE_LIST diff --git a/gdb.sh b/gdb.sh deleted file mode 100755 index f908da16..00000000 --- a/gdb.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -gdb -q -x src/boot/gdbinit diff --git a/kernel_ci_x64.sh b/kernel_ci_x64.sh deleted file mode 100755 index 42f61636..00000000 --- a/kernel_ci_x64.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -export AHCI_SUPPORT=1 -export ATA_PIO_SUPPORT= -export ATA_DMA_SUPPORT= -export DEBUG_SUPPORT=1 - -cd src/kernel -make -f amd64-desktop.make all diff --git a/lldb.sh b/lldb.sh deleted file mode 100755 index 070197aa..00000000 --- a/lldb.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -# Connect to QEMU's debug server, same as boot/gdbinit -lldb -o "gdb-remote 1234" - diff --git a/modules_ahci_x64.sh b/modules_ahci_x64.sh deleted file mode 100755 index aabb00bd..00000000 --- a/modules_ahci_x64.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -# LOG HISTORY: -# 03/25/25: Add 'disk' build step. -# 04/05/25: Improve and fix script. - -cd src/boot/modules/SysChk -nebuild amd64-ahci-epm.json -cd ../ -cd BootNet -nebuild amd64.json \ No newline at end of file diff --git a/modules_pio_x64.sh b/modules_pio_x64.sh deleted file mode 100755 index 0cf1395d..00000000 --- a/modules_pio_x64.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -# LOG HISTORY: -# 03/25/25: Add 'disk' build step. -# 04/05/25: Improve and fix script. - -cd src/boot/modules/SysChk -nebuild amd64-pio-epm.json -cd ../ -cd BootNet -nebuild amd64.json \ No newline at end of file diff --git a/release_ahci_x64.sh b/release_ahci_x64.sh deleted file mode 100755 index bd6e11aa..00000000 --- a/release_ahci_x64.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -export AHCI_SUPPORT=1 - -cd src/kernel -make -f amd64-desktop.make all -cd ../boot -make -f amd64-desktop.make all -make -f amd64-desktop.make disk -cd ../../ -./tools/mk_img.py ./src/boot/src/nekernel-esp.img ./src/boot/src/root -cd src/boot -make -f amd64-desktop.make run-efi-amd64-ahci \ No newline at end of file diff --git a/release_ata_x64.sh b/release_ata_x64.sh deleted file mode 100755 index 2a2fc8b4..00000000 --- a/release_ata_x64.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -export ATA_PIO_SUPPORT=1 - -cd src/kernel -make -f amd64-desktop.make all -cd ../boot -make -f amd64-desktop.make all -make -f amd64-desktop.make disk -cd ../../ -./tools/mk_img.py ./src/boot/src/nekernel-esp.img ./src/boot/src/root -cd src/boot -make -f amd64-desktop.make run-efi-amd64-ata-pio \ No newline at end of file diff --git a/scripts/debug_ahci_arm64.sh b/scripts/debug_ahci_arm64.sh new file mode 100755 index 00000000..dcf4f145 --- /dev/null +++ b/scripts/debug_ahci_arm64.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +export AHCI_SUPPORT=1 +export ATA_PIO_SUPPORT= +export ATA_DMA_SUPPORT= +export DEBUG_SUPPORT=1 + +cd src/kernel +make -f arm64-desktop.make all +cd ../boot +make -f arm64-desktop.make all +make -f arm64-desktop.make disk +cd ../../ +./tools/mk_img.py ./src/boot/src/nekernel-esp.img ./src/boot/src/root +cd src/boot +make -f arm64-desktop.make run-efi-arm64 diff --git a/scripts/debug_ahci_x64.sh b/scripts/debug_ahci_x64.sh new file mode 100755 index 00000000..8e1ed083 --- /dev/null +++ b/scripts/debug_ahci_x64.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +export AHCI_SUPPORT=1 +export ATA_PIO_SUPPORT= +export ATA_DMA_SUPPORT= +export DEBUG_SUPPORT=1 + +cd src/kernel +make -f amd64-desktop.make all +cd ../boot +make -f amd64-desktop.make all +make -f amd64-desktop.make disk +cd ../../ +./tools/mk_img.py ./src/boot/src/nekernel-esp.img ./src/boot/src/root +cd src/boot +make -f amd64-desktop.make run-efi-amd64-ahci \ No newline at end of file diff --git a/scripts/debug_ata_x64.sh b/scripts/debug_ata_x64.sh new file mode 100755 index 00000000..dc133614 --- /dev/null +++ b/scripts/debug_ata_x64.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +export AHCI_SUPPORT= +export ATA_PIO_SUPPORT=1 +export ATA_DMA_SUPPORT= +export DEBUG_SUPPORT=1 + +cd src/kernel +make -f amd64-desktop.make all +cd ../boot +make -f amd64-desktop.make all +make -f amd64-desktop.make disk +cd ../../ +./tools/mk_img.py ./src/boot/src/nekernel-esp.img ./src/boot/src/root +cd src/boot +make -f amd64-desktop.make run-efi-amd64-ata-pio diff --git a/scripts/format.sh b/scripts/format.sh new file mode 100755 index 00000000..f36943cd --- /dev/null +++ b/scripts/format.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +THIS_PATH="$(realpath "$0")" +THIS_DIR="$(dirname "$THIS_PATH")" + +FILE_LIST="$(find "$THIS_DIR" | grep -E ".*(\.cc|\.c|\.h|\.inl)$")" + +echo -e "Files found to format = \n\"\"\"\n$FILE_LIST\n\"\"\"" + +clang-format --verbose -i --style=file $FILE_LIST diff --git a/scripts/gdb.sh b/scripts/gdb.sh new file mode 100755 index 00000000..f908da16 --- /dev/null +++ b/scripts/gdb.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +gdb -q -x src/boot/gdbinit diff --git a/scripts/kernel_ci_x64.sh b/scripts/kernel_ci_x64.sh new file mode 100755 index 00000000..42f61636 --- /dev/null +++ b/scripts/kernel_ci_x64.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +export AHCI_SUPPORT=1 +export ATA_PIO_SUPPORT= +export ATA_DMA_SUPPORT= +export DEBUG_SUPPORT=1 + +cd src/kernel +make -f amd64-desktop.make all diff --git a/scripts/lldb.sh b/scripts/lldb.sh new file mode 100755 index 00000000..070197aa --- /dev/null +++ b/scripts/lldb.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +# Connect to QEMU's debug server, same as boot/gdbinit +lldb -o "gdb-remote 1234" + diff --git a/scripts/modules_ahci_x64.sh b/scripts/modules_ahci_x64.sh new file mode 100755 index 00000000..aabb00bd --- /dev/null +++ b/scripts/modules_ahci_x64.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +# LOG HISTORY: +# 03/25/25: Add 'disk' build step. +# 04/05/25: Improve and fix script. + +cd src/boot/modules/SysChk +nebuild amd64-ahci-epm.json +cd ../ +cd BootNet +nebuild amd64.json \ No newline at end of file diff --git a/scripts/modules_pio_x64.sh b/scripts/modules_pio_x64.sh new file mode 100755 index 00000000..0cf1395d --- /dev/null +++ b/scripts/modules_pio_x64.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +# LOG HISTORY: +# 03/25/25: Add 'disk' build step. +# 04/05/25: Improve and fix script. + +cd src/boot/modules/SysChk +nebuild amd64-pio-epm.json +cd ../ +cd BootNet +nebuild amd64.json \ No newline at end of file diff --git a/scripts/release_ahci_x64.sh b/scripts/release_ahci_x64.sh new file mode 100755 index 00000000..bd6e11aa --- /dev/null +++ b/scripts/release_ahci_x64.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +export AHCI_SUPPORT=1 + +cd src/kernel +make -f amd64-desktop.make all +cd ../boot +make -f amd64-desktop.make all +make -f amd64-desktop.make disk +cd ../../ +./tools/mk_img.py ./src/boot/src/nekernel-esp.img ./src/boot/src/root +cd src/boot +make -f amd64-desktop.make run-efi-amd64-ahci \ No newline at end of file diff --git a/scripts/release_ata_x64.sh b/scripts/release_ata_x64.sh new file mode 100755 index 00000000..2a2fc8b4 --- /dev/null +++ b/scripts/release_ata_x64.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +export ATA_PIO_SUPPORT=1 + +cd src/kernel +make -f amd64-desktop.make all +cd ../boot +make -f amd64-desktop.make all +make -f amd64-desktop.make disk +cd ../../ +./tools/mk_img.py ./src/boot/src/nekernel-esp.img ./src/boot/src/root +cd src/boot +make -f amd64-desktop.make run-efi-amd64-ata-pio \ No newline at end of file diff --git a/scripts/setup_arm64_project.sh b/scripts/setup_arm64_project.sh new file mode 100755 index 00000000..668ca0a8 --- /dev/null +++ b/scripts/setup_arm64_project.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +cd src/boot +make -f arm64-desktop.make efi +make -f arm64-desktop.make epm-img \ No newline at end of file diff --git a/scripts/setup_x64_project.sh b/scripts/setup_x64_project.sh new file mode 100755 index 00000000..eb145faf --- /dev/null +++ b/scripts/setup_x64_project.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +# LOG HISTORY: +# 03/25/25: Add 'disk' build step. +# 04/05/25: Improve and fix script. + +cd src/libSystem +cd src +make libsys_asm_io_x64 +cd .. +nebuild libSystem.json +cd ../ddk +nebuild ddk.json +cd ../boot +make -f amd64-desktop.make efi +make -f amd64-desktop.make epm-img diff --git a/setup_arm64_project.sh b/setup_arm64_project.sh deleted file mode 100755 index 668ca0a8..00000000 --- a/setup_arm64_project.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -cd src/boot -make -f arm64-desktop.make efi -make -f arm64-desktop.make epm-img \ No newline at end of file diff --git a/setup_x64_project.sh b/setup_x64_project.sh deleted file mode 100755 index eb145faf..00000000 --- a/setup_x64_project.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -# LOG HISTORY: -# 03/25/25: Add 'disk' build step. -# 04/05/25: Improve and fix script. - -cd src/libSystem -cd src -make libsys_asm_io_x64 -cd .. -nebuild libSystem.json -cd ../ddk -nebuild ddk.json -cd ../boot -make -f amd64-desktop.make efi -make -f amd64-desktop.make epm-img -- cgit v1.2.3