From patchwork Fri Feb 17 10:01:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 2659 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 17 Feb 2023 11:01:57 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wr1-f61.google.com (mail-wr1-f61.google.com [209.85.221.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 31HA1uMX022219 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 17 Feb 2023 11:01:56 +0100 Received: by mail-wr1-f61.google.com with SMTP id s5-20020a5d6a85000000b002bfda39265asf76548wru.13; Fri, 17 Feb 2023 02:01:56 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1676628111; cv=pass; d=google.com; s=arc-20160816; b=TAnnn/FeIQ5vsK+Uvsj+uvtwf/96qaDdmQvDvkH9ZtSXvH6lkRSP1IMxSKW1qHxVEV f3qEc/7SiCUpwMxirkPB7ZT/I2oEyVEn6KCGaLeDyyRAgdPusg52R/Ase2HhZ60WdM7f Ezep9gW2Fgmu9CnN6KrQsWO0IIMSqAoWhJw1LkbJpJlr/sfrWwMRCX3BITqUkSM4vJm5 v/JUWsTzGQFZWsmbGYnYuh5pn4GwMfvVMM6fGJ+wVJZ+6qS558evzwa2ojOOLsTmSuim ZEwjEwyxgFFPFRJmoOsOcdMfpZsxmEzbxNoxHDE3RJuZodwsI5QsFii683gPEJCZtCvw Blog== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:feedback-id:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=/lVJpzB8qIT8/igoR9QSzvGTfReJtD7LDCNoxfi3vpQ=; b=FcHU7oYZNeZ01QtSIN7kL1Sn292Ekh3+Y28eDM9g6XVAkFquIoEGCSCpwdNV859cS0 xrqZE1DDebzcum+l4yVvT+4RBIGfo1tIokJXvhaeHQnhPfkpIcN+U3emOe/ukqOFGm4m B/D/n9dB/b/Yx8So/G0iL6aJ1GZWZJdaa3PznzgkbP8bd1GzkgJ96US3kDy+0OSmY2sS 0vk9p71E2r4ZI1vTbwt7a08kdyJNoJ8pzUHD2x3IwGleocmFOzd2b12Ki5RyBvjpb8Bc Vb/6MsnEvCYBoo3hAzMV+L+uEl08K8HYKLHRfJqUdSs3KUH0FEZ+be37ImI03L0IZmAY P7mA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Nx24r0UB; spf=pass (google.com: domain of fm-72506-2023021710014972a10dab83eeefcb46-njmnk_@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-72506-2023021710014972a10dab83eeefcb46-njmNk_@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:feedback-id:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=/lVJpzB8qIT8/igoR9QSzvGTfReJtD7LDCNoxfi3vpQ=; b=F618S9CRf+WyhdDPF8+TbvNtX5Y1XcpTSfjaz4lC0Z7spgiWOdQgBtDgmqVmXpDKB2 CO0vpJQWFQPIKJ8kQi80gL4Z2Jt97JituYKqyZ0ywYsfEzf2Jq9qIWdWjcXZ2KX6grnm qqNadh8JkjF3H+87LnaclfonWT+5M3HVas/4kCWLujqBzTKdeILzCa9EkTITPejdZyUH Ayu4MOkcBC+b2Cnnn8CzTGfrj3VqIkhJpPHpWUqpe1hZ/r5isX/Z/Ir7wfhQSoPpf6E6 ZLZ3s4cSEP8i4ZQSBKFIWGPcvDNbjO5pNOaT9fuz9bixKF1ZjiUdcgx9+G8p2t3HL04E qu4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=/lVJpzB8qIT8/igoR9QSzvGTfReJtD7LDCNoxfi3vpQ=; b=ZiMy/c+PrAJkJogajCxdlhnkJpWUFlIoZfetISr9v9IGqI8ydjxYnd0dhETYUDIxXN I70XDEzGkwyC1MAp63fWMjm/hyuqdxrgbbdkqGyLRipTNFs+/UErMZJphOWnsxTwggFm BdB+1g9IbuUgY+dlkzDxyw1O0ymLCAloiCCCfjwDEl5SaWCMsqZl/PWEKi3QVIo5iKAW e5napCucZXE/aYIQaEzL+R6o5ogA7xKJWu8LKTuZBa1foRjr0WxrR4ovYhzn932X3Fzt GAuI9elNHtwpG4RvrAevXwODQ8Ql7qN+VStMvlBBi3uP+moFxSgF7bQq9s3jo7+DoFjr bjsg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKWvR3nFsr3M6umgRyGpqw6B9tOwKsWoAck7o1DkzPfcSyQXNFtG U4PJL7PCAqeWwKL3V2J6lZg= X-Google-Smtp-Source: AK7set/GAtsudkzi3e3IJeIs2sXOc4cjrATO9kOLcX4HCTNXrrFWuGOFLx/lKDzIQLP9k2uXJ/Wm6Q== X-Received: by 2002:a5d:6343:0:b0:2c6:434:c120 with SMTP id b3-20020a5d6343000000b002c60434c120mr97299wrw.306.1676628111212; Fri, 17 Feb 2023 02:01:51 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:a1d7:0:b0:2c5:55ca:3a3b with SMTP id v23-20020adfa1d7000000b002c555ca3a3bls299703wrv.1.-pod-prod-gmail; Fri, 17 Feb 2023 02:01:49 -0800 (PST) X-Received: by 2002:a05:6000:1052:b0:2c5:54a7:363f with SMTP id c18-20020a056000105200b002c554a7363fmr6868357wrx.63.1676628109545; Fri, 17 Feb 2023 02:01:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676628109; cv=none; d=google.com; s=arc-20160816; b=CZe6VZq6sBQcVNuDWACgfJ1qdBjK3+hci2ey4xCN/AWsjoQ7zqmEp6OcWIXeTSZoOA cFh4eBoBboSMeo+JpNd6fH3Fpg+NXZYkmsGToLdhEDATYGCHDWnsaFjGLVqhWe2EODYV j8/F8g9Zp4dn9UggZX6ZnHh7XQe2qTVT0Go5/CWlX5to3RSNCe1y6NJ4WnbNcQ3OJ0gi DrPh6n2JrI17DgvJJtfCqyLkOeM5WYuj9GAbBontfUJVd8QLkH41xTryeZjHYCM4wsXs obxr6hpL07xzism8MGxF4Jh7T5W1X7+sapewZaCKO4ADj/56wFBjSGRNJUnJ7INgV4aC yqGA== 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=dPqW/CWznTAYLYDFvIcCEh0FmqiNcSNT/BUj9bSN4Mc=; b=PaIn1mWW3/pPEt3N/Gb0WmHmXiIP6m+krwc3yvtITMJXSH9qgvtYT1+/6V1UAxYjn/ Jf4/kE13TCJKOQA4SFQ40lmE88uWm+A/vt++LsLtht/+dcOTjXw5xr+nnbmMgoqSbv4R wX2FNt5LgpvuhLPS/Ix/Ux9ApJmvccJBk5KuFRZGEeYwTd3ZgORMAgqk8MrmbpB3riQg JGut/nWPerrTD5dYfHTRF68TcUPfwfxli3bDnDURCSf4vWKusGMguVR7k3nKq4wM3IKY 1MTPMmOJnUQyt1JtSsuWyATNKPm+9RF/0mn1TMJp+5EpXEick7djT3ddQtt6PDul8nZR pdJA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Nx24r0UB; spf=pass (google.com: domain of fm-72506-2023021710014972a10dab83eeefcb46-njmnk_@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-72506-2023021710014972a10dab83eeefcb46-njmNk_@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id ch18-20020a5d5d12000000b002c5598402acsi121718wrb.0.2023.02.17.02.01.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Feb 2023 02:01:49 -0800 (PST) Received-SPF: pass (google.com: domain of fm-72506-2023021710014972a10dab83eeefcb46-njmnk_@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 2023021710014972a10dab83eeefcb46 for ; Fri, 17 Feb 2023 11:01:49 +0100 From: Felix Moessbauer To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH 2/3] deploy boot files via sstate-cache Date: Fri, 17 Feb 2023 10:01:17 +0000 Message-Id: <20230217100118.2912985-3-felix.moessbauer@siemens.com> In-Reply-To: <20230217100118.2912985-1-felix.moessbauer@siemens.com> References: <20230217100118.2912985-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-Original-Sender: felix.moessbauer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Nx24r0UB; spf=pass (google.com: domain of fm-72506-2023021710014972a10dab83eeefcb46-njmnk_@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-72506-2023021710014972a10dab83eeefcb46-njmNk_@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= This patch changes how we deploy the boot files. Instead of manually deploying, we use the sstate infrastructure for that. By that, accidental overrides of the artifacts can be automatically detected. On clean, the artifacts are also cleaned. Signed-off-by: Felix Moessbauer --- meta/classes/image.bbclass | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index ef7d5a2a..e799d1d4 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -3,11 +3,13 @@ # Make workdir and stamps machine-specific without changing common PN target WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}/${PV}-${PR}" +DEPLOYDIR = "${WORKDIR}/deploy-${PN}" STAMP = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}/${PV}-${PR}" STAMPCLEAN = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}/*-*" # Sstate also needs to be machine-specific SSTATE_MANIFESTS = "${TMPDIR}/sstate-control/${MACHINE}-${DISTRO}-${DISTRO_ARCH}" +SSTATETASKS += "do_copy_boot_files" IMAGE_INSTALL ?= "" IMAGE_FSTYPES ?= "${@ d.getVar("IMAGE_TYPE", True) if d.getVar("IMAGE_TYPE", True) else "ext4"}" @@ -355,8 +357,9 @@ INITRD_IMG = "${PP_DEPLOY}/${INITRD_IMAGE}" # only one dtb file supported, pick the first DTB_IMG = "${PP_DEPLOY}/${@(d.getVar('DTB_FILES').split() or [''])[0]}" -do_copy_boot_files[dirs] = "${DEPLOY_DIR_IMAGE}" -do_copy_boot_files[lockfiles] += "${DEPLOY_DIR_IMAGE}/isar.lock" +do_copy_boot_files[cleandirs] += "${DEPLOYDIR}" +do_copy_boot_files[sstate-inputdirs] = "${DEPLOYDIR}" +do_copy_boot_files[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}" do_copy_boot_files[network] = "${TASK_USE_SUDO}" do_copy_boot_files() { kernel="$(realpath -q '${IMAGE_ROOTFS}'/vmlinu[xz])" @@ -364,7 +367,7 @@ do_copy_boot_files() { kernel="$(realpath -q '${IMAGE_ROOTFS}'/boot/vmlinu[xz])" fi if [ -f "$kernel" ]; then - sudo cat "$kernel" > "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE}" + sudo cat "$kernel" > "${DEPLOYDIR}/${KERNEL_IMAGE}" fi initrd="$(realpath -q '${IMAGE_ROOTFS}/initrd.img')" @@ -372,7 +375,7 @@ do_copy_boot_files() { initrd="$(realpath -q '${IMAGE_ROOTFS}/boot/initrd.img')" fi if [ -f "$initrd" ]; then - cp -f "$initrd" '${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}' + cp -f "$initrd" '${DEPLOYDIR}/${INITRD_IMAGE}' fi for file in ${DTB_FILES}; do @@ -383,11 +386,16 @@ do_copy_boot_files() { die "${file} not found" fi - cp -f "$dtb" "${DEPLOY_DIR_IMAGE}/" + cp -f "$dtb" "${DEPLOYDIR}/" done } addtask copy_boot_files before do_rootfs_postprocess after do_rootfs_install +python do_copy_boot_files_setscene () { + sstate_setscene(d) +} +addtask do_copy_boot_files_setscene + python do_image_tools() { """Virtual task""" pass