From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7062708050763710464 X-Received: by 2002:a2e:b88d:: with SMTP id r13mr1602058ljp.452.1644414862505; Wed, 09 Feb 2022 05:54:22 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:98b:: with SMTP id b11ls368290ljq.7.gmail; Wed, 09 Feb 2022 05:54:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJyyAPwi+eLqi3v/z3sPUlwXkoDLovuWhP+aL/QlbWnG8cuevjbOpHHCyxF1IDQ/ArbxlgjP X-Received: by 2002:a05:651c:98b:: with SMTP id b11mr1574096ljq.272.1644414861534; Wed, 09 Feb 2022 05:54:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644414861; cv=none; d=google.com; s=arc-20160816; b=DRlmanfFSW2tJsb4g77ElSUcwIpjPyhstB4enzCA9w7QcLOUVfIEARqUMHHvh5r2uK 7S7v3ypOvDRfKRFIUYiEPskLMNX+ImVwZqbll2bsfp0dmcLKDLuKp04Qc8ZzNaJ2oN21 vGYd9IQvJVHhfdZRNdKdzFiTnFDMDBMCzLy4OE0V3UyHTqmX090b/t6W9Q1z7YuegI2x XwyZA/qU5zDpyoWCMxINEJRZeKDmhu0UnsDrhH8LKqvjJbPmFP2Fs34O+qAwGk1OLpjO fJySjAbSj4FNg+rd2Oe/8+eX4YAAdF3t5snPI4PxKtNb6jJY3O+NI4OIG7YbVy8X7Ol7 9s8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=SJ0X5zk4mnCibWuED0kZ360aQ4927coZahe1AN64tDA=; b=byyDXo4AL3lSy6T4w0zN2EPG3FshFjJ5I7Ht4bCeW7NgGalZt1Mb1GdLurMGtFSWL4 fm7wtK66hyeNToF45O0a0e4wLKA4hVlzUJVjj17GBEMhqsVCHHvfhTE9hHDY4j8I+gnn JxLVr8AnMgnlir4k2cPMq2G5SIp61SC+60ftHXocxBMXqRwzt//lrWcFGpydv83Nf8e3 nAKINxTCmf20vfPkXtzXdFqnua5Fz3LHBRAck4acmYfFqoaADTU+dr7Vr9x0bCok8thP rShjkzHMzXm8u/9X9c6A0cdPlsN4fBbYEGPKyO1wyorzEV7lQI+JEC4rhEkrD/SKm/oQ EaVg== 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 o24si952034lfb.1.2022.02.09.05.54.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 05:54:21 -0800 (PST) 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-169-26-214-37.mgts.dynamic.pppoe.byfly.by [37.214.26.169] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 219DsIEA024454 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 9 Feb 2022 14:54:20 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 1/7] ubi: Move default output paths to image class Date: Wed, 9 Feb 2022 16:54:05 +0300 Message-Id: <20220209135411.1313521-2-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220209135411.1313521-1-amikan@ilbers.de> References: <20220209135411.1313521-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: z6+IuV6WOubC 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 image type classes. Signed-off-by: Anton Mikanovich --- meta-isar/recipes-core/images/isar-image-ubi.bb | 8 -------- meta/classes/fit-img.bbclass | 5 ++++- meta/classes/image.bbclass | 6 ++++++ meta/classes/ubifs-img.bbclass | 5 ++++- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/meta-isar/recipes-core/images/isar-image-ubi.bb b/meta-isar/recipes-core/images/isar-image-ubi.bb index ef2cf1c..9323822 100644 --- a/meta-isar/recipes-core/images/isar-image-ubi.bb +++ b/meta-isar/recipes-core/images/isar-image-ubi.bb @@ -17,11 +17,3 @@ SRC_URI += "file://ubinize.cfg.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}/${UBIFS_IMAGE_FILE}" -FIT_IMG = "${PP_DEPLOY}/${FIT_IMAGE_FILE}" diff --git a/meta/classes/fit-img.bbclass b/meta/classes/fit-img.bbclass index 1ad0c5b..37736f0 100644 --- a/meta/classes/fit-img.bbclass +++ b/meta/classes/fit-img.bbclass @@ -10,6 +10,9 @@ FIT_IMAGE_FILE ?= "${IMAGE_FULLNAME}.fit.img" IMAGER_INSTALL += "u-boot-tools device-tree-compiler" +# Default fit image deploy path (inside imager) +FIT_IMG ?= "${PP_DEPLOY}/${FIT_IMAGE_FILE}" + # Generate fit image do_fit_image() { if [ ! -e "${WORKDIR}/${FIT_IMAGE_SOURCE}" ]; then @@ -22,7 +25,7 @@ do_fit_image() { # Create fit image using buildchroot tools sudo chroot ${BUILDCHROOT_DIR} /usr/bin/mkimage ${MKIMAGE_ARGS} \ - -f '${PP_WORK}/${FIT_IMAGE_SOURCE}' '${PP_DEPLOY}/${FIT_IMAGE_FILE}' + -f '${PP_WORK}/${FIT_IMAGE_SOURCE}' '${FIT_IMG}' sudo chown $(id -u):$(id -g) '${DEPLOY_DIR_IMAGE}/${FIT_IMAGE_FILE}' } addtask fit_image before do_image after do_image_tools do_transform_template diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 6d77243..4b56e91 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -140,6 +140,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/ubifs-img.bbclass b/meta/classes/ubifs-img.bbclass index 229eb3e..41814b0 100644 --- a/meta/classes/ubifs-img.bbclass +++ b/meta/classes/ubifs-img.bbclass @@ -10,6 +10,9 @@ python() { UBIFS_IMAGE_FILE ?= "${IMAGE_FULLNAME}.ubifs.img" +# Default UBIFS image deploy path (inside imager) +UBIFS_IMG ?= "${PP_DEPLOY}/${UBIFS_IMAGE_FILE}" + IMAGER_INSTALL += "mtd-utils" # glibc bug 23960 https://sourceware.org/bugzilla/show_bug.cgi?id=23960 @@ -24,7 +27,7 @@ do_ubifs_image() { # Create ubifs image using buildchroot tools sudo chroot ${BUILDCHROOT_DIR} /usr/sbin/mkfs.ubifs ${MKUBIFS_ARGS} \ - -r '${PP_ROOTFS}' '${PP_DEPLOY}/${UBIFS_IMAGE_FILE}' + -r '${PP_ROOTFS}' '${UBIFS_IMG}' sudo chown $(id -u):$(id -g) '${DEPLOY_DIR_IMAGE}/${UBIFS_IMAGE_FILE}' } -- 2.25.1