* [PATCH] Revert "kernel-module-split: rrecommend kernel-image instead of rdepend"
@ 2017-09-11 7:23 Martin Hundebøll
2017-09-11 8:37 ` Paul Barker
2017-09-11 12:28 ` [PATCHv2] " Martin Hundebøll
0 siblings, 2 replies; 3+ messages in thread
From: Martin Hundebøll @ 2017-09-11 7:23 UTC (permalink / raw)
To: openembedded-core
This reverts commit e0ed52c51464855e9a6a37ea49df7efde7e91076.
Commit e0ed52c514 ('kernel-module-split: rrecommend kernel-image instead
of rdepend') changed kernel modules to rrecommend kernel-image instead
of rdepend on kernel. This broke existing setups, where the kernel is
omitted by setting RDEPEND_kernel-base = "".
Revert the patch, as the existing way of omitting kernel-image in images
works just fine.
---
meta/classes/kernel-module-split.bbclass | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass
index 78843c5474..1035525dac 100644
--- a/meta/classes/kernel-module-split.bbclass
+++ b/meta/classes/kernel-module-split.bbclass
@@ -120,11 +120,6 @@ python split_kernel_module_packages () {
rdepends[dep] = []
d.setVar('RDEPENDS_' + pkg, bb.utils.join_deps(rdepends, commasep=False))
- # let kernel modules runtime recommend kernel image
- rrecommends = bb.utils.explode_dep_versions2(d.getVar('RRECOMMENDS_' + pkg) or "")
- rrecommends['kernel-image'] = []
- d.setVar('RRECOMMENDS_' + pkg, bb.utils.join_deps(rrecommends, commasep=False))
-
# Avoid automatic -dev recommendations for modules ending with -dev.
d.setVarFlag('RRECOMMENDS_' + pkg, 'nodeprrecs', 1)
@@ -143,7 +138,7 @@ python split_kernel_module_packages () {
postinst = d.getVar('pkg_postinst_modules')
postrm = d.getVar('pkg_postrm_modules')
- modules = do_split_packages(d, root='${nonarch_base_libdir}/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='')
+ modules = do_split_packages(d, root='${nonarch_base_libdir}/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='kernel-%s' % (d.getVar("KERNEL_VERSION")))
if modules:
metapkg = d.getVar('KERNEL_MODULES_META_PACKAGE')
d.appendVar('RDEPENDS_' + metapkg, ' '+' '.join(modules))
--
2.14.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Revert "kernel-module-split: rrecommend kernel-image instead of rdepend"
2017-09-11 7:23 [PATCH] Revert "kernel-module-split: rrecommend kernel-image instead of rdepend" Martin Hundebøll
@ 2017-09-11 8:37 ` Paul Barker
2017-09-11 12:28 ` [PATCHv2] " Martin Hundebøll
1 sibling, 0 replies; 3+ messages in thread
From: Paul Barker @ 2017-09-11 8:37 UTC (permalink / raw)
To: Martin Hundebøll; +Cc: openembedded-core
On Mon, Sep 11, 2017 at 8:23 AM, Martin Hundebøll <mnhu@prevas.dk> wrote:
> This reverts commit e0ed52c51464855e9a6a37ea49df7efde7e91076.
>
> Commit e0ed52c514 ('kernel-module-split: rrecommend kernel-image instead
> of rdepend') changed kernel modules to rrecommend kernel-image instead
> of rdepend on kernel. This broke existing setups, where the kernel is
> omitted by setting RDEPEND_kernel-base = "".
>
> Revert the patch, as the existing way of omitting kernel-image in images
> works just fine.
This is missing a Signed-off-by tag.
> ---
> meta/classes/kernel-module-split.bbclass | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass
> index 78843c5474..1035525dac 100644
> --- a/meta/classes/kernel-module-split.bbclass
> +++ b/meta/classes/kernel-module-split.bbclass
> @@ -120,11 +120,6 @@ python split_kernel_module_packages () {
> rdepends[dep] = []
> d.setVar('RDEPENDS_' + pkg, bb.utils.join_deps(rdepends, commasep=False))
>
> - # let kernel modules runtime recommend kernel image
> - rrecommends = bb.utils.explode_dep_versions2(d.getVar('RRECOMMENDS_' + pkg) or "")
> - rrecommends['kernel-image'] = []
> - d.setVar('RRECOMMENDS_' + pkg, bb.utils.join_deps(rrecommends, commasep=False))
> -
> # Avoid automatic -dev recommendations for modules ending with -dev.
> d.setVarFlag('RRECOMMENDS_' + pkg, 'nodeprrecs', 1)
>
> @@ -143,7 +138,7 @@ python split_kernel_module_packages () {
> postinst = d.getVar('pkg_postinst_modules')
> postrm = d.getVar('pkg_postrm_modules')
>
> - modules = do_split_packages(d, root='${nonarch_base_libdir}/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='')
> + modules = do_split_packages(d, root='${nonarch_base_libdir}/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='kernel-%s' % (d.getVar("KERNEL_VERSION")))
> if modules:
> metapkg = d.getVar('KERNEL_MODULES_META_PACKAGE')
> d.appendVar('RDEPENDS_' + metapkg, ' '+' '.join(modules))
> --
> 2.14.1
>
Change looks good.
Thanks,
--
Paul Barker
Togán Labs Ltd
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCHv2] Revert "kernel-module-split: rrecommend kernel-image instead of rdepend"
2017-09-11 7:23 [PATCH] Revert "kernel-module-split: rrecommend kernel-image instead of rdepend" Martin Hundebøll
2017-09-11 8:37 ` Paul Barker
@ 2017-09-11 12:28 ` Martin Hundebøll
1 sibling, 0 replies; 3+ messages in thread
From: Martin Hundebøll @ 2017-09-11 12:28 UTC (permalink / raw)
To: openembedded-core
This reverts commit e0ed52c51464855e9a6a37ea49df7efde7e91076.
Commit e0ed52c514 ('kernel-module-split: rrecommend kernel-image instead
of rdepend') changed kernel modules to rrecommend kernel-image instead
of rdepend on kernel. This broke existing setups, where the kernel is
omitted by setting RDEPEND_kernel-base = "".
Revert the patch, as the existing way of omitting kernel-image in images
works just fine.
Signed-off-by: Martin Hundebøll <mnhu@prevas.dk>
---
Changes in v2:
* Added signed-of-by line
---
meta/classes/kernel-module-split.bbclass | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass
index 78843c5474..1035525dac 100644
--- a/meta/classes/kernel-module-split.bbclass
+++ b/meta/classes/kernel-module-split.bbclass
@@ -120,11 +120,6 @@ python split_kernel_module_packages () {
rdepends[dep] = []
d.setVar('RDEPENDS_' + pkg, bb.utils.join_deps(rdepends, commasep=False))
- # let kernel modules runtime recommend kernel image
- rrecommends = bb.utils.explode_dep_versions2(d.getVar('RRECOMMENDS_' + pkg) or "")
- rrecommends['kernel-image'] = []
- d.setVar('RRECOMMENDS_' + pkg, bb.utils.join_deps(rrecommends, commasep=False))
-
# Avoid automatic -dev recommendations for modules ending with -dev.
d.setVarFlag('RRECOMMENDS_' + pkg, 'nodeprrecs', 1)
@@ -143,7 +138,7 @@ python split_kernel_module_packages () {
postinst = d.getVar('pkg_postinst_modules')
postrm = d.getVar('pkg_postrm_modules')
- modules = do_split_packages(d, root='${nonarch_base_libdir}/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='')
+ modules = do_split_packages(d, root='${nonarch_base_libdir}/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='kernel-%s' % (d.getVar("KERNEL_VERSION")))
if modules:
metapkg = d.getVar('KERNEL_MODULES_META_PACKAGE')
d.appendVar('RDEPENDS_' + metapkg, ' '+' '.join(modules))
--
2.14.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-09-11 12:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-11 7:23 [PATCH] Revert "kernel-module-split: rrecommend kernel-image instead of rdepend" Martin Hundebøll
2017-09-11 8:37 ` Paul Barker
2017-09-11 12:28 ` [PATCHv2] " Martin Hundebøll
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.