From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7093752232369192960 X-Received: by 2002:a2e:b00a:0:b0:24f:e0f:dd1f with SMTP id y10-20020a2eb00a000000b0024f0e0fdd1fmr11422729ljk.221.1651642900620; Tue, 03 May 2022 22:41:40 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a596:0:b0:250:5d3e:5653 with SMTP id m22-20020a2ea596000000b002505d3e5653ls191762ljp.9.gmail; Tue, 03 May 2022 22:41:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxFT5MiefsJb8UwCPgXNz/z6U8DsOsT1dirvfUi1hNJ8lYt9HKm2pmQWgvz/PzDf807iuiu X-Received: by 2002:a2e:b5d1:0:b0:24f:331d:f9b6 with SMTP id g17-20020a2eb5d1000000b0024f331df9b6mr11499456ljn.302.1651642899482; Tue, 03 May 2022 22:41:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651642899; cv=none; d=google.com; s=arc-20160816; b=rRr2EaG075hDKFq5tIOsq0MzQ1GMdtNwpus0IvvcJ0hhF/esMKNFrj4Y6R8D1ToyNt 0TtwxFy2v/fjY283F4c3RPx2wMlwc8gJKFtQgR3NyTcS/jpwx+I29UHzpRD6wpWNJJEZ yl3YGxXhBPTMcG1gt9IOyuVkXsZfH6Z16xmKlHbWB0Kn7lBg+zWgtyXd52IhGD2fDby0 E+u6yDqVY9y6INK5jGykTtukaYTgw89TQb4dnLsMpnBjRLG1wDiw4b9kWAE9uRHU/Jto FgvU08ZpG32t1qUblQ8qgr7kno3dnYIvxOhuBaqMgxC79KId5OTLEThIAEzKeYN/ORnB TOVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=5Wff5slArrRf3fiI43n3vLsZBduf+EctgYT0QBoMsVg=; b=iMmLvXoKTc/8+Z4DD6Q9K7Gql99c92NwzvJp2w0gX7H3bUPDJYS4bwOgEHdaKEUB9k bXg3arGa+UTeRPDDOuiqLZa3M0wzJkcdLg7IJF9ws2vTJ1benxQ8HV1xzPjfNP6Urdct iblS4rIxFJz+j5CjO0wSfYkzZVdIEbVATJ9enj3QfXdS3XGMWAEw68F++AwDQSntmp5B VYEhvU8pR85611bWO+dFocNd9t0brsd7XAW0Y6napbQUU9krG66vqZHxVcUetLRRSKmO NB0H1tnn0WYUFoZBK8E257RP/ODnfh3SbmTCpnxJyAtI6eaczMQ5+AKziSzYAmG9QijX KkCQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id i18-20020a2e8652000000b0024f1cf9b1b0si898316ljj.4.2022.05.03.22.41.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 May 2022 22:41:39 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (mm-119-82-214-37.mgts.dynamic.pppoe.byfly.by [37.214.82.119] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 2445fZ1b030650 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 4 May 2022 07:41:38 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, Anton Mikanovich Subject: [PATCH v3 2/7] ubi: Move imager-related defines to image bbclasses Date: Wed, 4 May 2022 08:41:24 +0300 Message-Id: <20220504054129.15218-3-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220504054129.15218-1-amikan@ilbers.de> References: <20220504054129.15218-1-amikan@ilbers.de> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED 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-TUID: HR0PCSgAuqIK To be able to use some default deploy paths of kernel, initrd and dtb in any image move these declarations into image bbclass. The same done with ubifs and fit image deploy paths moving default ones to imagetypes bbclass. Also move template-related variables to imagetypes bbclass because they are only used for imager. Signed-off-by: Anton Mikanovich --- meta-isar/recipes-core/images/isar-image-ubi.bb | 14 -------------- meta/classes/image.bbclass | 6 ++++++ meta/classes/imagetypes.bbclass | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/meta-isar/recipes-core/images/isar-image-ubi.bb b/meta-isar/recipes-core/images/isar-image-ubi.bb index 8c70c1f..b01ecff 100644 --- a/meta-isar/recipes-core/images/isar-image-ubi.bb +++ b/meta-isar/recipes-core/images/isar-image-ubi.bb @@ -11,17 +11,3 @@ LICENSE = "gpl-2.0" LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" inherit image - -SRC_URI += "file://ubinize.cfg.tmpl \ - file://fitimage.its.tmpl" - -TEMPLATE_VARS = "KERNEL_IMG INITRD_IMG DTB_IMG UBIFS_IMG FIT_IMG" -TEMPLATE_FILES = "ubinize.cfg.tmpl fitimage.its.tmpl" - -KERNEL_IMG = "${PP_DEPLOY}/${KERNEL_IMAGE}" -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]}" - -UBIFS_IMG = "${PP_DEPLOY}/${IMAGE_FULLNAME}.ubifs" -FIT_IMG = "${PP_DEPLOY}/${IMAGE_FULLNAME}.fit" diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 0246ad3..aa6c510 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -328,6 +328,12 @@ devtmpfs /dev devtmpfs mode=0755,nosuid 0 0 EOF } +# Default kernel, initrd and dtb image deploy paths (inside imager) +KERNEL_IMG = "${PP_DEPLOY}/${KERNEL_IMAGE}" +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() { diff --git a/meta/classes/imagetypes.bbclass b/meta/classes/imagetypes.bbclass index 07ad0cd..2838c96 100644 --- a/meta/classes/imagetypes.bbclass +++ b/meta/classes/imagetypes.bbclass @@ -39,6 +39,13 @@ MKIMAGE_ARGS ??= "" FIT_IMAGE_SOURCE ??= "fitimage.its" IMAGER_INSTALL_fit += "u-boot-tools device-tree-compiler" +IMAGE_SRC_URI_fit = "file://${FIT_IMAGE_SOURCE}.tmpl" +IMAGE_TEMPLATE_FILES_fit = "${FIT_IMAGE_SOURCE}.tmpl" +IMAGE_TEMPLATE_VARS_fit = "KERNEL_IMG INITRD_IMG DTB_IMG" + +# Default fit image deploy path (inside imager) +FIT_IMG ?= "${PP_DEPLOY}/${IMAGE_FULLNAME}.fit" + IMAGE_CMD_fit() { if [ ! -e "${WORKDIR}/${FIT_IMAGE_SOURCE}" ]; then die "FIT_IMAGE_SOURCE does not contain fitimage source file" @@ -53,6 +60,9 @@ IMAGE_CMD_fit[depends] = "${PN}:do_transform_template" IMAGER_INSTALL_ubifs += "mtd-utils" IMAGE_CMD_REQUIRED_ARGS_ubifs = "MKUBIFS_ARGS" +# Default UBIFS image deploy path (inside imager) +UBIFS_IMG ?= "${PP_DEPLOY}/${IMAGE_FULLNAME}.ubifs" + # glibc bug 23960 https://sourceware.org/bugzilla/show_bug.cgi?id=23960 # should not use QEMU on armhf target with mkfs.ubifs < v2.1.3 THIS_ISAR_CROSS_COMPILE := "${ISAR_CROSS_COMPILE}" @@ -68,6 +78,10 @@ IMAGER_INSTALL_ubi += "mtd-utils" IMAGE_CMD_REQUIRED_ARGS_ubi = "UBINIZE_ARGS" UBINIZE_CFG ??= "ubinize.cfg" +IMAGE_SRC_URI_ubi = "file://${UBINIZE_CFG}.tmpl" +IMAGE_TEMPLATE_FILES_ubi = "${UBINIZE_CFG}.tmpl" +IMAGE_TEMPLATE_VARS_ubi = "KERNEL_IMG INITRD_IMG DTB_IMG UBIFS_IMG FIT_IMG" + IMAGE_CMD_ubi() { if [ ! -e "${WORKDIR}/${UBINIZE_CFG}" ]; then die "UBINIZE_CFG does not contain ubinize config file." -- 2.17.1