From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7201062888117633024 X-Received: by 2002:a2e:a99b:0:b0:294:d75f:4cc6 with SMTP id x27-20020a2ea99b000000b00294d75f4cc6mr1156126ljq.0.1676716271214; 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-Google-Smtp-Source: AK7set8uktnJbGkS8ksd2k15vvUk7mzVVnMWze5HOk37VnT5wAM7GAUCcowybOkRctsqKGPuiD9u 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 Return-Path: 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; 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 Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20230218103109ef013ba5146627c117 for ; Sat, 18 Feb 2023 11:31:09 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=oE2bJuFUb3dyxYHtGh67XsZbHV+kDF3DnuehsH9qMLk=; b=AID4XIjpwG45cXcCN57aCRiUH8Tj6dv33uysHzB+KYdCsqOb1UyU2wxZgaWRsHYik/TBuw 67eB1x386bU5ezWWbgKFurS8MlVde+T1HZ72M+bHoIUXa4DkLzpKADntKwJGcz6udfPqpPry Ss13x0fTZ5YW2xwfv1rxr09UTfkIM=; 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 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-TUID: 3PglFMV3XvaD 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 -- 2.34.1