[pbs-devel] [PATCH restore-image] fixup "test-run" target and update kernel to 5.11.0

Stefan Reiter s.reiter at proxmox.com
Tue Mar 16 16:41:37 CET 2021


Signed-off-by: Stefan Reiter <s.reiter at proxmox.com>
---

Seperate email because other one got mangled somewhere on the way...

 src/Makefile                  | 6 +++---
 src/submodules/ubuntu-hirsute | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index dcfac03..37f385f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -19,7 +19,7 @@ all: ${KERNEL_IMG} ${INITRAMFS_IMG}
 ${BUILDDIR}.prepared: ${CONFIG}
 	rm -rf ${BUILDDIR}
 	mkdir -p ${BUILDDIR}
-	cp -a submodules debian patches ${BUILDDIR}/
+	cp -a submodules patches ${BUILDDIR}/
 	cp ${CONFIG} ${BUILDDIR}/${KERNEL_SUBMODULE}
 	cd ${BUILDDIR}/${KERNEL_SUBMODULE}; \
 	    for p in ../../patches/kernel/*.patch; do \
@@ -60,8 +60,8 @@ test-run: ${KERNEL_IMG} ${INITRAMFS_IMG}
 	# included in the initramfs, but it can be used to test the
 	# kernel/init-shim-rs builds
 	qemu-system-x86_64 -serial stdio -vnc none -enable-kvm \
-	    -kernel ${BUILDDIR}/${KERNEL_IMG} \
-	    -initrd build/initramfs/initramfs.img
+	    -kernel ${KERNEL_IMG} \
+	    -initrd ${INITRAMFS_IMG}
 
 .PHONY: clean
 clean:
diff --git a/src/submodules/ubuntu-hirsute b/src/submodules/ubuntu-hirsute
index 01f2ad6..f488090 160000
--- a/src/submodules/ubuntu-hirsute
+++ b/src/submodules/ubuntu-hirsute
@@ -1 +1 @@
-Subproject commit 01f2ad60c19fc07666c3cad5e6f527bc46af6303
+Subproject commit f48809012350997899c3ce1afc47eb77f116fcf4
-- 
2.20.1






More information about the pbs-devel mailing list