From: Stefan Reiter <s.reiter@proxmox.com>
To: pbs-devel@lists.proxmox.com
Cc: t.lamprecht@proxmox.com
Subject: [pbs-devel] [PATCH restore-image] fixup "test-run" target and update kernel to 5.11.0
Date: Tue, 16 Mar 2021 16:41:37 +0100 [thread overview]
Message-ID: <20210316154137.11792-1-s.reiter@proxmox.com> (raw)
Signed-off-by: Stefan Reiter <s.reiter@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
next reply other threads:[~2021-03-16 15:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-16 15:41 Stefan Reiter [this message]
2021-03-16 15:49 ` Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210316154137.11792-1-s.reiter@proxmox.com \
--to=s.reiter@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
--cc=t.lamprecht@proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox