Skip to content

Commit ad7d188

Browse files
committed
Set the default rootfs image name to the directory basename
1 parent 25a9530 commit ad7d188

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ jobs:
176176
- name: Initialize rootfs and initramfs
177177
run: |
178178
make rootfs-init
179-
ROOTFS=./rootfs-${{ matrix.arch }} make rootfs-init
179+
ROOTFS=./alpine-${{ matrix.arch }} make rootfs-init
180180
181181
make cpio
182182
ROOTFS_DIR=./rootfs/alpine-${{ matrix.arch }} make cpio
@@ -200,7 +200,7 @@ jobs:
200200
uses: actions/upload-artifact@v3
201201
with:
202202
name: rootfs
203-
path: rootfs/rootfs-${{ matrix.arch }}.img
203+
path: rootfs/alpine-${{ matrix.arch }}.img
204204

205205
release:
206206
runs-on: ubuntu-22.04

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ tools-vm_clean:
238238
##
239239

240240
ROOTFS_PARENT_DIR := $(ROOT_DIR)/rootfs
241-
ROOTFS ?= $(ROOTFS_PARENT_DIR)/rootfs-$(ARCH).img
241+
ROOTFS ?= $(ROOTFS_PARENT_DIR)/$$(basename $(ROOTFS_DIR)).img
242242
ROOTFS_FORMAT ?= qcow2
243243
ROOTFS_DIR ?= $(ROOTFS_PARENT_DIR)/alpine-$(ARCH)
244244
CPIO_FILE ?= $(ROOTFS_PARENT_DIR)/$$(basename $(ROOTFS_DIR)).cpio.gz

0 commit comments

Comments
 (0)