From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7086521111035248640 X-Received: by 2002:a05:600c:1548:b0:38e:b434:bda5 with SMTP id f8-20020a05600c154800b0038eb434bda5mr4404633wmg.166.1649959275411; Thu, 14 Apr 2022 11:01:15 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:1d8c:b0:207:aa22:e989 with SMTP id bk12-20020a0560001d8c00b00207aa22e989ls3300294wrb.1.gmail; Thu, 14 Apr 2022 11:01:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIAZlRd/kdH8c2/CBWF9iLb56h/jGz06wisWxTUSUJ1Lfi1tFJmbKN9rfkwWvn9tvdP55I X-Received: by 2002:a05:6000:1d82:b0:207:adeb:b797 with SMTP id bk2-20020a0560001d8200b00207adebb797mr2936913wrb.324.1649959274423; Thu, 14 Apr 2022 11:01:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649959274; cv=none; d=google.com; s=arc-20160816; b=wVJLH8jpQqIwcWo7fBJMas9uLqQb3EILEZhivY9X4ZynI51aSXFSzXQK8UwxdWng0J ux8WMQdSv9Ks8pDub4L8E2HSYcmvA9zYZ/hDPFrzf90vEhnqG/m3poitL+m1TBgbXmqo disXMjiiOUpP/6d63HR6gqgnTC/d+V516ygM7oErG56abDFqT0yGUdVhUZElcGg6yMkE NMBZKH6j9Oyo1dnzOu8xAc0yTY9kdbF0fvakkyRwUrY7FKQohyHCl+P0RjySSH49R3D9 UUyk/j/i4aT89hBNUcVSzARKbT+4Y6895X3IojjNzT/kQ70lazDkOvQIXOHfnJBmi5PH AqrQ== 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=hfuMfQrkMb4i5wDKcReShS0tJS6bqTvYo0WSt/1jaqk=; b=Ig9MaZAOPhtFfp0cY63QZHhE9GM+h3zQe0vvvkV1TuJmlN127vf2ImOyxJlyU0MGIJ cO4lxDBN9OcvJVEygqMuXliEAVPVLyZSpbMqNkj664DIKNh/FyV3a09ffHF1IJhgg7qW tdMe6uJe6uqSyX9fZM64WcIDowmBDSqpaNNz1NDta3HZ4v6E35anUoAVox0jaTk2WcZS 1GDMUmgdAFD9zOy695JsZl8KGbW1ZwkKbo7v3zO6AQ1nYqVRdK/IMYqlVguXYybBda0V ogxCjMDUK00qhMb5dkQn/iweYvxkhCsCRe7uVmekRUQW2rUrWYM41KIOTcBw9oYPwQgg zYoQ== 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 186-20020a1c02c3000000b0038ed7affcc5si41176wmc.0.2022.04.14.11.01.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Apr 2022 11:01:14 -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-207-50-214-37.mgts.dynamic.pppoe.byfly.by [37.214.50.207] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 23EI19vh008241 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 14 Apr 2022 20:01:13 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 2/7] ubi: Move imager-related defines to image bbclasses Date: Thu, 14 Apr 2022 21:00:56 +0300 Message-Id: <20220414180101.3373-3-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220414180101.3373-1-amikan@ilbers.de> References: <20220414180101.3373-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: YekaqCvEodAl 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 e3a64d1..11d2ca9 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -318,6 +318,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 a31a198..acb3401 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 python() { @@ -70,6 +80,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