* [PATCH] template: Remove MACHINE from default TEMPLATE_VARS
@ 2019-03-25 11:14 Jan Kiszka
2019-03-25 11:19 ` Jan Kiszka
2019-03-25 19:08 ` Maxim Yu. Osipov
0 siblings, 2 replies; 4+ messages in thread
From: Jan Kiszka @ 2019-03-25 11:14 UTC (permalink / raw)
To: isar-users, Claudius Heine
From: Jan Kiszka <jan.kiszka@siemens.com>
This breaks packages, even those not using templating, when they are
pulled via multiconfig by different machines of the same arch. As the
MACHINE variable differs, bitbake first builds do_transform_template
multiple times, and then everything that follows after, including
standard packages like isar-cfg-* or expand-on-first-boot. Those are
shared, use only a single workdir, and will quickly break of built
concurrently.
Fixes: 43b4c21aa185 ("meta: added do_transform_template task as templating system and switch")
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
meta/classes/template.bbclass | 3 +--
meta/recipes-bsp/u-boot/u-boot-custom.inc | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/meta/classes/template.bbclass b/meta/classes/template.bbclass
index 324511a..3eb9114 100644
--- a/meta/classes/template.bbclass
+++ b/meta/classes/template.bbclass
@@ -4,8 +4,7 @@
# SPDX-License-Identifier: MIT
TEMPLATE_FILES ?= ""
-TEMPLATE_VARS ?= "PN PV DESCRIPTION HOMEPAGE MAINTAINER KERNEL_NAME MACHINE \
- DISTRO_ARCH"
+TEMPLATE_VARS ?= "PN PV DESCRIPTION HOMEPAGE MAINTAINER KERNEL_NAME DISTRO_ARCH"
do_transform_template[vardeps] = "TEMPLATE_FILES ${TEMPLATE_VARS}"
do_transform_template[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc
index 1afe430..b3eab46 100644
--- a/meta/recipes-bsp/u-boot/u-boot-custom.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc
@@ -19,7 +19,7 @@ BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git"
TEMPLATE_FILES = "debian/changelog.tmpl \
debian/control.tmpl"
-TEMPLATE_VARS += "BUILD_DEPENDS"
+TEMPLATE_VARS += "MACHINE BUILD_DEPENDS"
do_prepare_build() {
cp -r ${WORKDIR}/debian ${S}/
--
2.16.4
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] template: Remove MACHINE from default TEMPLATE_VARS
2019-03-25 11:14 [PATCH] template: Remove MACHINE from default TEMPLATE_VARS Jan Kiszka
@ 2019-03-25 11:19 ` Jan Kiszka
2019-03-25 19:08 ` Maxim Yu. Osipov
1 sibling, 0 replies; 4+ messages in thread
From: Jan Kiszka @ 2019-03-25 11:19 UTC (permalink / raw)
To: isar-users, Claudius Heine, Maksim Osipov
On 25.03.19 12:14, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> This breaks packages, even those not using templating, when they are
> pulled via multiconfig by different machines of the same arch. As the
> MACHINE variable differs, bitbake first builds do_transform_template
> multiple times, and then everything that follows after, including
> standard packages like isar-cfg-* or expand-on-first-boot. Those are
> shared, use only a single workdir, and will quickly break of built
> concurrently.
>
> Fixes: 43b4c21aa185 ("meta: added do_transform_template task as templating system and switch")
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
> meta/classes/template.bbclass | 3 +--
> meta/recipes-bsp/u-boot/u-boot-custom.inc | 2 +-
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/meta/classes/template.bbclass b/meta/classes/template.bbclass
> index 324511a..3eb9114 100644
> --- a/meta/classes/template.bbclass
> +++ b/meta/classes/template.bbclass
> @@ -4,8 +4,7 @@
> # SPDX-License-Identifier: MIT
>
> TEMPLATE_FILES ?= ""
> -TEMPLATE_VARS ?= "PN PV DESCRIPTION HOMEPAGE MAINTAINER KERNEL_NAME MACHINE \
> - DISTRO_ARCH"
> +TEMPLATE_VARS ?= "PN PV DESCRIPTION HOMEPAGE MAINTAINER KERNEL_NAME DISTRO_ARCH"
>
> do_transform_template[vardeps] = "TEMPLATE_FILES ${TEMPLATE_VARS}"
> do_transform_template[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
> diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc
> index 1afe430..b3eab46 100644
> --- a/meta/recipes-bsp/u-boot/u-boot-custom.inc
> +++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc
> @@ -19,7 +19,7 @@ BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git"
>
> TEMPLATE_FILES = "debian/changelog.tmpl \
> debian/control.tmpl"
> -TEMPLATE_VARS += "BUILD_DEPENDS"
> +TEMPLATE_VARS += "MACHINE BUILD_DEPENDS"
>
> do_prepare_build() {
> cp -r ${WORKDIR}/debian ${S}/
>
PS: I'm inclined to add "has been tested with jailhouse-images" as an item to
the release checklist. ;)
Seriously, I wonder why this wasn't found via normal CI, which should have that
scenario as well.
Jan
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] template: Remove MACHINE from default TEMPLATE_VARS
2019-03-25 11:14 [PATCH] template: Remove MACHINE from default TEMPLATE_VARS Jan Kiszka
2019-03-25 11:19 ` Jan Kiszka
@ 2019-03-25 19:08 ` Maxim Yu. Osipov
2019-03-26 5:25 ` Maxim Yu. Osipov
1 sibling, 1 reply; 4+ messages in thread
From: Maxim Yu. Osipov @ 2019-03-25 19:08 UTC (permalink / raw)
To: Jan Kiszka, isar-users, Claudius Heine
On 3/25/19 12:14 PM, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> This breaks packages, even those not using templating, when they are
> pulled via multiconfig by different machines of the same arch. As the
> MACHINE variable differs, bitbake first builds do_transform_template
> multiple times, and then everything that follows after, including
> standard packages like isar-cfg-* or expand-on-first-boot. Those are
> shared, use only a single workdir, and will quickly break of built
> concurrently.
Applied to the 'next'.
Thanks,
Maxim.
> Fixes: 43b4c21aa185 ("meta: added do_transform_template task as templating system and switch")
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
> meta/classes/template.bbclass | 3 +--
> meta/recipes-bsp/u-boot/u-boot-custom.inc | 2 +-
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/meta/classes/template.bbclass b/meta/classes/template.bbclass
> index 324511a..3eb9114 100644
> --- a/meta/classes/template.bbclass
> +++ b/meta/classes/template.bbclass
> @@ -4,8 +4,7 @@
> # SPDX-License-Identifier: MIT
>
> TEMPLATE_FILES ?= ""
> -TEMPLATE_VARS ?= "PN PV DESCRIPTION HOMEPAGE MAINTAINER KERNEL_NAME MACHINE \
> - DISTRO_ARCH"
> +TEMPLATE_VARS ?= "PN PV DESCRIPTION HOMEPAGE MAINTAINER KERNEL_NAME DISTRO_ARCH"
>
> do_transform_template[vardeps] = "TEMPLATE_FILES ${TEMPLATE_VARS}"
> do_transform_template[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
> diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc
> index 1afe430..b3eab46 100644
> --- a/meta/recipes-bsp/u-boot/u-boot-custom.inc
> +++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc
> @@ -19,7 +19,7 @@ BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git"
>
> TEMPLATE_FILES = "debian/changelog.tmpl \
> debian/control.tmpl"
> -TEMPLATE_VARS += "BUILD_DEPENDS"
> +TEMPLATE_VARS += "MACHINE BUILD_DEPENDS"
>
> do_prepare_build() {
> cp -r ${WORKDIR}/debian ${S}/
> --
> 2.16.4
>
--
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] 4+ messages in thread
* Re: [PATCH] template: Remove MACHINE from default TEMPLATE_VARS
2019-03-25 19:08 ` Maxim Yu. Osipov
@ 2019-03-26 5:25 ` Maxim Yu. Osipov
0 siblings, 0 replies; 4+ messages in thread
From: Maxim Yu. Osipov @ 2019-03-26 5:25 UTC (permalink / raw)
To: Jan Kiszka, isar-users, Claudius Heine
On 3/25/19 8:08 PM, Maxim Yu. Osipov wrote:
> On 3/25/19 12:14 PM, Jan Kiszka wrote:
>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>
>> This breaks packages, even those not using templating, when they are
>> pulled via multiconfig by different machines of the same arch. As the
>> MACHINE variable differs, bitbake first builds do_transform_template
>> multiple times, and then everything that follows after, including
>> standard packages like isar-cfg-* or expand-on-first-boot. Those are
>> shared, use only a single workdir, and will quickly break of built
>> concurrently.
>
> Applied to the 'next'.
Applied in the 'master' too ('master' is merged with 'next' branch).
Regards,
Maxim.
> Thanks,
> Maxim.
>
>> Fixes: 43b4c21aa185 ("meta: added do_transform_template task as
>> templating system and switch")
>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>> ---
>> meta/classes/template.bbclass | 3 +--
>> meta/recipes-bsp/u-boot/u-boot-custom.inc | 2 +-
>> 2 files changed, 2 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta/classes/template.bbclass
>> b/meta/classes/template.bbclass
>> index 324511a..3eb9114 100644
>> --- a/meta/classes/template.bbclass
>> +++ b/meta/classes/template.bbclass
>> @@ -4,8 +4,7 @@
>> # SPDX-License-Identifier: MIT
>>
>> TEMPLATE_FILES ?= ""
>> -TEMPLATE_VARS ?= "PN PV DESCRIPTION HOMEPAGE MAINTAINER KERNEL_NAME
>> MACHINE \
>> - DISTRO_ARCH"
>> +TEMPLATE_VARS ?= "PN PV DESCRIPTION HOMEPAGE MAINTAINER KERNEL_NAME
>> DISTRO_ARCH"
>>
>> do_transform_template[vardeps] = "TEMPLATE_FILES ${TEMPLATE_VARS}"
>> do_transform_template[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
>> diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc
>> b/meta/recipes-bsp/u-boot/u-boot-custom.inc
>> index 1afe430..b3eab46 100644
>> --- a/meta/recipes-bsp/u-boot/u-boot-custom.inc
>> +++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc
>> @@ -19,7 +19,7 @@ BUILD_DEPENDS ?= "bc, bison, flex,
>> device-tree-compiler, git"
>>
>> TEMPLATE_FILES = "debian/changelog.tmpl \
>> debian/control.tmpl"
>> -TEMPLATE_VARS += "BUILD_DEPENDS"
>> +TEMPLATE_VARS += "MACHINE BUILD_DEPENDS"
>>
>> do_prepare_build() {
>> cp -r ${WORKDIR}/debian ${S}/
>> --
>> 2.16.4
>>
>
>
--
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] 4+ messages in thread
end of thread, other threads:[~2019-03-26 5:25 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-25 11:14 [PATCH] template: Remove MACHINE from default TEMPLATE_VARS Jan Kiszka
2019-03-25 11:19 ` Jan Kiszka
2019-03-25 19:08 ` Maxim Yu. Osipov
2019-03-26 5:25 ` Maxim Yu. Osipov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox