* [PATCH] kernel: Use unexpanded EXTENDPKGV
@ 2021-08-31 13:30 Richard Purdie
2021-08-31 13:56 ` [OE-core] " Andrey Zhizhikin
2021-08-31 14:37 ` Ross Burton
0 siblings, 2 replies; 3+ messages in thread
From: Richard Purdie @ 2021-08-31 13:30 UTC (permalink / raw)
To: openembedded-core
EXTENDPKGV can contain AUTOINC so use an expanded form in the variables allowing
for later expansion during packaging to avoid race issues over the variable and
the build failures that can result.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/classes/kernel.bbclass | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index ab60e060c6e..d13c38fb026 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -92,18 +92,17 @@ python __anonymous () {
kname = d.getVar('KERNEL_PACKAGE_NAME') or "kernel"
imagedest = d.getVar('KERNEL_IMAGEDEST')
- fullver = d.getVar('EXTENDPKGV')
for type in types.split():
if bb.data.inherits_class('nopackages', d):
continue
typelower = type.lower()
d.appendVar('PACKAGES', ' %s-image-%s' % (kname, typelower))
d.setVar('FILES:' + kname + '-image-' + typelower, '/' + imagedest + '/' + type + '-${KERNEL_VERSION_NAME}' + ' /' + imagedest + '/' + type)
- d.appendVar('RDEPENDS:%s-image' % kname, ' %s-image-%s (= %s)' % (kname, typelower, fullver))
+ d.appendVar('RDEPENDS:%s-image' % kname, ' %s-image-%s (= ${EXTENDPKGV})' % (kname, typelower))
splitmods = d.getVar("KERNEL_SPLIT_MODULES")
if splitmods != '1':
- d.appendVar('RDEPENDS:%s-image' % kname, ' %s-modules (= %s)' % (kname, fullver))
- d.appendVar('RDEPENDS:%s-image-%s' % (kname, typelower), ' %s-modules-${KERNEL_VERSION_PKG_NAME} (= %s)' % (kname, fullver))
+ d.appendVar('RDEPENDS:%s-image' % kname, ' %s-modules (= ${EXTENDPKGV})' % kname)
+ d.appendVar('RDEPENDS:%s-image-%s' % (kname, typelower), ' %s-modules-${KERNEL_VERSION_PKG_NAME} (= ${EXTENDPKGV})' % kname)
d.setVar('PKG:%s-modules' % kname, '%s-modules-${KERNEL_VERSION_PKG_NAME}' % kname)
d.appendVar('RPROVIDES:%s-modules' % kname, '%s-modules-${KERNEL_VERSION_PKG_NAME}' % kname)
--
2.32.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [OE-core] [PATCH] kernel: Use unexpanded EXTENDPKGV
2021-08-31 13:30 [PATCH] kernel: Use unexpanded EXTENDPKGV Richard Purdie
@ 2021-08-31 13:56 ` Andrey Zhizhikin
2021-08-31 14:37 ` Ross Burton
1 sibling, 0 replies; 3+ messages in thread
From: Andrey Zhizhikin @ 2021-08-31 13:56 UTC (permalink / raw)
To: Richard Purdie; +Cc: OE Core mailing list
On Tue, Aug 31, 2021 at 3:30 PM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> EXTENDPKGV can contain AUTOINC so use an expanded form in the variables allowing
> for later expansion during packaging to avoid race issues over the variable and
> the build failures that can result.
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
For what it's worth:
Tested-by: Andrey Zhizhikin <andrey.z@gmail.com> # kernel v5.14,
imx8mp-lpddr4-evk
> ---
> meta/classes/kernel.bbclass | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index ab60e060c6e..d13c38fb026 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -92,18 +92,17 @@ python __anonymous () {
> kname = d.getVar('KERNEL_PACKAGE_NAME') or "kernel"
> imagedest = d.getVar('KERNEL_IMAGEDEST')
>
> - fullver = d.getVar('EXTENDPKGV')
> for type in types.split():
> if bb.data.inherits_class('nopackages', d):
> continue
> typelower = type.lower()
> d.appendVar('PACKAGES', ' %s-image-%s' % (kname, typelower))
> d.setVar('FILES:' + kname + '-image-' + typelower, '/' + imagedest + '/' + type + '-${KERNEL_VERSION_NAME}' + ' /' + imagedest + '/' + type)
> - d.appendVar('RDEPENDS:%s-image' % kname, ' %s-image-%s (= %s)' % (kname, typelower, fullver))
> + d.appendVar('RDEPENDS:%s-image' % kname, ' %s-image-%s (= ${EXTENDPKGV})' % (kname, typelower))
> splitmods = d.getVar("KERNEL_SPLIT_MODULES")
> if splitmods != '1':
> - d.appendVar('RDEPENDS:%s-image' % kname, ' %s-modules (= %s)' % (kname, fullver))
> - d.appendVar('RDEPENDS:%s-image-%s' % (kname, typelower), ' %s-modules-${KERNEL_VERSION_PKG_NAME} (= %s)' % (kname, fullver))
> + d.appendVar('RDEPENDS:%s-image' % kname, ' %s-modules (= ${EXTENDPKGV})' % kname)
> + d.appendVar('RDEPENDS:%s-image-%s' % (kname, typelower), ' %s-modules-${KERNEL_VERSION_PKG_NAME} (= ${EXTENDPKGV})' % kname)
> d.setVar('PKG:%s-modules' % kname, '%s-modules-${KERNEL_VERSION_PKG_NAME}' % kname)
> d.appendVar('RPROVIDES:%s-modules' % kname, '%s-modules-${KERNEL_VERSION_PKG_NAME}' % kname)
>
> --
> 2.32.0
>
>
>
>
--
Regards,
Andrey.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [OE-core] [PATCH] kernel: Use unexpanded EXTENDPKGV
2021-08-31 13:30 [PATCH] kernel: Use unexpanded EXTENDPKGV Richard Purdie
2021-08-31 13:56 ` [OE-core] " Andrey Zhizhikin
@ 2021-08-31 14:37 ` Ross Burton
1 sibling, 0 replies; 3+ messages in thread
From: Ross Burton @ 2021-08-31 14:37 UTC (permalink / raw)
To: Richard Purdie; +Cc: OE-core
My variation was just:
- fullver = d.getVar('EXTENDPKGV')
+ fullver = d.getVar('EXTENDPKGV', False)
Either have the same net result I guess.
Ross
On Tue, 31 Aug 2021 at 14:30, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> EXTENDPKGV can contain AUTOINC so use an expanded form in the variables allowing
> for later expansion during packaging to avoid race issues over the variable and
> the build failures that can result.
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> meta/classes/kernel.bbclass | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index ab60e060c6e..d13c38fb026 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -92,18 +92,17 @@ python __anonymous () {
> kname = d.getVar('KERNEL_PACKAGE_NAME') or "kernel"
> imagedest = d.getVar('KERNEL_IMAGEDEST')
>
> - fullver = d.getVar('EXTENDPKGV')
> for type in types.split():
> if bb.data.inherits_class('nopackages', d):
> continue
> typelower = type.lower()
> d.appendVar('PACKAGES', ' %s-image-%s' % (kname, typelower))
> d.setVar('FILES:' + kname + '-image-' + typelower, '/' + imagedest + '/' + type + '-${KERNEL_VERSION_NAME}' + ' /' + imagedest + '/' + type)
> - d.appendVar('RDEPENDS:%s-image' % kname, ' %s-image-%s (= %s)' % (kname, typelower, fullver))
> + d.appendVar('RDEPENDS:%s-image' % kname, ' %s-image-%s (= ${EXTENDPKGV})' % (kname, typelower))
> splitmods = d.getVar("KERNEL_SPLIT_MODULES")
> if splitmods != '1':
> - d.appendVar('RDEPENDS:%s-image' % kname, ' %s-modules (= %s)' % (kname, fullver))
> - d.appendVar('RDEPENDS:%s-image-%s' % (kname, typelower), ' %s-modules-${KERNEL_VERSION_PKG_NAME} (= %s)' % (kname, fullver))
> + d.appendVar('RDEPENDS:%s-image' % kname, ' %s-modules (= ${EXTENDPKGV})' % kname)
> + d.appendVar('RDEPENDS:%s-image-%s' % (kname, typelower), ' %s-modules-${KERNEL_VERSION_PKG_NAME} (= ${EXTENDPKGV})' % kname)
> d.setVar('PKG:%s-modules' % kname, '%s-modules-${KERNEL_VERSION_PKG_NAME}' % kname)
> d.appendVar('RPROVIDES:%s-modules' % kname, '%s-modules-${KERNEL_VERSION_PKG_NAME}' % kname)
>
> --
> 2.32.0
>
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-08-31 14:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-31 13:30 [PATCH] kernel: Use unexpanded EXTENDPKGV Richard Purdie
2021-08-31 13:56 ` [OE-core] " Andrey Zhizhikin
2021-08-31 14:37 ` Ross Burton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox