From 75336caf7dfd4f7c92508b1297d326cb6e079749 Mon Sep 17 00:00:00 2001 From: Gulshan Singh Date: Mon, 23 Jan 2023 17:26:36 -0800 Subject: [PATCH] Update build.yml and .gitignore --- .github/workflows/build.yml | 4 ++-- .gitignore | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5ce63a1..2df0479 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -179,7 +179,7 @@ jobs: ROOTFS=./rootfs-${{ matrix.arch }} make rootfs-init make cpio - INITRAMFS_DIR=./rootfs/alpine-${{ matrix.arch }} make cpio CPIO_FILE=../../alpine-${{ matrix.arch }}.cpio.gz + ROOTFS_DIR=./rootfs/alpine-${{ matrix.arch }} make cpio - name: Setup shared/init.sh run: | @@ -193,7 +193,7 @@ jobs: run: | QEMU_KERNEL_IMAGE=./kernel-image/$IMAGE_NAME make run QEMU_KERNEL_IMAGE=./kernel-image/$IMAGE_NAME ROOTFS=./rootfs-${{ matrix.arch }} make run - QEMU_KERNEL_IMAGE=./kernel-image/$IMAGE_NAME INITRD=./alpine-${{ matrix.arch }}.cpio.gz make run + QEMU_KERNEL_IMAGE=./kernel-image/$IMAGE_NAME INITRD=1 make run QEMU_KERNEL_IMAGE=./kernel-image/$IMAGE_NAME CPU=2 MEM=2048M QEMU_EXTRA_ARGS="" QEMU_EXTRA_KERNEL_CMDLINE="nokaslr" make run - name: Upload rootfs artifact diff --git a/.gitignore b/.gitignore index 125bc41..cc77d3b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ /rootfs/*.cpio.gz /rootfs/alpine-*/ +/toolchain /shared /out /.cache