Merge pull request #501 from mkroening/hermit-loader

chore: rename rusty-loader to hermit-loader

.github/workflows/ci.yml

@@ -59,8 +59,8 @@ jobs:
     - name: Download loader
       uses: dsaltares/[email protected]
       with:
-        repo: hermitcore/rusty-loader
-        file: rusty-loader-x86_64
+        repo: hermit-os/loader
+        file: hermit-loader-x86_64
     - name: Build dev profile
       run: cargo build -Zbuild-std=std,panic_abort --target x86_64-unknown-hermit --package rusty_demo
     - name: Install uhyve
@@ -78,7 +78,7 @@ jobs:
       run: |
         qemu-system-x86_64 -display none -smp 1 -m 128M -serial stdio \
           -enable-kvm -cpu qemu64,apic,fsgsbase,rdtscp,xsave,xsaveopt,fxsr,rdrand \
-          -kernel rusty-loader-x86_64 \
+          -kernel hermit-loader-x86_64 \
           -initrd target/x86_64-unknown-hermit/debug/rusty_demo
     - name: Build release profile
       run: cargo build -Zbuild-std=std,panic_abort --target x86_64-unknown-hermit --package rusty_demo --release
@@ -90,7 +90,7 @@ jobs:
       run: |
         qemu-system-x86_64 -display none -smp 1 -m 128M -serial stdio \
           -enable-kvm -cpu qemu64,apic,fsgsbase,rdtscp,xsave,xsaveopt,fxsr,rdrand \
-          -kernel rusty-loader-x86_64 \
+          -kernel hermit-loader-x86_64 \
           -initrd target/x86_64-unknown-hermit/release/rusty_demo
 
   run-aarch64:
@@ -107,25 +107,25 @@ jobs:
       - name: Download loader
         uses: dsaltares/[email protected]
         with:
-          repo: hermitcore/rusty-loader
-          file: rusty-loader-aarch64
+          repo: hermit-os/loader
+          file: hermit-loader-aarch64
       - uses: mkroening/rust-toolchain-toml@main
       - uses: Swatinem/rust-cache@v2
       - name: Build dev profile
         run: cargo build -Zbuild-std=std,panic_abort --target aarch64-unknown-hermit --package rusty_demo
       - name: Test dev profile
         run: |
           qemu-system-aarch64 -semihosting \
-            -kernel rusty-loader-aarch64 -machine virt,gic-version=max \
-            -m 512M -cpu max -smp 1 -display none -serial stdio -kernel rusty-loader-aarch64 \
+            -kernel hermit-loader-aarch64 -machine virt,gic-version=max \
+            -m 512M -cpu max -smp 1 -display none -serial stdio -kernel hermit-loader-aarch64 \
             -device guest-loader,addr=0x48000000,initrd=target/aarch64-unknown-hermit/debug/rusty_demo
       - name: Build release profile
         run: cargo build -Zbuild-std=std,panic_abort --target aarch64-unknown-hermit --package rusty_demo --release
       - name: Test release profile
         run: |
           qemu-system-aarch64 -semihosting \
-            -kernel rusty-loader-aarch64 -machine virt,gic-version=max \
-            -m 512M -cpu max -smp 1 -display none -serial stdio -kernel rusty-loader-aarch64 \
+            -kernel hermit-loader-aarch64 -machine virt,gic-version=max \
+            -m 512M -cpu max -smp 1 -display none -serial stdio -kernel hermit-loader-aarch64 \
             -device guest-loader,addr=0x48000000,initrd=target/aarch64-unknown-hermit/release/rusty_demo
   
   qemu-x86_64:
@@ -142,8 +142,8 @@ jobs:
       - name: Download loader
         uses: dsaltares/[email protected]
         with:
-          repo: hermitcore/rusty-loader
-          file: rusty-loader-x86_64
+          repo: hermit-os/loader
+          file: hermit-loader-x86_64
       - uses: mkroening/rust-toolchain-toml@main
       - uses: Swatinem/rust-cache@v2
       - name: Build dev profile
@@ -152,7 +152,7 @@ jobs:
         run: |
           qemu-system-x86_64 -display none -smp 1 -m 128M -serial stdio \
             -cpu qemu64,apic,fsgsbase,rdtscp,xsave,xsaveopt,fxsr,rdrand \
-            -kernel rusty-loader-x86_64 \
+            -kernel hermit-loader-x86_64 \
             -initrd target/x86_64-unknown-hermit/debug/rusty_demo
       - name: Build release profile
         run:
@@ -161,7 +161,7 @@ jobs:
         run: |
           qemu-system-x86_64 -display none -smp 1 -m 128M -serial stdio \
             -cpu qemu64,apic,fsgsbase,rdtscp,xsave,xsaveopt,fxsr,rdrand \
-            -kernel rusty-loader-x86_64 \
+            -kernel hermit-loader-x86_64 \
             -initrd target/x86_64-unknown-hermit/release/rusty_demo
       - name: Build httpd with DHCP support
         run:
@@ -170,7 +170,7 @@ jobs:
         run: |
           qemu-system-x86_64 -smp 1 -cpu qemu64,apic,fsgsbase,rdtscp,xsave,xsaveopt,fxsr,rdrand \
             -device isa-debug-exit,iobase=0xf4,iosize=0x04 -display none -m 128M -serial stdio \
-            -kernel rusty-loader-x86_64 \
+            -kernel hermit-loader-x86_64 \
             -initrd target/x86_64-unknown-hermit/debug/httpd \
             -netdev user,id=u1,hostfwd=tcp::9975-:9975,net=192.168.76.0/24,dhcpstart=192.168.76.9 \
             -device rtl8139,netdev=u1 &

.github/workflows/publish.yml

@@ -31,12 +31,12 @@ jobs:
       uses: dsaltares/[email protected]
       with:
         repo: hermit-os/loader
-        file: rusty-loader-x86_64
+        file: hermit-loader-x86_64
     - name: Create dockerfile for rusty_demo
       run: |
         cat << END > Dockerfile
         FROM scratch
-        COPY rusty-loader-x86_64 hermit/rusty-loader
+        COPY hermit-loader-x86_64 hermit/hermit-loader
         COPY rusty_demo hermit/rusty_demo
         CMD ["/hermit/rusty_demo"]
         END
@@ -54,7 +54,7 @@ jobs:
       run: |
         cat << END > Dockerfile
         FROM scratch
-        COPY rusty-loader-x86_64 hermit/rusty-loader
+        COPY hermit-loader-x86_64 hermit/hermit-loader
         COPY httpd hermit/httpd
         CMD ["/hermit/httpd"]
         END
@@ -87,7 +87,7 @@ jobs:
         cat << END > Dockerfile
         FROM scratch
         COPY root root
-        COPY rusty-loader-x86_64 hermit/rusty-loader
+        COPY hermit-loader-x86_64 hermit/hermit-loader
         COPY webserver hermit/webserver
         CMD ["/hermit/webserver"]
         END