From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7000822935908777984 X-Received: by 2002:adf:d0c3:: with SMTP id z3mr9291967wrh.108.1630056789864; Fri, 27 Aug 2021 02:33:09 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1994:: with SMTP id t20ls5928640wmq.2.canary-gmail; Fri, 27 Aug 2021 02:33:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxzn6BaQhaObDmma2iaBuksJhUoZujjGlr63SdSbpXYT9xrE6uolToCxIlM0DH8EkM9LOu8 X-Received: by 2002:a05:600c:3542:: with SMTP id i2mr7550377wmq.170.1630056788968; Fri, 27 Aug 2021 02:33:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630056788; cv=none; d=google.com; s=arc-20160816; b=NfYBVMIMfcyj7rZylIs+absg1kVUBW5f1lLks9Bt39Ypnb38Yt2CzP8Kb2wBIvXOyg 4k1yC31Dc4EWnOLFONQckNpBbEoZ32aOYiF7voZo2y4HQP9jgeV95Em83eFelNRGsPum dS++o4e6yXW8fmm2tZmTszIhzV45EwOB0xm2u50WIFg2vWMZuDokA8IfInRKq63p9ssK Zb97v203M0NFboOenLNZWWc+S5D5n5XOifmcrALoxPOwbZqRJuqmmBkAHksBC9ZCbAj6 oj9p6ch1CJNS3/y3LvRTYmYmMhuRzI911XFGSrH2WJ8xysdQTzkPrvVJk5T0mmqgWC7A XJlw== 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:subject:to:from:date; bh=0fFK45sV2LksAIE7cHs5QWKUqXtXsSdwW5c99WRqvjs=; b=I3dmEQ55zMYjRyU+asxPlgtuwdjxJi8RnpLBhgT6pskzVt+PbwKWaflv9rRer+G3rM cp+izJM032+/WA0l4TEn453L3WmPHA9upTXs4zb9NzRBuzcU43IyaJz00DDQ5IW3/PTb +8m9Sw8CVdjV7kaqs9SgPUCfTpaTZyO4bkWX5UXXIATUsMpTGy1dzjCD7aeanFabNlT5 ImEjOEFgsJ7YzZO5BDzI8vyMzQEmYqUMvTYjJqN3niFH/0feevs+6l5foY6ggGeJp6dp 3dMhHn6CBijU0uP5+A8sLKv40AY33+Mxd2ygnR960rYRrBaiErae+L50ciqckPKVqGVG XzZg== 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 u16si440660wrg.5.2021.08.27.02.33.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Aug 2021 02:33:08 -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 mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 17R9X8V4024291 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 27 Aug 2021 11:33:08 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.59]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 17R9X8Ih008557 for ; Fri, 27 Aug 2021 11:33:08 +0200 Date: Fri, 27 Aug 2021 11:33:07 +0200 From: Henning Schild To: Subject: Re: [PATCH 3/3] wic: clean up wic class in terms of isar variables Message-ID: <20210827113307.79976a4c@md1za8fc.ad001.siemens.net> In-Reply-To: <20210826192827.2653-4-henning.schild@siemens.com> References: <20210826192827.2653-1-henning.schild@siemens.com> <20210826192827.2653-4-henning.schild@siemens.com> X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: XWpP+zypUgB1 Am Thu, 26 Aug 2021 21:28:27 +0200 schrieb Henning Schild : > 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" This is going too far. DISTRO and DISTRO_ARCH are used in the efi plugin and need to remain in the append. Henning > > python do_rootfs_wicenv () { > wicvars = d.getVar('WICVARS', True)