From: "Maxim Yu. Osipov" <mosipov@ilbers.de>
To: Jan Kiszka <jan.kiszka@siemens.com>,
isar-users <isar-users@googlegroups.com>
Subject: Re: [PATCH v3 07/14] Move debian distro conf files to meta
Date: Thu, 17 Jan 2019 17:34:50 +0100 [thread overview]
Message-ID: <09f2b79e-7ffd-0d78-d65b-d8a65d5e4f19@ilbers.de> (raw)
In-Reply-To: <72d9be224d28d1113ae4d1130c888cd372a09304.1547616747.git.jan.kiszka@siemens.com>
On 1/16/19 6:32 AM, Jan Kiszka 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.
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 <jan.kiszka@siemens.com>
> ---
> 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
next prev parent reply other threads:[~2019-01-17 16:34 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-16 5:32 [PATCH v3 00/14] Vacation hacks & more Jan Kiszka
2019-01-16 5:32 ` [PATCH v3 01/14] dpkg-raw: Respect file permissions defined by recipe if requested Jan Kiszka
2019-01-16 9:41 ` Henning Schild
2019-01-16 12:11 ` Jan Kiszka
2019-01-16 15:24 ` Henning Schild
2019-01-16 19:09 ` Jan Kiszka
2019-01-18 9:01 ` Henning Schild
2019-01-16 5:32 ` [PATCH v3 02/14] bootimg-efi-isar: Run grub-mkimage without own config Jan Kiszka
2019-01-16 5:32 ` [PATCH v3 03/14] bootimg-efi-isar: Retrieve boot disk during runtime Jan Kiszka
2019-01-16 5:32 ` [PATCH v3 04/14] isar-cfg-localepurge: Also set /etc/default/locale Jan Kiszka
2019-01-16 5:32 ` [PATCH v3 05/14] Fix LIC_FILES_CHKSUM paths Jan Kiszka
2019-01-16 5:32 ` [PATCH v3 06/14] Move repo variables to proper conf file Jan Kiszka
2019-01-16 5:32 ` [PATCH v3 07/14] Move debian distro conf files to meta Jan Kiszka
2019-01-17 16:34 ` Maxim Yu. Osipov [this message]
2019-01-16 5:32 ` [PATCH v3 08/14] bootimg-efi-isar: Fix serial console setup for grub Jan Kiszka
2019-01-16 9:47 ` Henning Schild
2019-01-16 12:17 ` Jan Kiszka
2021-09-01 9:11 ` Henning Schild
2021-09-01 10:02 ` Jan Kiszka
2019-01-16 5:32 ` [PATCH v3 09/14] bootimg-efi-isar: Reformat generated grub.cfg Jan Kiszka
2019-01-16 5:32 ` [PATCH v3 10/14] scripts: Add rpm2cpio.sh Jan Kiszka
2019-01-16 5:32 ` [PATCH v3 11/14] rootfs-u-boot: Handle empty kernel command line appendix Jan Kiszka
2019-01-16 5:32 ` [PATCH v3 12/14] bitbake.conf: Clean up and enhance OVERRIDES Jan Kiszka
2019-01-16 5:32 ` [PATCH v3 13/14] linux-module: Simplify interface to module makefiles Jan Kiszka
2019-01-16 5:32 ` [PATCH v3 14/14] example-module: Use simplified custom module interface Jan Kiszka
2019-01-18 7:53 ` [PATCH v3 00/14] Vacation hacks & more Maxim Yu. Osipov
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=09f2b79e-7ffd-0d78-d65b-d8a65d5e4f19@ilbers.de \
--to=mosipov@ilbers.de \
--cc=isar-users@googlegroups.com \
--cc=jan.kiszka@siemens.com \
/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