From 3db0d0650367da9874f4931a80709c6e8d590990 Mon Sep 17 00:00:00 2001 From: Vijai Kumar K Date: Tue, 22 Feb 2022 13:58:54 +0530 Subject: [PATCH] meta-isar: create our own target image Create our own variation of image called mtda-image. Closes: #210 Signed-off-by: Vijai Kumar K --- .github/workflows/main.yml | 4 ++-- kas/common/base.yml | 2 +- kas/debian/mtda-nanopi-all.yml | 4 ++-- meta-isar/recipes-core/images/isar-image-base.bbappend | 8 -------- .../images/{mtda-image.inc => mtda-image.bb} | 9 +++++++++ 5 files changed, 14 insertions(+), 13 deletions(-) delete mode 100644 meta-isar/recipes-core/images/isar-image-base.bbappend rename meta-isar/recipes-core/images/{mtda-image.inc => mtda-image.bb} (93%) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d5349b09..b540e101 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -53,8 +53,8 @@ jobs: with: name: mtda-nanopi-images path: | - build-nanopi/tmp/deploy/images/nanopi-*/isar-image-base-mtda-bullseye-nanopi-*.wic.img - build-nanopi/tmp/deploy/images/nanopi-*/isar-image-base-mtda-bullseye-nanopi-*.wic.img.bmap + build-nanopi/tmp/deploy/images/nanopi-*/mtda-image-mtda-bullseye-nanopi-*.wic.img + build-nanopi/tmp/deploy/images/nanopi-*/mtda-image-mtda-bullseye-nanopi-*.wic.img.bmap - name: Publish .deb to Gemfury env: GEMFURY_PUSH_TOKEN: ${{ secrets.GEMFURY_PUSH_TOKEN }} diff --git a/kas/common/base.yml b/kas/common/base.yml index d7feb020..d7d3305b 100644 --- a/kas/common/base.yml +++ b/kas/common/base.yml @@ -12,7 +12,7 @@ header: version: 10 -target: isar-image-base +target: mtda-image repos: mtda: diff --git a/kas/debian/mtda-nanopi-all.yml b/kas/debian/mtda-nanopi-all.yml index 73deb1e1..ce88e4bc 100644 --- a/kas/debian/mtda-nanopi-all.yml +++ b/kas/debian/mtda-nanopi-all.yml @@ -17,8 +17,8 @@ header: - kas/debian/bullseye-base.yml target: - - mc:nanopi-neo:isar-image-base - - mc:nanopi-r1:isar-image-base + - mc:nanopi-neo:mtda-image + - mc:nanopi-r1:mtda-image local_conf_header: mtda: | diff --git a/meta-isar/recipes-core/images/isar-image-base.bbappend b/meta-isar/recipes-core/images/isar-image-base.bbappend deleted file mode 100644 index effc702f..00000000 --- a/meta-isar/recipes-core/images/isar-image-base.bbappend +++ /dev/null @@ -1,8 +0,0 @@ -# --------------------------------------------------------------------------- -# This Isar layer is part of MTDA -# Copyright (C) 2021 Siemens Digital Industries Software -# --------------------------------------------------------------------------- -# SPDX-License-Identifier: MIT -# --------------------------------------------------------------------------- - -require recipes-core/images/mtda-image.inc diff --git a/meta-isar/recipes-core/images/mtda-image.inc b/meta-isar/recipes-core/images/mtda-image.bb similarity index 93% rename from meta-isar/recipes-core/images/mtda-image.inc rename to meta-isar/recipes-core/images/mtda-image.bb index 139f98d2..f5456a17 100644 --- a/meta-isar/recipes-core/images/mtda-image.inc +++ b/meta-isar/recipes-core/images/mtda-image.bb @@ -5,6 +5,15 @@ # SPDX-License-Identifier: MIT # --------------------------------------------------------------------------- +inherit image + +DESCRIPTION = "Debian image for MTDA assist boards" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.MIT;md5=838c366f69b72c5df05c96dff79b35f2" + +PV = "1.0" + ISAR_RELEASE_CMD = "git -C ${LAYERDIR_mtda} describe --tags --dirty --match 'v[0-9].[0-9]*'" # Default device/file to use for our USB Mass Storage Gadget