From: Henning Schild <henning.schild@siemens.com>
To: isar-users@googlegroups.com
Cc: Henning Schild <henning.schild@siemens.com>
Subject: [PATCH 3/3] wic: clean up wic class in terms of isar variables
Date: Thu, 26 Aug 2021 21:28:27 +0200 [thread overview]
Message-ID: <20210826192827.2653-4-henning.schild@siemens.com> (raw)
In-Reply-To: <20210826192827.2653-1-henning.schild@siemens.com>
Move "KERNEL_FILE" into out Isar append, remove meanwhile unused
variables from that append and add a comment to prevent further
"messing" with forked bits.
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
meta/classes/wic-img.bbclass | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass
index f6413126167f..a49aa083e11c 100644
--- a/meta/classes/wic-img.bbclass
+++ b/meta/classes/wic-img.bbclass
@@ -92,14 +92,14 @@ BUILDCHROOT_DIR = "${BUILDCHROOT_TARGET_DIR}"
WIC_CREATE_EXTRA_ARGS ?= ""
+# taken from OE, do not touch directly
WICVARS += "\
BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD IMAGE_BASENAME IMAGE_BOOT_FILES \
IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR RECIPE_SYSROOT_NATIVE \
- ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS TRANSLATED_TARGET_ARCH \
- KERNEL_FILE"
+ ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS TRANSLATED_TARGET_ARCH"
# Isar specific vars used in our plugins
-WICVARS += "KERNEL_IMAGE INITRD_IMAGE DISTRO DISTRO_ARCH"
+WICVARS += "KERNEL_FILE"
python do_rootfs_wicenv () {
wicvars = d.getVar('WICVARS', True)
--
2.31.1
next prev parent reply other threads:[~2021-08-26 19:28 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-26 19:28 [PATCH 0/3] re-fork wic pcbios plugin Henning Schild
2021-08-26 19:28 ` [PATCH 1/3] git: reset our fork to OE upstream for re-forking Henning Schild
2021-08-26 19:28 ` [PATCH 2/3] wic: apply the actual fork changes to our pcbios plugin fork Henning Schild
2021-08-27 7:35 ` Bezdeka, Florian
2021-08-27 9:32 ` Henning Schild
2021-08-26 19:28 ` Henning Schild [this message]
2021-08-27 9:33 ` [PATCH 3/3] wic: clean up wic class in terms of isar variables Henning Schild
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210826192827.2653-4-henning.schild@siemens.com \
--to=henning.schild@siemens.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox