From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7000822935908777984 X-Received: by 2002:adf:d081:: with SMTP id y1mr9510799wrh.148.1630059937042; Fri, 27 Aug 2021 03:25:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:a314:: with SMTP id c20ls604366wrb.2.gmail; Fri, 27 Aug 2021 03:25:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwkJMuVoUzcCPiELh2e+IznF2Ut/4I7tProv6QRr7kaenwoTe9+AxpPyV3iZrUSWmEgaKgQ X-Received: by 2002:adf:9084:: with SMTP id i4mr9483024wri.23.1630059935909; Fri, 27 Aug 2021 03:25:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630059935; cv=none; d=google.com; s=arc-20160816; b=InCT0pxV93tBJ7wqmtyrHuUz53SCcnw6nKYeKf9/1Xqabnp9iBzMYpYiJRhPPmxK9x LH5jnlLXGBHWetNI14e//IzyVIB0ZFfUkfn/Zw6GWA2Nrsy+cest1UmG2xQqyyc2zwFe /BiyPP1lrK5qIlOrLF9LnJJlJ2zKlUc2DZI5ojISgg9BldfHEW013mXn7VNuQTjmWYfe l+IKE5c9yewxMncNyI5st4jy4zFnKr8wbcARlxUR/WiLUjhttRlEaiRK2NsLkF1H5nvD O8GKGf172ISA8ItgBoHycjj1DHRx4dBjNdoS0YrCLul4HUa7iTyIhdr/KG9YV7w9+RxA 9qMw== 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=6L1CjUqRKum6KDOMNEilLSLhcSJ4IxUARKW5emZ5rC4=; b=zgxEVA3vCFebHMMw3vkGws47F99FmQH5kgqQC/t2h1hJ+rtzSQWGSK1yl7DLO6YSpn l8iUqRVM7aAqEVBw2FWqhJHW1PojfdBgUA84Shij8nFhZFJgJkFTMOVHHHFCPQQc4PLU jtoInNqsXvOS69unfBZlgo4Wt4KP3K3sHj0Cj1P3IABtXHB3rqV+1s/Ijwgcy2C2LzTg NWZxKRlX0fZtqtmNuQ6dYZ+huVp5zp00uVPihlcwZjbqeqAPhGrURzQN+i1T9usO05BU MPb8T587qywKRbQqQaEsGAtbPywW7hXjBMmF1bfaQ3/j4r4Rf37GEFuuKez/5Ryqv4Ln P16w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 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 goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id w3si799915wmk.1.2021.08.27.03.25.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Aug 2021 03:25:35 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 17RAPZdQ018959 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 27 Aug 2021 12:25:35 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.59]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 17RAPZZ8031573; Fri, 27 Aug 2021 12:25:35 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH v2 3/3] wic: clean up wic class in terms of isar variables Date: Fri, 27 Aug 2021 12:25:33 +0200 Message-Id: <20210827102533.11100-4-henning.schild@siemens.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210827102533.11100-1-henning.schild@siemens.com> References: <20210827102533.11100-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: T7VyrZAEybcE 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..597ade2eaf65 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 DISTRO DISTRO_ARCH" python do_rootfs_wicenv () { wicvars = d.getVar('WICVARS', True) -- 2.31.1