* [PATCH v4 07/14] Move debian distro conf files to meta
@ 2019-01-17 16:36 Maxim Yu. Osipov
2019-01-18 15:27 ` Jan Kiszka
2019-01-21 9:57 ` Claudius Heine
0 siblings, 2 replies; 6+ messages in thread
From: Maxim Yu. Osipov @ 2019-01-17 16:36 UTC (permalink / raw)
To: isar-users
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.
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
--
2.11.0
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v4 07/14] Move debian distro conf files to meta
2019-01-17 16:36 [PATCH v4 07/14] Move debian distro conf files to meta Maxim Yu. Osipov
@ 2019-01-18 15:27 ` Jan Kiszka
2019-01-18 15:43 ` Maxim Yu. Osipov
2019-01-21 9:57 ` Claudius Heine
1 sibling, 1 reply; 6+ messages in thread
From: Jan Kiszka @ 2019-01-18 15:27 UTC (permalink / raw)
To: Maxim Yu. Osipov, isar-users
On 17.01.19 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.
>
> 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:"
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 thought I tested the raspi case - isn't it part of the fast CI test?
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
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v4 07/14] Move debian distro conf files to meta
2019-01-18 15:27 ` Jan Kiszka
@ 2019-01-18 15:43 ` Maxim Yu. Osipov
2019-01-18 15:59 ` Jan Kiszka
0 siblings, 1 reply; 6+ messages in thread
From: Maxim Yu. Osipov @ 2019-01-18 15:43 UTC (permalink / raw)
To: Jan Kiszka, isar-users
On 1/18/19 4:27 PM, Jan Kiszka wrote:
> On 17.01.19 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.
>>
>> 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:"
>
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v4 07/14] Move debian distro conf files to meta
2019-01-18 15:43 ` Maxim Yu. Osipov
@ 2019-01-18 15:59 ` Jan Kiszka
0 siblings, 0 replies; 6+ messages in thread
From: Jan Kiszka @ 2019-01-18 15:59 UTC (permalink / raw)
To: Maxim Yu. Osipov, isar-users
On 18.01.19 16:43, Maxim Yu. Osipov wrote:
> On 1/18/19 4:27 PM, Jan Kiszka wrote:
>> On 17.01.19 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.
>>>
>>> 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:"
>>
>> 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.
Right, I thought I ran "bitbake multiconfig:rpi-jessie:isar-image-base"
separately but probably not until the very end (where the error occurs). Just
reproduced.
My patch seem to have revealed a sleeping issue in isar_image_conf_rootfs:
diff --git a/meta/classes/isar-image.bbclass b/meta/classes/isar-image.bbclass
index cf68947..41266d7 100644
--- a/meta/classes/isar-image.bbclass
+++ b/meta/classes/isar-image.bbclass
@@ -47,7 +47,7 @@ isar_image_conf_rootfs() {
sudo install -m 755 "${WORKDIR}/${DISTRO_CONFIG_SCRIPT}" "${IMAGE_ROOTFS}"
sudo chroot ${IMAGE_ROOTFS} /${DISTRO_CONFIG_SCRIPT} "${MACHINE_SERIAL}" \
"${BAUDRATE_TTY}"
- sudo rm "${IMAGE_ROOTFS}/${DISTRO_CONFIG_SCRIPT}"
+ sudo rm "${IMAGE_ROOTFS}/$(basename ${DISTRO_CONFIG_SCRIPT})"
fi
}
Jan
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v4 07/14] Move debian distro conf files to meta
2019-01-17 16:36 [PATCH v4 07/14] Move debian distro conf files to meta Maxim Yu. Osipov
2019-01-18 15:27 ` Jan Kiszka
@ 2019-01-21 9:57 ` Claudius Heine
2019-01-23 5:56 ` Jan Kiszka
1 sibling, 1 reply; 6+ messages in thread
From: Claudius Heine @ 2019-01-21 9:57 UTC (permalink / raw)
To: Maxim Yu. Osipov, isar-users
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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v4 07/14] Move debian distro conf files to meta
2019-01-21 9:57 ` Claudius Heine
@ 2019-01-23 5:56 ` Jan Kiszka
0 siblings, 0 replies; 6+ messages in thread
From: Jan Kiszka @ 2019-01-23 5:56 UTC (permalink / raw)
To: [ext] Claudius Heine, Maxim Yu. Osipov, isar-users
On 21.01.19 10:57, [ext] Claudius Heine wrote:
> 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
I'm open for different namings, and I'm also open for a split-up of the core
layer - provided someone delivers a good use case. Currently, I don't see that
use case, nor its implementation, thus this folding of what you call meta-isar
and meta-isar-debian. The first step was to separate example recipes and
configs, and that is achieved now.
Jan
--
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-01-23 5:56 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-17 16:36 [PATCH v4 07/14] Move debian distro conf files to meta 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
2019-01-23 5:56 ` Jan Kiszka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox