From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6950664923339816960 X-Received: by 2002:a17:906:44b:: with SMTP id e11mr25332680eja.551.1618327787077; Tue, 13 Apr 2021 08:29:47 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:50cd:: with SMTP id h13ls4025528edb.3.gmail; Tue, 13 Apr 2021 08:29:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxGQ54FdsJwztk0fLU5hiQGsnsQ+HarmiEaMUQizyZajHEV57aS7f1sYf+aAiAnF/gM/qZb X-Received: by 2002:a05:6402:5255:: with SMTP id t21mr35664470edd.91.1618327786282; Tue, 13 Apr 2021 08:29:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618327786; cv=none; d=google.com; s=arc-20160816; b=LwEP8LeobE+g7v/G1dnL4ipiZrRokVmoaeTEPZJfWOQVWbUBSreNXW4Wfr8vPtIRDo xl5klfdMZdwlreD9l58THCuM8KiWSxTRm6kyqcl2hixrVhoWrSJ47tmURy5yCDoGIH5w 66Uqb9E6r/f0LoeA51fZVIjCHSsil+P4yQbLQQA19Ac3HWNUhmlpaxRNTeCTRSdT/d/w 5GICuOmo9WL5QoNxzIbC7KQynwYKNoOA5iRINiJj1I0SbB2gJJRm6C3RMy8XrNDjdI56 YCXwjHaNW/7/Bc5QRztnRAZ6hnk5Z7BceBJeN8dlOFljiWVQ5Q2tFm//f0mD8SCxEx/x yCWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=gJu793pln+MznQFkm2+Sa02/FnDWTHn2DG5w79Joi7w=; b=meKR+g88aToM9I+LIrSHJjvQ8SIquhVmdqAuiMFZME5TsrXtCWuH4D9kAPuWtbIWNM eZJu1SdWJBPDXrsmNh6q0B+z51I3IlH+7cfGCixzdppm/cv3ma54VRaWiGkGWkH/78LK cAGRZ87WQLZIjE50Ldoo2IrwgfoOSEAiJMoKHTZBnP8HqXVBH9MRGSHPRUS7q4F8lflD YRynoQjIp1ZJaeJPZe5lfn3GDq6haUwMZme0L6wz2F93APWXyyp+lWj1yFGh4VJasN5R I/td6IVGPoU+H1g9jGkbHl9LbWo+FaVdyH2fZKx4/5wXuOm8V09d7FJPe7f6UpEdB4Fu oCcA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of silvano.cirujano-cuesta@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=silvano.cirujano-cuesta@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id b26si1047811edy.4.2021.04.13.08.29.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Apr 2021 08:29:46 -0700 (PDT) Received-SPF: pass (google.com: domain of silvano.cirujano-cuesta@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 silvano.cirujano-cuesta@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=silvano.cirujano-cuesta@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 gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 13DFTjgQ010879 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 13 Apr 2021 17:29:45 +0200 Received: from md1sf36c.ad001.siemens.net ([167.87.2.203]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 13DFQ7Dj015769 for ; Tue, 13 Apr 2021 17:26:08 +0200 From: Silvano Cirujano Cuesta To: isar-users@googlegroups.com Subject: [PATCH] fix: remove unneeded unconditional recipes Date: Tue, 13 Apr 2021 17:26:07 +0200 Message-Id: <20210413152607.201401-1-silvano.cirujano-cuesta@siemens.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: zOczPJGLUylQ 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 --- 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