summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2020-01-30 15:16:54 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2020-01-30 15:16:54 +0000
commit62896c28e9889803fbe479fe94b0cae2ee9681bb (patch)
tree3954fff07654aa528110b15cd3a451ecafae6e20 /Makefile
parent61c8a693f00ce1c5141ec5f8339298f796f29707 (diff)
downloadlh-bootstrap-62896c28e9889803fbe479fe94b0cae2ee9681bb.tar.xz
Update kernel to 5.5, fix disk-image modules dep
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 32ab471..6cbbfe5 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ it: all
all: kernel rootfs rwfs userfs images
-kernel: $(OUTPUT)/build-host/kernel/.lh_installed
+kernel: $(OUTPUT)/build-host/kernel/.lh_installed $(OUTPUT)/build-host/kernel/.lh_modules_installed
rootfs: $(OUTPUT)/tmp/.lh_rootfs_installed
rwfs: $(OUTPUT)/tmp/.lh_rwfs_installed
userfs: $(OUTPUT)/tmp/.lh_userfs_installed
@@ -69,7 +69,7 @@ $(OUTPUT)/tmp/.lh_userfs_installed: $(OUTPUT)/tmp/.lh_layout_installed
# The qemu disk images (requires qemu and libguestfs-tools)
-$(OUTPUT)/tmp/.lh_diskimages_done: $(OUTPUT)/tmp/.lh_rootfs_installed $(OUTPUT)/tmp/.lh_rwfs_installed $(OUTPUT)/tmp/.lh_userfs_installed
+$(OUTPUT)/tmp/.lh_diskimages_done: $(OUTPUT)/build-host/kernel/.lh_modules_installed $(OUTPUT)/tmp/.lh_rootfs_installed $(OUTPUT)/tmp/.lh_rwfs_installed $(OUTPUT)/tmp/.lh_userfs_installed
virt-make-fs --format=qcow2 --type=ext4 --size=$(ROOTFS_SIZE) $(OUTPUT)/rootfs $(OUTPUT)/rootfs.qcow2 & \
virt-make-fs --format=qcow2 --type=ext4 --size=$(RWFS_SIZE) $(OUTPUT)/rwfs $(OUTPUT)/rwfs.qcow2 & \
virt-make-fs --format=qcow2 --type=ext4 --size=$(USERFS_SIZE) $(OUTPUT)/userfs $(OUTPUT)/userfs.qcow2 & wait