From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6646963333394071552 X-Received: by 2002:ac2:418d:: with SMTP id z13mr1087631lfh.13.1547742894967; Thu, 17 Jan 2019 08:34:54 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9691:: with SMTP id q17-v6ls1306220lji.2.gmail; Thu, 17 Jan 2019 08:34:54 -0800 (PST) X-Google-Smtp-Source: ALg8bN5wtGnUdu12nJV+o6ImSfXMJHysH7KSpk7c/R5vBC5DrXPynVfMXUGDGDSSPil7IkqZ6DUj X-Received: by 2002:a2e:165c:: with SMTP id 28-v6mr1053840ljw.25.1547742894352; Thu, 17 Jan 2019 08:34:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547742894; cv=none; d=google.com; s=arc-20160816; b=XCCvAzhhfxR/KFGRro5l27ss3x2KQFPn9jNeuPpBJGRrdDMQEb8tXwBXJlk1INz7VY JUS9Ji7oi7CuwoItyXfqqh7NMNb6Z6ptMOQdweVbT1gQgcIRLz6Gkk2s3wSYoeLaGqC1 yZlpA0U6+nNNqwToXHpPkHI8bLdbwxLmDkrAPvMwV0XK+5xS0NYYr3vsyjrJtaKujYIk UrIzqMunTMwPCr03ppKe7F7QmO5IGgbOM/GQi2zD5H8e246n+aY+9ZRyy3a6I2u6E9Sz 6LgurZpuSEOxiwqy2deVsEM7OrwJA5w98WuhnDrcCLSz1c5P7uffwYQ5URCyZ7b3cwGL cGxA== 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=4xzNDM8BWVwmpJx5VkZwZ43cxl6mTyMRVPpSGPJbA6I=; b=JMW+SVpEuV/oLXNnH9LNMuQX+KJSlpfj7mtNQ6kPV/iXfOKlGwsf2800QII8Eo36Ru hqD0l/wLyOIuYO1O+wZVVy2/ewuoR1k+5Dm088ppALMzj1Ah9LEhDNZDW4j//7DEiYIJ 8SAOm1xupNfZWQsc2Iiuus4CD0iw5VtiAwr9bU+fA5Ya3kzzL7JqjVsilnAeiNZk1t2t ynGggp8IemiqLcwBs5wW97w286NMji3VBeU0fjEZN+FmSBx3qIbb/qlcjortzuZmfcNY NSChrE2xn0kwgBsoFDLuyRuWAzveK2ICecLKZ3gWROx2obZWSHq8MLXnXOBLWcSQ5k69 WhMA== 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 n189si71626lfa.4.2019.01.17.08.34.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Jan 2019 08:34:54 -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 x0HGYpiU008506 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Thu, 17 Jan 2019 17:34:52 +0100 Subject: Re: [PATCH v3 07/14] Move debian distro conf files to meta To: Jan Kiszka , isar-users References: <72d9be224d28d1113ae4d1130c888cd372a09304.1547616747.git.jan.kiszka@siemens.com> From: "Maxim Yu. Osipov" Organization: ilbers GmbH Message-ID: <09f2b79e-7ffd-0d78-d65b-d8a65d5e4f19@ilbers.de> Date: Thu, 17 Jan 2019 17:34:50 +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: <72d9be224d28d1113ae4d1130c888cd372a09304.1547616747.git.jan.kiszka@siemens.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: sEvvoUaNsc4S On 1/16/19 6:32 AM, Jan Kiszka wrote: > From: Jan Kiszka > > This only keeps specialties and examples in meta-isar, allowing to base > normal Debian layers solely on meta. This patch causes RaspberryPi build failure (see log http://isar-build.org:8080/job/isar_mosipov_next/119/console) v4 (fixing the problem) is followed in the next email. Regards, Maxim. > Signed-off-by: Jan Kiszka > --- > meta-isar/conf/distro/raspbian-jessie.conf | 2 +- > meta/classes/isar-image.bbclass | 4 ++-- > {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(+), 3 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..5e907e5 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 ?= "${LAYERDIR_isar}/conf/distro/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..cf68947 100644 > --- a/meta/classes/isar-image.bbclass > +++ b/meta/classes/isar-image.bbclass > @@ -6,7 +6,7 @@ > inherit image > inherit isar-bootstrap-helper > > -FILESPATH =. "${LAYERDIR_isar}/conf/distro:" > +FILESPATH =. "${LAYERDIR_core}/conf/distro:" > SRC_URI += "${@ 'file://${DISTRO_CONFIG_SCRIPT}' if '${DISTRO_CONFIG_SCRIPT}' else '' }" > > DEPENDS += "${IMAGE_INSTALL} ${IMAGE_TRANSIENT_PACKAGES}" > @@ -15,7 +15,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