From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7000822935908777984 X-Received: by 2002:a05:6512:6c8:: with SMTP id u8mr4075430lff.130.1630006111721; Thu, 26 Aug 2021 12:28:31 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:c13:: with SMTP id z19ls952953lfu.0.gmail; Thu, 26 Aug 2021 12:28:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz7dKOqiyu1gEADOPYVGbpwVGjHU4BXT4zDjfjE+cupvrtnEuVdmv9ggfiiStmhLxl+rtyB X-Received: by 2002:a05:6512:320c:: with SMTP id d12mr4057785lfe.8.1630006110724; Thu, 26 Aug 2021 12:28:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630006110; cv=none; d=google.com; s=arc-20160816; b=wTdu4SHgUpKFAzX/JyZeGaIn9hW9/W12Z1XLwf9kY76WHLNN41EEQqF358JB1n/Z+6 L2LS5n4aFyvGlFzpqTZzsEnZspX/Vu/oGhawJs7ok54mkoopE6bnNSLlAVzRMs735dSQ 33+Ddz5uifh/tfEch9EG+UC7nKoKpZEQl6TL4V/evBy4Fh3ViepddS4jMGzkcHodOHj8 pNTofHmLgc5L/hZtbAb+nTHy9L/vUzCcD+RtxGdewbzJVY4TIjhtBNjxiKirv3k4XQKI wcgC0vkVt1q0IzTFkAC15uu2VBYXP9d7RZ+Yx2xmBPGqVPQ4gx6HSqh5gb8v0U9n+DOk jgsw== 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=feChPuSDF5leaCfdFwQzoWQjYNh26jGFcKsuN9QNGv8=; b=j0flkpFqfsddN9HFzBbYTn7RWLu8smRF6dIBelzVxBT4PtRlzL6rL8+/m2S/7ZCXfr o16eZVP6ieUMYRJa6K1TMJwB2lawY5g013fOzD8gGQSxUxH7oB6nAUqRU2YZZiPmT+S1 CeA2DchPt020lUIt4FkLR+bx7V+zrjzpATsoiIhNTQ8cKkUqDXbMXzkkHj/LhWD+ShBG dANbo2awCDTdQHcwqI9lBJmcoGPjxy4BcXpynYxbKnZxHqKnuv/fZ1mo2rYXMvGAhukq LywVUiO1Fh11Aqi8ZsOm5MYcKpQPzPi0hZWI0PtDaZ4FS+2WZ/FQRkVMyLMZTVVkn+PM aGbQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id h13si236197ljj.7.2021.08.26.12.28.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Aug 2021 12:28:30 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 17QJSTjX026141 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 26 Aug 2021 21:28:29 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.59]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 17QJSTiY026014; Thu, 26 Aug 2021 21:28:29 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH 3/3] wic: clean up wic class in terms of isar variables Date: Thu, 26 Aug 2021 21:28:27 +0200 Message-Id: <20210826192827.2653-4-henning.schild@siemens.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210826192827.2653-1-henning.schild@siemens.com> References: <20210826192827.2653-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 0g/W0MHJBeE9 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 --- 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