From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6599936908158042112 X-Received: by 2002:a50:adc2:: with SMTP id b2-v6mr5240492edd.7.1536667559403; Tue, 11 Sep 2018 05:05:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:add4:: with SMTP id b20-v6ls1446181edd.7.gmail; Tue, 11 Sep 2018 05:05:58 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdbtm5rknniye1+GaifgBpaaSD+9gUmOOyG7yLUo4GhVgMEAYqLXbOk0znd+t8UIaXrKC9qm X-Received: by 2002:a50:ac45:: with SMTP id w5-v6mr5283678edc.4.1536667558941; Tue, 11 Sep 2018 05:05:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536667558; cv=none; d=google.com; s=arc-20160816; b=jbWXdiBfWm0U8cr62w2aXGX78Sb+2Z06Pdj5d4M55071N4Ly1QI80LOMq4MNaICQ4J oRQzUfsx0fu1B8RUSZH3i10Xeumpbqk5frEC1fLMcWVCMKzZZUF24ODhg8ObJkFjSL7C 7KlJisIAcb/QRGaEXHbutTemy7giq5ftqmIE3XKYXK+C0eHzArgDjKYTS17PhtwxEAmR 3UigGMiAhiY4ImWD4MH5AkWECFjAIYS42LQyfDi8ZJ4Yi+Hjh0Z7dBFTNOOJp9xNatT2 M3Y73mgH8eFsMk9T8YoLexAfTpKYP0ReonW5ss6HOwvA0TKfx+5DNQZLmQhY5YtGY7Ra BnXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:to:from; bh=mpDfEw6zbNGWHecFNT+5ONxadVm0PHif7vuymZgPkjA=; b=SSYy4vew0ZRW2vQzJCLOSmgp3WMwdnyNT67pCe+YSqkAVRflUlpRyP9VQE6dSzT6zA Azdv+jzsH5s1ymkL3eWkEvdkVeAl3KU0dINkLKw0Ms+3fMJG7z5y5XOTd2n4BwR4ChH+ uuaWM8s1KKsCUq4nWE0gMB9+cnYqtN8jQuHIqAz4zEqQP1waCqvk775+PC7k9+kRCBPH 57A052uLli6S79wFM7uqi45+SSY5YMcgowkzgTnOPfbvXA4qeeyJQ0c/xZEnSsgkaYvD 9GjgQPhezrJcihEnGlNeFgMZcL61eTQMbHc/HgOGLbL68p7mPXrhck9KIwRKZuZRTM5p F7eg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id l37-v6si739898edb.5.2018.09.11.05.05.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Sep 2018 05:05:58 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@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 jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@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 w8BC5wJo018029 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 11 Sep 2018 14:05:58 +0200 Received: from md1f2u6c.ad001.siemens.net (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id w8BC5vIX000884 for ; Tue, 11 Sep 2018 14:05:58 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH 13/16] image: Limit ROOTFS_EXTRA to non-wic image type Date: Tue, 11 Sep 2018 14:05:53 +0200 Message-Id: X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: SQuTDUwpsUua From: Jan Kiszka wic does its own extra-space / overhead-factor management, and the proper interface for that is the wks file. However, keep the ROOTFS_EXTRA for other image types. Signed-off-by: Jan Kiszka --- meta/classes/image.bbclass | 12 ++++++------ meta/classes/wic-img.bbclass | 3 +++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index c251477..3f00806 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -7,6 +7,12 @@ IMAGE_ROOTFS = "${WORKDIR}/rootfs" IMAGE_INSTALL += "${@ ("linux-image-" + d.getVar("KERNEL_NAME", True)) if d.getVar("KERNEL_NAME", True) else ""}" +# These variables are used by wic and start_vm +KERNEL_IMAGE ?= "${@get_image_name(d, 'vmlinuz')[1]}" +INITRD_IMAGE ?= "${@get_image_name(d, 'initrd.img')[1]}" + +inherit ${IMAGE_TYPE} + # Extra space for rootfs in MB ROOTFS_EXTRA ?= "64" @@ -57,12 +63,6 @@ python set_image_size () { d.setVarFlag('ROOTFS_SIZE', 'export', '1') } -# These variables are used by wic and start_vm -KERNEL_IMAGE ?= "${@get_image_name(d, 'vmlinuz')[1]}" -INITRD_IMAGE ?= "${@get_image_name(d, 'initrd.img')[1]}" - -inherit ${IMAGE_TYPE} - do_rootfs[stamp-extra-info] = "${MACHINE}-${DISTRO}" do_rootfs[depends] = "isar-apt:do_cache_config isar-bootstrap-target:do_bootstrap" diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass index 475326d..3ac613c 100644 --- a/meta/classes/wic-img.bbclass +++ b/meta/classes/wic-img.bbclass @@ -9,6 +9,9 @@ python () { bb.fatal("WKS_FILE must be set") } +# wic comes with reasonable defaults, and the proper interface is the wks file +ROOTFS_EXTRA ?= "0" + STAGING_DATADIR ?= "/usr/lib/" STAGING_LIBDIR ?= "/usr/lib/" STAGING_DIR ?= "${TMPDIR}" -- 2.16.4