From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7128466769373560832 X-Received: by 2002:adf:de05:0:b0:220:6c9e:5fd9 with SMTP id b5-20020adfde05000000b002206c9e5fd9mr5135775wrm.260.1659725507330; Fri, 05 Aug 2022 11:51:47 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:d236:0:b0:21e:e644:c8 with SMTP id k22-20020adfd236000000b0021ee64400c8ls8128706wrh.3.-pod-prod-gmail; Fri, 05 Aug 2022 11:51:46 -0700 (PDT) X-Google-Smtp-Source: AA6agR5j2+IO1Rl5MkNGNvr7Rcs60Oc/YVHcrWWeYDpfa6kbGawIm2VX6NUNHSam4+u5Q648a8vl X-Received: by 2002:a05:6000:18a2:b0:221:7d99:5d22 with SMTP id b2-20020a05600018a200b002217d995d22mr943836wri.248.1659725506208; Fri, 05 Aug 2022 11:51:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659725506; cv=none; d=google.com; s=arc-20160816; b=CcaQapDvqAxJLoiLugwf+MYkN2ZDJ6UD1itWJGxr9jSZKhAgeEpbqUVT1HXHwlLcpk JU+eGvefsLoZnLHieB8eaCmMo0SD7TMy1mao8FtmKHhtNbevWW/7t3Iiijurm90nqSmD VDsEIHN2zSLIj0aI+0pDu2LqzL1ntvXryH5rUPQ+2LEkKmu/2ieZ/wUBHTs/8bgOpxDj 4y0JGtdmo+B82Sxc7hXiYtf6fZ51Y60qU1tndCUjcTJqHRAXqIPy1RsVQ+ZEewhy29m/ zAtU9MEK7s0gpOWVAbNrYNdNL4VhjDJwiqnF6048/2YoIkfKMgvV9M2Wx2c1PP2kEbW9 ZCOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=xG9wehubmzeF4+ACYntshs7QzLEFEGkJ6SmlfisD70w=; b=DxybzgTJ+tUXEB2WiS6GpphB1nVn+2wt/+dRr6u1TFD0xBWTZ9mZCK5ZxQyM3Qxilw SJop/qCAy2HTsphgTVhut4RPZSzWHF81ZuR64nHFOgSpgdJJ42/biRd+t0YiVPmelb3s eTeA4baenskzE/AkdnI6u5NpgG2Z2xLXw0fzc/q7a/6yzKGCBbYFztqlNuUWjOkmg3jo ZzRWUUUJvihnZ+XLACBu69Muylq2AQzdYdbbFQhb1t+J88sesJJ5ZpSFWsS4O4OehFtU XtVs5g6iJT5bwPJWvbwnEFdxmLplSfDNcHxqDyVwbd6mFGul7GOrRZ+1BL/07S1kqxsz KKDg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=bqffShzu; spf=pass (google.com: domain of fm-294854-20220805185146453931558a46ce01c8-4beieh@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-20220805185146453931558a46ce01c8-4beiEH@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id 189-20020a1c19c6000000b003a31bb11cdfsi470325wmz.2.2022.08.05.11.51.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Aug 2022 11:51:46 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-20220805185146453931558a46ce01c8-4beieh@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=bqffShzu; spf=pass (google.com: domain of fm-294854-20220805185146453931558a46ce01c8-4beieh@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-20220805185146453931558a46ce01c8-4beiEH@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20220805185146453931558a46ce01c8 for ; Fri, 05 Aug 2022 20:51:46 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=xG9wehubmzeF4+ACYntshs7QzLEFEGkJ6SmlfisD70w=; b=bqffShzu1L5Ld3gEt1z77i8mvySKjyUNSR1HISWUeu4c+S18alavIrtiMujhYf0wBskWKw L2Vo7s1MxmTIZZ5DVtGo8oI83uuCDmNaYcdAuyb8RPEnSDduKegDqxsi9+UlEiL5S8x+0+XL ta5KrLvlhGP1TyV82wIdaAXT0xiu4=; From: Jan Kiszka To: isar-users Cc: Henning Schild Subject: [PATCH 6/9] wic/bootimg-efi: use cross objcopy when building unified kernel image Date: Fri, 5 Aug 2022 20:51:41 +0200 Message-Id: <592c3cebf79e638aaaa7ad9ce78aaca963f5a12e.1659725504.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-TUID: jvoYBNLwLT82 From: Ross Burton We can't rely on the host objcopy knowing how to process target binaries, so use the cross objcopy in the sysroot instead. Also construct the command argument-by-argument as the format expression was getting unwieldy. Signed-off-by: Ross Burton Signed-off-by: Luca Ceresoli --- scripts/lib/wic/plugins/source/bootimg-efi.py | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index 0391aebd..a65a5b97 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py @@ -326,21 +326,20 @@ class BootimgEFIPlugin(SourcePlugin): exec_cmd(install_cmd) staging_dir_host = get_bitbake_var("STAGING_DIR_HOST") + target_sys = get_bitbake_var("TARGET_SYS") # https://www.freedesktop.org/software/systemd/man/systemd-stub.html - objcopy_cmd = "objcopy \ - --add-section .osrel=%s --change-section-vma .osrel=0x20000 \ - --add-section .cmdline=%s --change-section-vma .cmdline=0x30000 \ - --add-section .linux=%s --change-section-vma .linux=0x2000000 \ - --add-section .initrd=%s --change-section-vma .initrd=0x3000000 \ - %s %s" % \ - ("%s/usr/lib/os-release" % staging_dir_host, - cmdline.name, - "%s/%s" % (staging_kernel_dir, kernel), - initrd.name, - efi_stub, - "%s/EFI/Linux/linux.efi" % hdddir) - exec_cmd(objcopy_cmd) + objcopy_cmd = "%s-objcopy" % target_sys + objcopy_cmd += " --add-section .osrel=%s/usr/lib/os-release" % staging_dir_host + objcopy_cmd += " --change-section-vma .osrel=0x20000" + objcopy_cmd += " --add-section .cmdline=%s" % cmdline.name + objcopy_cmd += " --change-section-vma .cmdline=0x30000" + objcopy_cmd += " --add-section .linux=%s/%s" % (staging_kernel_dir, kernel) + objcopy_cmd += " --change-section-vma .linux=0x2000000" + objcopy_cmd += " --add-section .initrd=%s" % initrd.name + objcopy_cmd += " --change-section-vma .initrd=0x3000000" + objcopy_cmd += " %s %s/EFI/Linux/linux.efi" % (efi_stub, hdddir) + exec_native_cmd(objcopy_cmd, native_sysroot) else: install_cmd = "install -m 0644 %s/%s %s/%s" % \ (staging_kernel_dir, kernel, hdddir, kernel) -- 2.35.3