From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6646963333394071552 X-Received: by 2002:a19:ed18:: with SMTP id y24mr1910728lfy.17.1548064669094; Mon, 21 Jan 2019 01:57:49 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:12d7:: with SMTP id 84-v6ls991170ljs.1.gmail; Mon, 21 Jan 2019 01:57:48 -0800 (PST) X-Google-Smtp-Source: ALg8bN711HyYwhVpokb1wPoBbmi6LjXKFUD+2k/GF9gp4vhoi+leaS6r74MbphMAd4rxYDAvS6yW X-Received: by 2002:a2e:574f:: with SMTP id r15-v6mr2011312ljd.19.1548064668528; Mon, 21 Jan 2019 01:57:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548064668; cv=none; d=google.com; s=arc-20160816; b=w/UOaTomVeVDiSzUlbnkCUESc+G7+v6VQFwc2fnzHM8FW0p/JL6hQGWAfUv7J1bocP +vwMjlGSyeU4OD8ElavYGTdzy2XFLzb3vAsWWAeZrmObskl85wiORTClKmDfoO8EFXlr pO9vbD0z0tR4o6vdoWmd5J2eSRMIrAeuu+mAUQ9wRNhbiBoZRnOqZRdmHVB+2diyB+Hs guDFL5zy0HyqYO7xL9DxMsBWrIPKs357Db4YVZ//pEB/Q56YjCNz7kohpGTy16832KQ8 OIJxg1qCBhdnbDqZUyJLBiyeHwO43kIL0JdWzKwBGDinhnhTis1CILWwWeIREOt2970O TveA== 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:from:references:to:subject; bh=V2j16Ob54QUKh309ns5eL4b6A4zz018WmwsyU3kaYyI=; b=scFIUYn4hlZp6X5XKIGS3pyo7Ko/X5Wk/YRLTA9dGxpgUrwWwIMKbiBgYHRk2ut/RP k2S1VFYYCLp5FvDHe69GkZi9jSrpNhTy+Y11tUkq+rXm5s3Or7HVnARLHERe7pQDACoI J1/F8xKlcsM2xWzK2egkpBAjSnHI7wC3/ztWBgvW0jouwozUshauNXmUjJeqdKHN+RLY 9BQd3EflC/vrfG+WmFo1C5RClNFPQYlc2Mx6kWDiJA0J5xOj+sCx1Ns1J87p8KG20NHF LQzzjy2Wxj+ydCNHm+1q+wIc1ahLTHnZTH+nO8fGgDuUTL6r6HHwhYkgI6Mp1lPM1hhs qSXg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id y18si417101lfe.3.2019.01.21.01.57.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Jan 2019 01:57:48 -0800 (PST) Received-SPF: pass (google.com: domain of claudius.heine.ext@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 claudius.heine.ext@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=claudius.heine.ext@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 x0L9vlI6026699 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 21 Jan 2019 10:57:47 +0100 Received: from [139.25.69.181] (linux-ses-ext02.ppmd.siemens.net [139.25.69.181]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x0L9vlhN020939; Mon, 21 Jan 2019 10:57:47 +0100 Subject: Re: [PATCH v4 07/14] Move debian distro conf files to meta To: "Maxim Yu. Osipov" , isar-users@googlegroups.com References: <20190117163638.29167-1-mosipov@ilbers.de> From: Claudius Heine Message-ID: Date: Mon, 21 Jan 2019 10:57:47 +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: <20190117163638.29167-1-mosipov@ilbers.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: TihyVaQjzLZ2 Hi Jan, On 17/01/2019 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. Maybe I am a bit late commenting here. But I think I remember suggesting this layout or some form of it at some point in the past: - meta-isar Base functionality - meta-isar-debian Debian configuration - meta-isar-example Example/Test-case stuff Cheers, Claudius > > 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:" > +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 > -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de