From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6514517411576676352 X-Received: by 10.223.130.240 with SMTP id 103mr668239wrc.13.1516779282315; Tue, 23 Jan 2018 23:34:42 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.84.19 with SMTP id i19ls2555219wmb.10.gmail; Tue, 23 Jan 2018 23:34:41 -0800 (PST) X-Google-Smtp-Source: AH8x225yH2ZQMrigpbxhE9hYEuE3AaZcEuvxPH9eU2sfHnSBCU6lA64zBac04h+Vq9YFMyA1QOFq X-Received: by 10.28.116.24 with SMTP id p24mr566191wmc.6.1516779281699; Tue, 23 Jan 2018 23:34:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516779281; cv=none; d=google.com; s=arc-20160816; b=ccw63Tfh5vF0o5lk3HFwcTWxuhk+uG5KBuq1YvlZV9VyO3+nktiq+t0LYwEIcsO1xV cN0FXXXrReoUajFs2yfn/HbiOXeg2LrGbT04z8WqcgvxgS5a/MJpPyOmdYmuBXOSBg0h 7p419FMv3Ola03WSD7xDUvOJ8TFbT9cOpRTBUjAYFoL1Y6DFudHK4mcfHFCBYnbQnpTH hiipNNV0zAeCkstMHqSdO0L5bO6CTJu8H2ly28Bv4NH2OnfiwE5U8io3xcnc+ho0FH3/ koqk/xG9zRj/Xh/qysB5Oab5QSecF/Tn79M+m0ox8r94U7XfUsodYOp7/W0/AqJMTo4/ PArQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:subject:from:to:arc-authentication-results; bh=eZ0n/g66ccWk+bgPelEW9+H0jNQINFfugBUhRFGYCDc=; b=gXUyLdBg/Ek6Ub5qG6XHWLnK6F7V6vRPV9oTqOlXheoCZfr8aHphSXKbx3TgXIo+7e cQSKlRHDRdGkgAT2XeU39IezS0xxbOuLDEVsoOcsYO5QIHu9bXIRrcGjPYukR1MjoGEe 34f72b0e77HuENG4Ltjhc225EEVQneJlLyPmrXW/sUNACwDhjl6lQs2AdRErh7HSXXy2 iizZtONWBwIeIDWwJHF2KMUbLW9CIoebi2onlSFPQ22SFY75Qe+QdI3QdTlhCMtlPSg0 Cblnjli4xIABcH3waTBwFfxyfeHG+vtPYHXQzV6jxxvzia/qZK532I3LhGFZjh6uXtN4 g8qg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id b10si77675wmc.0.2018.01.23.23.34.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Jan 2018 23:34:41 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w0O7YfLF007679 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 24 Jan 2018 08:34:41 +0100 Received: from md1f2u6c.ww002.siemens.net ([167.87.68.109]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w0O7Ye52006372 for ; Wed, 24 Jan 2018 08:34:40 +0100 To: isar-users From: Jan Kiszka Subject: [PATCH] Factor out meta-examples Message-ID: Date: Wed, 24 Jan 2018 08:34:40 +0100 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: 4/oTtBQ+PAHP From: Jan Kiszka Move recipes that have exemplary character (currently everything under recipes-app) into a separate layer that can easily be dropped when building real images. This also helps to ensure that no assumptions about customizations and core recipes sharing the same layer sneak in again. The meta-isar layer is still not completely clean as we keep bblayers.conf.sample and local.conf.sample prepared for building example images. Signed-off-by: Jan Kiszka --- meta-examples/conf/layer.conf | 13 +++++++++++++ .../recipes-app/example-raw/example-raw_0.2.bb | 0 .../recipes-app/example-raw/files/README | 0 .../recipes-app/example-raw/files/postinst | 0 {meta-isar => meta-examples}/recipes-app/hello/hello.bb | 0 meta-isar/conf/bblayers.conf.sample | 1 + 6 files changed, 14 insertions(+) create mode 100644 meta-examples/conf/layer.conf rename {meta-isar => meta-examples}/recipes-app/example-raw/example-raw_0.2.bb (100%) rename {meta-isar => meta-examples}/recipes-app/example-raw/files/README (100%) rename {meta-isar => meta-examples}/recipes-app/example-raw/files/postinst (100%) rename {meta-isar => meta-examples}/recipes-app/hello/hello.bb (100%) diff --git a/meta-examples/conf/layer.conf b/meta-examples/conf/layer.conf new file mode 100644 index 0000000..f244f26 --- /dev/null +++ b/meta-examples/conf/layer.conf @@ -0,0 +1,13 @@ +# This software is a part of ISAR. +# Copyright (c) Siemens AG, 2018 + +# We have a conf and classes directory, add to BBPATH +BBPATH .= ":${LAYERDIR}" + +# We have recipes-* directories, add to BBFILES +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "examples" +BBFILE_PATTERN_examples = "^${LAYERDIR}/" +BBFILE_PRIORITY_examples = "6" diff --git a/meta-isar/recipes-app/example-raw/example-raw_0.2.bb b/meta-examples/recipes-app/example-raw/example-raw_0.2.bb similarity index 100% rename from meta-isar/recipes-app/example-raw/example-raw_0.2.bb rename to meta-examples/recipes-app/example-raw/example-raw_0.2.bb diff --git a/meta-isar/recipes-app/example-raw/files/README b/meta-examples/recipes-app/example-raw/files/README similarity index 100% rename from meta-isar/recipes-app/example-raw/files/README rename to meta-examples/recipes-app/example-raw/files/README diff --git a/meta-isar/recipes-app/example-raw/files/postinst b/meta-examples/recipes-app/example-raw/files/postinst similarity index 100% rename from meta-isar/recipes-app/example-raw/files/postinst rename to meta-examples/recipes-app/example-raw/files/postinst diff --git a/meta-isar/recipes-app/hello/hello.bb b/meta-examples/recipes-app/hello/hello.bb similarity index 100% rename from meta-isar/recipes-app/hello/hello.bb rename to meta-examples/recipes-app/hello/hello.bb diff --git a/meta-isar/conf/bblayers.conf.sample b/meta-isar/conf/bblayers.conf.sample index 80867e7..6d9b471 100644 --- a/meta-isar/conf/bblayers.conf.sample +++ b/meta-isar/conf/bblayers.conf.sample @@ -8,6 +8,7 @@ BBFILES ?= "" BBLAYERS ?= " \ ##ISARROOT##/meta \ ##ISARROOT##/meta-isar \ + ##ISARROOT##/meta-examples \ " BBLAYERS_NON_REMOVABLE ?= " \ ##ISARROOT##/meta \ -- 2.13.6