From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 864A96B3CD for ; Tue, 16 Mar 2021 16:42:43 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5CCE69E14 for ; Tue, 16 Mar 2021 16:42:11 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 1B1C7944B for ; Tue, 16 Mar 2021 16:41:52 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id BD9C645928 for ; Tue, 16 Mar 2021 16:41:51 +0100 (CET) From: Stefan Reiter To: pbs-devel@lists.proxmox.com Cc: t.lamprecht@proxmox.com Date: Tue, 16 Mar 2021 16:41:37 +0100 Message-Id: <20210316154137.11792-1-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.273 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_NUMSUBJECT 0.5 Subject ends in numbers excluding current years RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH restore-image] fixup "test-run" target and update kernel to 5.11.0 X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Mar 2021 15:42:43 -0000 Signed-off-by: Stefan Reiter --- 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