public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Silvano Cirujano Cuesta <silvano.cirujano-cuesta@siemens.com>
To: isar-users@googlegroups.com
Subject: [PATCH] fix: remove unneeded unconditional recipes
Date: Tue, 13 Apr 2021 17:26:07 +0200	[thread overview]
Message-ID: <20210413152607.201401-1-silvano.cirujano-cuesta@siemens.com> (raw)

Commit 9c3499adf91 introduced the unconditional inclusion of the recipes
isar-exclude-docs and isar-disable-apt-cache, but they are only needed
for container images.

Signed-off-by: Silvano Cirujano Cuesta <silvano.cirujano-cuesta@siemens.com>
---
 meta/classes/container-img.bbclass             | 2 ++
 meta/classes/image-container-extension.bbclass | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/classes/container-img.bbclass b/meta/classes/container-img.bbclass
index 79ef3e8..887d49e 100644
--- a/meta/classes/container-img.bbclass
+++ b/meta/classes/container-img.bbclass
@@ -6,6 +6,8 @@
 # This class provides the task 'containerize_rootfs'
 # to create container images containing the target rootfs.
 
+IMAGE_INSTALL += "isar-exclude-docs isar-disable-apt-cache"
+
 do_container_image[stamp-extra-info] = "${DISTRO}-${MACHINE}"
 do_container_image[vardeps] += "CONTAINER_FORMATS"
 do_container_image(){
diff --git a/meta/classes/image-container-extension.bbclass b/meta/classes/image-container-extension.bbclass
index f693627..e26604a 100644
--- a/meta/classes/image-container-extension.bbclass
+++ b/meta/classes/image-container-extension.bbclass
@@ -6,7 +6,6 @@
 # This class extends the image.bbclass for containerizing the root filesystem.
 
 CONTAINER_FORMATS ?= "docker-archive"
-IMAGE_INSTALL += "isar-exclude-docs isar-disable-apt-cache"
 
 containerize_rootfs() {
     local cmd="/bin/dash"
-- 
2.30.2


             reply	other threads:[~2021-04-13 15:29 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-13 15:26 Silvano Cirujano Cuesta [this message]
2021-04-13 16:01 ` Jan Kiszka
2021-04-14  7:45   ` Silvano Cirujano Cuesta

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210413152607.201401-1-silvano.cirujano-cuesta@siemens.com \
    --to=silvano.cirujano-cuesta@siemens.com \
    --cc=isar-users@googlegroups.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox