From: Claudius Heine <claudius.heine.ext@siemens.com>
To: "Maxim Yu. Osipov" <mosipov@ilbers.de>, isar-users@googlegroups.com
Subject: Re: [PATCH v4 07/14] Move debian distro conf files to meta
Date: Mon, 21 Jan 2019 10:57:47 +0100 [thread overview]
Message-ID: <d8f97830-a3e4-49ce-2541-bc252f997e42@siemens.com> (raw)
In-Reply-To: <20190117163638.29167-1-mosipov@ilbers.de>
Hi Jan,
On 17/01/2019 17.36, Maxim Yu. Osipov wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> 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 <jan.kiszka@siemens.com>
> Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
> ---
> 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
next prev parent reply other threads:[~2019-01-21 9:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-17 16:36 Maxim Yu. Osipov
2019-01-18 15:27 ` Jan Kiszka
2019-01-18 15:43 ` Maxim Yu. Osipov
2019-01-18 15:59 ` Jan Kiszka
2019-01-21 9:57 ` Claudius Heine [this message]
2019-01-23 5:56 ` Jan Kiszka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d8f97830-a3e4-49ce-2541-bc252f997e42@siemens.com \
--to=claudius.heine.ext@siemens.com \
--cc=isar-users@googlegroups.com \
--cc=mosipov@ilbers.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox