From patchwork Sat Sep 2 10:29:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 29809 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B20C1CA1000 for ; Sat, 2 Sep 2023 10:29:13 +0000 (UTC) Received: from a27-191.smtp-out.us-west-2.amazonses.com (a27-191.smtp-out.us-west-2.amazonses.com [54.240.27.191]) by mx.groups.io with SMTP id smtpd.web10.5669.1693650552490806249 for ; Sat, 02 Sep 2023 03:29:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=cSUiRWR4; dkim=pass header.i=@amazonses.com header.s=hsbnp7p3ensaochzwyq5wwmceodymuwv header.b=gl9+tHY1; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.191, mailfrom: 0101018a55708374-570fcaf8-1fe9-4f69-8d75-a13a6872da20-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky; d=yoctoproject.org; t=1693650551; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=JIhAA2AdbEIvimy1jBdPi1ZR1+ggFsEazoqCEPvbf2o=; b=cSUiRWR4IJZuf5UsM8X6NmwX/uWtryU2PtbN50gEbr9uwC4HQixi3zxSir9GkXYY tZ3fmdKCsCA0pLuE0NhwRpgckLla1O82WvMdY4Kcr2Y3Eb3azMwQEhRe9me7sbJGmyJ 6SjyHa1eBTMRzWP5GsTwPdnIpWswHyU3M7cu1bEU= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=hsbnp7p3ensaochzwyq5wwmceodymuwv; d=amazonses.com; t=1693650551; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=JIhAA2AdbEIvimy1jBdPi1ZR1+ggFsEazoqCEPvbf2o=; b=gl9+tHY1aWO1dFeY3UWrkTEA4QG0X1BwrZylMQXF5pKnqgkpKaRMNS0Trt37lHWe S29Ic8p7PobkywVrEzaT5dYlRwiSk20fSuMSQLuJBBwC9FDo5jnAuJKMO0ebABqzCMG s+rwwOH+VS/M7oHve18eH5Cokn5TRDOgMDlQR9fs= MIME-Version: 1.0 From: auh@yoctoproject.org To: Chen Qi Cc: openembedded-core@lists.openembedded.org Subject: [AUH] systemd-boot: upgrading to 254.1 SUCCEEDED Message-ID: <0101018a55708374-570fcaf8-1fe9-4f69-8d75-a13a6872da20-000000@us-west-2.amazonses.com> Date: Sat, 2 Sep 2023 10:29:11 +0000 Feedback-ID: 1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2023.09.02-54.240.27.191 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 02 Sep 2023 10:29:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187041 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *systemd-boot* to *254.1* has Succeeded. Next steps: - apply the patch: git am 0001-systemd-boot-upgrade-254-254.1.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From cb501123b5d09708955ccc88a9e696894404f9ff Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Fri, 1 Sep 2023 09:59:26 +0000 Subject: [PATCH] systemd-boot: upgrade 254 -> 254.1 --- ...temd-boot_254.bb => systemd-boot_254.1.bb} | 0 meta/recipes-core/systemd/systemd.inc | 6 +- ...-elf2efi-Fix-header-size-calculation.patch | 70 ------------------- 3 files changed, 2 insertions(+), 74 deletions(-) rename meta/recipes-core/systemd/{systemd-boot_254.bb => systemd-boot_254.1.bb} (100%) delete mode 100644 meta/recipes-core/systemd/systemd/0001-elf2efi-Fix-header-size-calculation.patch diff --git a/meta/recipes-core/systemd/systemd-boot_254.bb b/meta/recipes-core/systemd/systemd-boot_254.1.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot_254.bb rename to meta/recipes-core/systemd/systemd-boot_254.1.bb diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index e5686fbe44..c767a1f916 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -14,10 +14,8 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "994c7978608a0bd9b317f4f74ff266dd50a3e74e" +SRCREV = "208a21833b6953a2517a6c3f8f4849c6664b01be" SRCBRANCH = "v254-stable" -SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \ - file://0001-elf2efi-Fix-header-size-calculation.patch \ - " +SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/meta/recipes-core/systemd/systemd/0001-elf2efi-Fix-header-size-calculation.patch b/meta/recipes-core/systemd/systemd/0001-elf2efi-Fix-header-size-calculation.patch deleted file mode 100644 index 0e8924d27d..0000000000 --- a/meta/recipes-core/systemd/systemd/0001-elf2efi-Fix-header-size-calculation.patch +++ /dev/null @@ -1,70 +0,0 @@ -From d082d6502fa86e08dda858933838dde0406b824f Mon Sep 17 00:00:00 2001 -From: Jan Janssen -Date: Sun, 30 Jul 2023 20:59:04 +0200 -Subject: [PATCH] elf2efi: Fix header size calculation - -The PE header size calculation failed to take the PE magic and coff -header size into account, which will lead to header truncation if we are -writing only 5 sections. - -Upstream-Status: Backport [https://github.com/systemd/systemd/commit/ee91e06a5841c30bc7306260528ef407e0ebbab3] - -Signed-off-by: Jose Quaresma ---- - tools/elf2efi.py | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/tools/elf2efi.py b/tools/elf2efi.py -index e233c8e3ab..2e478940f5 100755 ---- a/tools/elf2efi.py -+++ b/tools/elf2efi.py -@@ -210,6 +210,7 @@ FILE_ALIGNMENT = 512 - - # Nobody cares about DOS headers, so put the PE header right after. - PE_OFFSET = 64 -+PE_MAGIC = b"PE\0\0" - - - def align_to(x: int, align: int) -> int: -@@ -304,7 +305,10 @@ def copy_sections(elf: ELFFile, opt: PeOptionalHeader) -> typing.List[PeSection] - - - def apply_elf_relative_relocation( -- reloc: ElfRelocation, image_base: int, sections: typing.List[PeSection], addend_size: int -+ reloc: ElfRelocation, -+ image_base: int, -+ sections: typing.List[PeSection], -+ addend_size: int, - ): - # fmt: off - [target] = [ -@@ -439,7 +443,7 @@ def write_pe( - file.seek(0x3C, io.SEEK_SET) - file.write(PE_OFFSET.to_bytes(2, byteorder="little")) - file.seek(PE_OFFSET, io.SEEK_SET) -- file.write(b"PE\0\0") -+ file.write(PE_MAGIC) - file.write(coff) - file.write(opt) - -@@ -453,6 +457,8 @@ def write_pe( - file.write(pe_s) - offset = align_to(offset + len(pe_s.data), FILE_ALIGNMENT) - -+ assert file.tell() <= opt.SizeOfHeaders -+ - for pe_s in sections: - file.seek(pe_s.PointerToRawData, io.SEEK_SET) - file.write(pe_s.data) -@@ -515,6 +521,8 @@ def elf2efi(args: argparse.Namespace): - - opt.SizeOfHeaders = align_to( - PE_OFFSET -+ + len(PE_MAGIC) -+ + sizeof(PeCoffHeader) - + coff.SizeOfOptionalHeader - + sizeof(PeSection) * max(coff.NumberOfSections, args.minimum_sections), - FILE_ALIGNMENT, --- -2.34.1 -