From patchwork Sat Feb 18 10:30:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 2661 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Sat, 18 Feb 2023 11:31:17 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f184.google.com (mail-lj1-f184.google.com [209.85.208.184]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 31IAVGcU026750 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 18 Feb 2023 11:31:16 +0100 Received: by mail-lj1-f184.google.com with SMTP id q125-20020a2e2a83000000b002945ecef4b3sf136895ljq.14; Sat, 18 Feb 2023 02:31:16 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1676716271; cv=pass; d=google.com; s=arc-20160816; b=Irr6PEfzBz1pMcfoc9LVRm5n22h5z3MwzGsBvx5l6NuxzFHMk9+o5UKwn6E4vCTTMy 30nZd1tvlqippCNrti99LY4KAs4G8j2adJzpt+5MTh316oSCvr0ZRVw7BBI9gnhv6as9 4iuzbhOze1t4auJDTT4d0ah5x9Nt8aExIXN8mVAqD4DELWNBuvAPyLmON1GTHa+/Xhko HNNwzaWR3rE8yQSlNmR3w3QTY7CIFITLCFODXyEGh3nI4ZH4DBAr5Ry7ynheNokSj2Sc KYfKtucUq2tvxibctC58bgp2z0onOWhaGVPJnwNZEEkAVZ9Vtd4/0J+Nf2dW5yJsIzIL kb2g== 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=3BHe9iLrAub3POdLvwg99nC9REjd3gsCbJ0nzxX1tDo=; b=Ok0MwGmnIIb+wiQB0TzI8Eh0ZAhrU2Tc0qdRzqPpS/JYnOXy7l7VM7FqA91hRjcag6 o3uBC5jyQljEXWtJYNhKzUZiy8VT8H2qIiJyKo3IR8pyILIGWIsxRcbGqhzuaTPNm+xF /GYJzCmynYRTMZadCPhTXn6911aKWVrrVuZfDUv1SQhQ3VdpZcbmL4mvFP915St9SFsh t+O9RlI+ObpiK1oaMzwTIo4J06nZKliABapI5bSIl6s+8UlW3B9VEmaF2Yet3JMRpAvz KghiS4fG7MaFTASAw0EYQboTOYXbG4RaVylcj8R2bD5AtUS4wbkK4eR+XBzanH70IfgJ 1Rqw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=AID4XIjp; spf=pass (google.com: domain of fm-72506-20230218103109ef013ba5146627c117-f_tdzy@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-72506-20230218103109ef013ba5146627c117-f_TdZy@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=3BHe9iLrAub3POdLvwg99nC9REjd3gsCbJ0nzxX1tDo=; b=TvJmXe1zTB5Hi8WaJcxfQ2WjYgCPLonL5NiIzEPvsgHbP46+C5EFz5dev4d+j7TMhg J35avBzWFmSQ8IQTTHN7gYZwjqos3Nzx9BN7b83SGbXQMdYzeOj8AjJeEslkWESdv2UE GXEs80Mo5bmhNCGDwQ4Dbf/24LV8qFU9sxRZbflTCNCmku6w8jQOLbP19UKNL9x9XCkJ ypwVqUxFGpsc+cXOwzqObb4ZMrzIwVSyfxCkVs/D3v9de9DJTTh4ZSCxosYNdk/L3Rij rCMOkD0NHz0RGyAEcPiZ+/laiV04Y2tpWXx4QcIEMhEWqJZlTReY0UDjly8LQHBGNBE3 FoeQ== 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=3BHe9iLrAub3POdLvwg99nC9REjd3gsCbJ0nzxX1tDo=; b=PYaw/tIRmBQsyKSHngkHi6Da5Ed4tDm2xs0mGVCsb/TTBEO3uBHl44Q1V0znzIjdz/ QVL6+6yjr38EDmMwutapKF3Y5QakR5h400wBIRPG4DMEt7JJWFgKeaUZP0gfTW8KNNmE d4uPR1XglSbMSOPZMfRVEWuLaSPzdNqne74cgihfNkRXvJoAgBC7VgRri8B7/qij2BGH D9QRf3osf86V/Q8KrOTffG5knySxhjUp1+WBzpSr3X83dxrwJYP6DLxHcNrqFkf39grp Qc12bJYLeRel6Ekau3y2QkTUEg79R7AZgSL/iv+c2pD3YzkJ9KiPR0JNAxgOJ8QJjr5y l9lA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKUM5lf07cqLgQgGSzEFAXLACMt+N5t4gldr8V0PF/89DinUTYtK AVfQ6FNZs89WaYOP5SpOnjY= X-Google-Smtp-Source: AK7set8BSeIAMu2DHFf2GQ76HtJ2/dKcYzadCxgmrKmIsnvr3ASy0q95rh0r8qIALNll2UWbzf5xvg== X-Received: by 2002:ac2:43a9:0:b0:4d9:8773:7d74 with SMTP id t9-20020ac243a9000000b004d987737d74mr1199689lfl.6.1676716271163; Sat, 18 Feb 2023 02:31:11 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:398c:b0:4db:5081:6ce7 with SMTP id j12-20020a056512398c00b004db50816ce7ls146306lfu.1.-pod-prod-gmail; Sat, 18 Feb 2023 02:31:09 -0800 (PST) X-Received: by 2002:ac2:5225:0:b0:4d5:8114:3fdf with SMTP id i5-20020ac25225000000b004d581143fdfmr1144822lfl.27.1676716269421; Sat, 18 Feb 2023 02:31:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676716269; cv=none; d=google.com; s=arc-20160816; b=CEZyhaLkWQi/xcynQoZJzvzfDsVKyo/BhQdPc+6hgq8zsxmfX9vpj0DHsoGepP781V Gp0F9vTt85dDz/pe8Ju0aUgad9BoUXva6y58VumNo9OqEbWPeEJYHyNwIVouxmcmGz04 k9e0HydEvwmkJawTXGVjN9I4lpHxethxPgZmpVrOgM2BTwvkprW+uvB/xdBkdPDVOhVz 5N+aSg+Cv8HLE6b99vzlwJflIwA+uB0t8De/jgruiM8IU2IedU98qoFbcoNIGehHBQ6s akwUUcI+gSMT26KuUB3TpFEUmUk5knKt01aJXkpXvm3GcbAWC8MqlNk4kc0vR1R9Ukmc eLyw== 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=oE2bJuFUb3dyxYHtGh67XsZbHV+kDF3DnuehsH9qMLk=; b=Bx72ahW+H2SfIazLTKcJURauBNC4UUFYgKMm4XstNRYv9rB9DruzT4rJREFT2GvoK6 LI8FbvISwz4PSyzL67N26wetr94y7eFnGvctWLyF+fb8NJEUCJJHXLdIkmlfM+BJHQlo j0me/NsCXRU3oSOTVv9XcR+FSNPphzil4UHOxydvdcoM7eIwlsU3Vm0EpQ4O/YGMaJau n7yOCReTapNGnYouw34AsmuZ6vPdhrFQ6/UhWV/6AHwr1lidGgtOv0qcjJ31pIsBzlpd qBrjwS5W/jONstg1AGvOJWvdYlb6I0Fmn8kLwanMN4xP3rClFkQXB+vpKqj3RPWddEdk 3CLA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=AID4XIjp; spf=pass (google.com: domain of fm-72506-20230218103109ef013ba5146627c117-f_tdzy@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-72506-20230218103109ef013ba5146627c117-f_TdZy@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id t22-20020a199116000000b004d5786b729esi249835lfd.9.2023.02.18.02.31.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Feb 2023 02:31:09 -0800 (PST) Received-SPF: pass (google.com: domain of fm-72506-20230218103109ef013ba5146627c117-f_tdzy@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20230218103109ef013ba5146627c117 for ; Sat, 18 Feb 2023 11:31:09 +0100 From: Felix Moessbauer To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH v2 2/3] deploy boot files via sstate-cache Date: Sat, 18 Feb 2023 10:30:37 +0000 Message-Id: <20230218103038.3005105-3-felix.moessbauer@siemens.com> In-Reply-To: <20230218103038.3005105-1-felix.moessbauer@siemens.com> References: <20230218103038.3005105-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=AID4XIjp; spf=pass (google.com: domain of fm-72506-20230218103109ef013ba5146627c117-f_tdzy@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-72506-20230218103109ef013ba5146627c117-f_TdZy@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..6277069f 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" 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