From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <t.lamprecht@proxmox.com>
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 D56216B3E1
for <pbs-devel@lists.proxmox.com>; Tue, 16 Mar 2021 16:53:54 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id CA38A1C0B3
for <pbs-devel@lists.proxmox.com>; Tue, 16 Mar 2021 16:53:54 +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 D9E12CA49
for <pbs-devel@lists.proxmox.com>; Tue, 16 Mar 2021 16:49:25 +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 4A2024642A
for <pbs-devel@lists.proxmox.com>; Tue, 16 Mar 2021 16:49:25 +0100 (CET)
Message-ID: <8fc6f409-f9e5-b10d-7bee-4d3e0b5e97a8@proxmox.com>
Date: Tue, 16 Mar 2021 16:49:24 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:87.0) Gecko/20100101
Thunderbird/87.0
Content-Language: en-US
To: Stefan Reiter <s.reiter@proxmox.com>, pbs-devel@lists.proxmox.com
References: <20210316154137.11792-1-s.reiter@proxmox.com>
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
In-Reply-To: <20210316154137.11792-1-s.reiter@proxmox.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.297 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
NICE_REPLY_A -0.001 Looks like a legit reply (A)
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: Re: [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
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Tue, 16 Mar 2021 15:53:54 -0000
On 16.03.21 16:41, Stefan Reiter wrote:
> 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
>
this patch was broken, white spaces where mangled and weird, I split it into
the make target fix and the kernel update and applied it semi-manually..