cleanup

Author: AsakuraMizu

.github/workflows/ci.yml

@@ -7,6 +7,14 @@ concurrency:
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        arch: [riscv64, loongarch64]
+        include:
+          - arch: riscv64
+            target: riscv64gc-unknown-none-elf
+          - arch: loongarch64
+            target: loongarch64-unknown-none-softfloat
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -20,75 +28,11 @@ jobs:
       - run: cargo install cargo-binutils
       - uses: arceos-org/setup-musl@v1
         with:
-          arch: riscv64
-      - uses: arceos-org/setup-musl@v1
-        with:
-          arch: loongarch64
+          arch: ${{ matrix.arch }}
 
       - name: Clippy
         run: |
-          cargo clippy --target riscv64gc-unknown-none-elf -F qemu -- -D warnings
-          cargo clippy --target loongarch64-unknown-none-softfloat -F qemu -- -D warnings
+          cargo clippy --target ${{ matrix.target }} -F qemu -- -D warnings
 
       - name: Build
-        run: make all
-
-  sync:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout source repository
-        uses: actions/checkout@v4
-        with:
-          path: source
-          submodules: recursive
-          fetch-depth: 2
-
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: nightly-2025-01-18
-          components: rust-src, llvm-tools
-          targets: riscv64gc-unknown-none-elf, loongarch64-unknown-none-softfloat
-
-      - uses: Swatinem/rust-cache@v2
-        with:
-          cache-targets: false
-
-      - name: Prepare dependencies
-        env:
-          RUSTUP_TOOLCHAIN: nightly-2025-05-20 # prevent toolchain update
-        run: |
-          cd source
-          cargo install cargo-vendor-filterer
-          cargo vendor-filterer > cargo_config.toml
-
-      - name: Push to oscomp repo
-        run: |
-          git clone "${{ secrets.OSCOMP_REPO }}" oscomp
-          cd oscomp
-
-          git config user.name ${{ secrets.OSCOMP_USER_NAME }}
-          git config user.email ${{ secrets.OSCOMP_USER_EMAIL }}
-
-          if git rev-parse --verify origin/${{ github.ref_name }}; then
-            git checkout ${{ github.ref_name }}
-          else
-            export SOURCE_PARENT=$(git -C ../source rev-parse HEAD^)
-            export OSCOMP_PARENT=$(git log --pretty='%H' --grep "${SOURCE_PARENT}")
-            if [ -z "$OSCOMP_PARENT" ]; then
-              echo "No previous commit found for source parent $SOURCE_PARENT"
-              exit 1
-            fi
-            if [ "$(echo "$OSCOMP_PARENT" | wc -l)" -gt 1 ]; then
-              echo "Multiple commits found for source parent $SOURCE_PARENT"
-              echo "$OSCOMP_PARENT"
-              exit 1
-            fi
-            git checkout $OSCOMP_PARENT
-            git checkout -b ${{ github.ref_name }}
-          fi
-
-          rsync -a --exclude='.git' --delete ../source/ ./
-
-          git add -A
-          git commit -m ${{ github.ref_name }}.${{ github.sha }}
-          git push --set-upstream origin ${{ github.ref_name }}
+        run: make ARCH=${{ matrix.arch }} build

Makefile

@@ -8,7 +8,7 @@ export MEMTRACK := n
 export BLK := y
 export NET := y
 export MEM := 1G
-export TEST := pre
+export ICOUNT := n
 
 # Generated Options
 export A := $(PWD)
@@ -20,38 +20,14 @@ ifeq ($(MEMTRACK), y)
 	APP_FEATURES += starry-api/memtrack
 endif
 
-export ICOUNT := n
-
 DIR := $(shell basename $(PWD))
+IMG = rootfs-$(ARCH).img
 
-all:
-	@if [ -f cargo_config.toml ]; then \
-		mkdir -p .cargo; \
-		cp cargo_config.toml .cargo/config.toml; \
-	fi
-	RUSTUP_TOOLCHAIN=nightly-2025-05-20 \
-	CARGO_PROFILE_RELEASE_LTO=true \
-	CARGO_PROFILE_RELEASE_CODEGEN_UNITS=1 \
-	$(MAKE) oscomp LOG=off BACKTRACE=n
-
-oscomp:
-	$(MAKE) ARCH=riscv64 BUS=mmio build
-	cp $(DIR)_riscv64-qemu-virt.bin kernel-rv
-	$(MAKE) ARCH=loongarch64 build
-	cp $(DIR)_loongarch64-qemu-virt.elf kernel-la
-
-IMG :=
-ifeq ($(ARCH), riscv64)
-	IMG := sdcard-rv-$(TEST).img
-else ifeq ($(ARCH), loongarch64)
-	IMG := sdcard-la-$(TEST).img
-endif
+defconfig:
+	@make -C arceos $@
 
-run: defconfig
-	@if [ -f "$(IMG)" ]; then \
-		cp $(IMG) arceos/disk.img; \
-	fi
-	@make -C arceos run
+build run justrun debug disasm: defconfig
+	@make -C arceos $@
 
 # Aliases
 rv:
@@ -60,19 +36,10 @@ rv:
 la:
 	$(MAKE) ARCH=loongarch64 run
 
-alpine:
-	$(MAKE) TEST=alpine rv
-
 vf2:
 	$(MAKE) ARCH=riscv64 APP_FEATURES=vf2 MYPLAT=axplat-riscv64-visionfive2 BUS=dummy build
 
 2k1000la:
 	$(MAKE) ARCH=loongarch64 APP_FEATURES=2k1000la MYPLAT=axplat-loongarch64-2k1000la BUS=dummy build
 
-build justrun debug disasm: defconfig
-	@make -C arceos $@
-
-defconfig:
-	@make -C arceos $@
-
-.PHONY: all build run justrun debug disasm clean
+.PHONY: build run justrun debug disasm clean

README.md

@@ -1,10 +1 @@
-
-# Starry Mix
-
-基于 [starry-next](https://github.com/oscomp/starry-next) 和 [arceos](https://github.com/oscomp/arceos) 的操作系统。
-
-[初赛比赛文档](./初赛文档.pdf)
-
-进展汇报幻灯片： https://cloud.tsinghua.edu.cn/f/924d8221719a49618ea0/
-
-比赛演示视频： https://cloud.tsinghua.edu.cn/f/e96b194f650d4101a15b/
+# Starry OS

arceos

@@ -13,13 +13,14 @@ use alloc::{borrow::ToOwned, format, vec::Vec};
 use axfs_ng::FS_CONTEXT;
 
 mod entry;
-mod test;
+
+pub const CMDLINE: &[&str] = &["/bin/busybox", "sh", "--login"];
 
 #[unsafe(no_mangle)]
 fn main() {
     starry_api::init();
 
-    let args = test::CMDLINE
+    let args = CMDLINE
         .iter()
         .copied()
         .map(str::to_owned)