From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7003689951757860864 X-Received: by 2002:a19:ac0d:: with SMTP id g13mr2588943lfc.146.1630673640240; Fri, 03 Sep 2021 05:54:00 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:503:: with SMTP id o3ls1176453ljp.0.gmail; Fri, 03 Sep 2021 05:53:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzVjy0tR79/BJEKBzUGA5zoA0LWJ8XU5xo5Lwz0HzWxgX7fh2+Qk2fGcnkBsSpDwbN4K9bB X-Received: by 2002:a2e:7401:: with SMTP id p1mr2755610ljc.303.1630673639189; Fri, 03 Sep 2021 05:53:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630673639; cv=none; d=google.com; s=arc-20160816; b=QWsotPY5hZB4UjYC0I85meuYn7vbPba84zdHMBwLEqfP2fzWCSAT7nqEnj6kZF42gC tciPLdKWiq/8mVODdXTFMXZYv6zZpsXuG0RFXIaEJFnvnrOVcqwlkg9NUSsw/HB0k8b7 We7iRFoO2q5dt07+hltNnizYOOIxOHEgeq9/ekojNPb2RmCPSOc4zZGBdYH2K1Od982x 8wzvdUUQJsb6ZiA714JtNIS4pyaP3aH4TW3eYzm+jb/3ws4qoJ0PIx2d1WdTgcz90ius kq7ac5t3X30Rqr0bX3Ng9dl6UD45Et/aD5y/5L80OG0uZgGcRIlVE8FK539rp13fc/NO KmDQ== 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=Q/Fgr7165qzh4XL9d2IuOyQJlD0Hadi5TrKqZrCRs7c=; b=0QA6JYvgvHSHT8s0H1VVRZLWstqoVrJzcDgV74psV3QXKepSz3mgRjEH74RmZsWMPS W+a1xwZJ6XgCg24gTvIBaCVo8HXd/5uJntPyyI/4QYR2pWHFVsPnimuhXvnfO52PgVr4 euoQbyV3eS71wjWtUyO5LH2Eiasqbk7UpWIAiGGTX+vcv4Rl+2XIVEy4NWrBwH/ZJWKB F+m2qAiMXdZ/XrDlgm1UoYHsv/cUXygjhPPUKDSm4FuxsvRImO4s00tNVKvZoWCLxRbE zyqIBv8mSc+0CTrgw/6yUrjX3ME99GCKRdu1yBsp0oY+7so/zzWFAPyrgoAaL5dw7e4K ngJQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 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 thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id h13si219834ljj.7.2021.09.03.05.53.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Sep 2021 05:53:59 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 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 thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 183CrwQg005879 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 3 Sep 2021 14:53:58 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.59]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 183CrvB2029234; Fri, 3 Sep 2021 14:53:58 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Florian Bezdeka , Vijai Kumar K , jan.kiszka@siemens.com, Henning Schild Subject: [PATCH v2 4/7] wic: clean up wic class in terms of isar variables Date: Fri, 3 Sep 2021 14:53:52 +0200 Message-Id: <20210903125355.12279-5-henning.schild@siemens.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210903125355.12279-1-henning.schild@siemens.com> References: <20210903125355.12279-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 4KzmjwsvqueR 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 170b83ed3416..d849ad9fae5f 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 += "DISTRO DISTRO_ARCH" python do_rootfs_wicenv () { wicvars = d.getVar('WICVARS', True) -- 2.32.0