From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6646963333394071552 X-Received: by 2002:a2e:541c:: with SMTP id i28-v6mr1425573ljb.20.1547826199087; Fri, 18 Jan 2019 07:43:19 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:8ec8:: with SMTP id e8-v6ls292610ljl.5.gmail; Fri, 18 Jan 2019 07:43:18 -0800 (PST) X-Google-Smtp-Source: ALg8bN5qN7ZL+q3/9HF1rKmzklgbb4Lk3zXt0piwl9wx3j4/gs1TVsxggAFjxaVYyUvgCocHsdKN X-Received: by 2002:a2e:4253:: with SMTP id p80-v6mr1439794lja.13.1547826198426; Fri, 18 Jan 2019 07:43:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547826198; cv=none; d=google.com; s=arc-20160816; b=LgDDuqOVJ/YVdsUeYNSD0ycifU9Qx0EkDkb8isRWUV//f112usoXUkcvv1abQCyJoS n2UogbXNkyuMP5HV5plBF9+Q4CR7ewdvq6ofDjucB9A0VOr5iJTPO903evhq6keZszuW 8SScajPThcu3x3kk5znTLqOuR8+DeecrGS5pcJaUSHrHCALrEUwXnRx/uCmVo77Pxam7 LpdEsrajzW0ueCb9RxYyVtfJ1kA6m/FC8iZEEaghtDwwVokxfGQyt9Vu8WjcOd9f53uU 5zLIqesaNrLxy5MQcHB9vZzcYsrYRWZGS773/1MhELfGXpvPXn1CYC4DnQ8p7dcPWE+r kTwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:organization:from:references:to:subject; bh=d57yATctwcZIdw2WXJVWSEpl/A9aHgqarNgv8xuLwOM=; b=fr9P+Rtee4eCfBf/UtXpPUP8gJ0Uy/g18Vc14p1LZcZNWLaxwiNhPxDtXjeFZIpUfc 1Rf8DnlX8N2GO3x03B9aC5w7iqmVUYmsT25gUMOzhIcCTXkiI8xPpMjw78AXG+Kg8zof oARFyDhftKgBEE16BRzKC3193dxGb0xJ+h9aAhHKxd/OzSv8mPLrd1cWbLPDbf4EPz7a aR4nnKuRXTPVqrDjlCgqsOllX0ie8BWPfO1CPF/pYmqYtV8ErphtlBvsQGdngdkbPBWG 187r2UlbT1vD9DYYVGP+Q++DsLzNLwMjyXu5CYHtdWJtuwgdPHIhLrE1MKWArDG9juh5 5AHA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id n189si183459lfa.4.2019.01.18.07.43.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jan 2019 07:43:18 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from [192.168.50.163] (d51a48a80.access.telenet.be [81.164.138.128]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id x0IFhFim011125 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Fri, 18 Jan 2019 16:43:16 +0100 Subject: Re: [PATCH v4 07/14] Move debian distro conf files to meta To: Jan Kiszka , isar-users@googlegroups.com References: <20190117163638.29167-1-mosipov@ilbers.de> <9cfc77af-2c1a-40f3-a751-a7086cc8947d@web.de> From: "Maxim Yu. Osipov" Organization: ilbers GmbH Message-ID: <539a63bf-2cae-4fec-57f8-c03a93a6322b@ilbers.de> Date: Fri, 18 Jan 2019 16:43:14 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <9cfc77af-2c1a-40f3-a751-a7086cc8947d@web.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-TUID: N8IMJpv1HtGA On 1/18/19 4:27 PM, Jan Kiszka wrote: > On 17.01.19 17:36, Maxim Yu. Osipov wrote: >> From: Jan Kiszka >> >> This only keeps specialties and examples in meta-isar, allowing to base >> normal Debian layers solely on meta. >> >> Signed-off-by: Jan Kiszka >> Signed-off-by: Maxim Yu. Osipov >> --- >>   meta-isar/conf/distro/raspbian-jessie.conf             | 2 +- >>   meta/classes/isar-image.bbclass                        | 3 ++- >>   {meta-isar => meta}/conf/distro/debian-buster.conf     | 0 >>   {meta-isar => meta}/conf/distro/debian-buster.list     | 0 >>   {meta-isar => meta}/conf/distro/debian-common.conf     | 0 >>   {meta-isar => meta}/conf/distro/debian-configscript.sh | 0 >>   {meta-isar => meta}/conf/distro/debian-jessie.conf     | 0 >>   {meta-isar => meta}/conf/distro/debian-jessie.list     | 0 >>   {meta-isar => meta}/conf/distro/debian-stretch.conf    | 0 >>   {meta-isar => meta}/conf/distro/debian-stretch.list    | 0 >>   10 files changed, 3 insertions(+), 2 deletions(-) >>   rename {meta-isar => meta}/conf/distro/debian-buster.conf (100%) >>   rename {meta-isar => meta}/conf/distro/debian-buster.list (100%) >>   rename {meta-isar => meta}/conf/distro/debian-common.conf (100%) >>   rename {meta-isar => meta}/conf/distro/debian-configscript.sh (100%) >>   rename {meta-isar => meta}/conf/distro/debian-jessie.conf (100%) >>   rename {meta-isar => meta}/conf/distro/debian-jessie.list (100%) >>   rename {meta-isar => meta}/conf/distro/debian-stretch.conf (100%) >>   rename {meta-isar => meta}/conf/distro/debian-stretch.list (100%) >> >> diff --git a/meta-isar/conf/distro/raspbian-jessie.conf >> b/meta-isar/conf/distro/raspbian-jessie.conf >> index de8b5a1..4ebf523 100644 >> --- a/meta-isar/conf/distro/raspbian-jessie.conf >> +++ b/meta-isar/conf/distro/raspbian-jessie.conf >> @@ -8,5 +8,5 @@ BASE_DISTRO_CODENAME = "jessie" >> >>   DISTRO_APT_SOURCES += "conf/distro/raspbian-jessie.list" >>   DISTRO_APT_KEYS += >> "https://archive.raspbian.org/raspbian.public.key;sha256sum=ca59cd4f2bcbc3a1d41ba6815a02a8dc5c175467a59bd87edeac458f4a5345de" >> >> -DISTRO_CONFIG_SCRIPT?= "raspbian-configscript.sh" >> +DISTRO_CONFIG_SCRIPT ?= "raspbian-configscript.sh" >>   DISTRO_KERNELS ?= "rpi rpi2 rpi-rpfv rpi2-rpfv" >> diff --git a/meta/classes/isar-image.bbclass >> b/meta/classes/isar-image.bbclass >> index 754e896..3f65b7a 100644 >> --- a/meta/classes/isar-image.bbclass >> +++ b/meta/classes/isar-image.bbclass >> @@ -7,6 +7,7 @@ inherit image >>   inherit isar-bootstrap-helper >> >>   FILESPATH =. "${LAYERDIR_isar}/conf/distro:" > > This line must go, or we have layer violation bug: no references from > the core > to meta-isar. Keep in mind that other layers than meta-isar may want to > provide > a difference distro as well and should be able to do so without this hack. I didn't want to drop the patch from the queue, so I provided a quick fix. I/(you?) will have a look for better solution. > I thought I tested the raspi case - isn't it part of the fast CI test? No...it's a part of the long one. Maxim. > > Jan > >> +FILESPATH =. "${LAYERDIR_core}/conf/distro:" >   SRC_URI += "${@ >> 'file://${DISTRO_CONFIG_SCRIPT}' if > '${DISTRO_CONFIG_SCRIPT}' else '' }" >> >>   DEPENDS += "${IMAGE_INSTALL} ${IMAGE_TRANSIENT_PACKAGES}" >> @@ -15,7 +16,7 @@ IMAGE_TRANSIENT_PACKAGES += "isar-cfg-localepurge" >> >>   WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}" >> >> -ISAR_RELEASE_CMD_DEFAULT = "git -C ${LAYERDIR_isar} describe --tags >> --dirty --match 'v[0-9].[0-9]*'" >> +ISAR_RELEASE_CMD_DEFAULT = "git -C ${LAYERDIR_core} describe --tags >> --dirty --match 'v[0-9].[0-9]*'" >>   ISAR_RELEASE_CMD ?= "${ISAR_RELEASE_CMD_DEFAULT}" >> >>   do_rootfs[root_cleandirs] = "${IMAGE_ROOTFS} \ >> diff --git a/meta-isar/conf/distro/debian-buster.conf >> b/meta/conf/distro/debian-buster.conf >> similarity index 100% >> rename from meta-isar/conf/distro/debian-buster.conf >> rename to meta/conf/distro/debian-buster.conf >> diff --git a/meta-isar/conf/distro/debian-buster.list >> b/meta/conf/distro/debian-buster.list >> similarity index 100% >> rename from meta-isar/conf/distro/debian-buster.list >> rename to meta/conf/distro/debian-buster.list >> diff --git a/meta-isar/conf/distro/debian-common.conf >> b/meta/conf/distro/debian-common.conf >> similarity index 100% >> rename from meta-isar/conf/distro/debian-common.conf >> rename to meta/conf/distro/debian-common.conf >> diff --git a/meta-isar/conf/distro/debian-configscript.sh >> b/meta/conf/distro/debian-configscript.sh >> similarity index 100% >> rename from meta-isar/conf/distro/debian-configscript.sh >> rename to meta/conf/distro/debian-configscript.sh >> diff --git a/meta-isar/conf/distro/debian-jessie.conf >> b/meta/conf/distro/debian-jessie.conf >> similarity index 100% >> rename from meta-isar/conf/distro/debian-jessie.conf >> rename to meta/conf/distro/debian-jessie.conf >> diff --git a/meta-isar/conf/distro/debian-jessie.list >> b/meta/conf/distro/debian-jessie.list >> similarity index 100% >> rename from meta-isar/conf/distro/debian-jessie.list >> rename to meta/conf/distro/debian-jessie.list >> diff --git a/meta-isar/conf/distro/debian-stretch.conf >> b/meta/conf/distro/debian-stretch.conf >> similarity index 100% >> rename from meta-isar/conf/distro/debian-stretch.conf >> rename to meta/conf/distro/debian-stretch.conf >> diff --git a/meta-isar/conf/distro/debian-stretch.list >> b/meta/conf/distro/debian-stretch.list >> similarity index 100% >> rename from meta-isar/conf/distro/debian-stretch.list >> rename to meta/conf/distro/debian-stretch.list >> -- Maxim Osipov ilbers GmbH Maria-Merian-Str. 8 85521 Ottobrunn Germany +49 (151) 6517 6917 mosipov@ilbers.de http://ilbers.de/ Commercial register Munich, HRB 214197 General Manager: Baurzhan Ismagulov