From f1f0152b1b0c34ee677e3fa6bc6ae8f60820fbc1 Mon Sep 17 00:00:00 2001 From: Stephen Lawrence Date: Mon, 12 Oct 2015 16:34:27 +0100 Subject: multimedia: add RPROVIDES for multimedia kernel modules Add the multimedia acceleration kernel modules to the RPROVIDES variable of the appropriate recipes. This fixes build errors of the following form at do_roofs time when RPM packaging is used: error: Can't install @MACHINE: no package provides Thank you to Tadao Tanikawa for his work on this within AGL [1] [1] https://gerrit.automotivelinux.org/gerrit/#/c/4061/1 --- meta-rcar-gen2/recipes-kernel/fdpm-module/fdpm-kernel-module.bb | 4 +++- meta-rcar-gen2/recipes-kernel/mmngr-module/mmngr-kernel-module.bb | 4 +++- meta-rcar-gen2/recipes-kernel/mmngr-module/mmngrbuf-kernel-module.bb | 4 +++- meta-rcar-gen2/recipes-kernel/s3ctl-module/s3ctl-kernel-module.bb | 4 +++- meta-rcar-gen2/recipes-kernel/uvcs-module/uvcs-kernel-module.bb | 4 +++- meta-rcar-gen2/recipes-kernel/vspm-module/vspm-kernel-module.bb | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) (limited to 'meta-rcar-gen2') diff --git a/meta-rcar-gen2/recipes-kernel/fdpm-module/fdpm-kernel-module.bb b/meta-rcar-gen2/recipes-kernel/fdpm-module/fdpm-kernel-module.bb index 328c833..2739166 100644 --- a/meta-rcar-gen2/recipes-kernel/fdpm-module/fdpm-kernel-module.bb +++ b/meta-rcar-gen2/recipes-kernel/fdpm-module/fdpm-kernel-module.bb @@ -74,9 +74,11 @@ FILES_${PN}-dev = " \ /usr/src/kernel/include/fdpm.symvers \ " -RPROVIDES_${PN} += "fdpm-kernel-module" +RPROVIDES_${PN} += "fdpm-kernel-module kernel-module-fdpm" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +ALLOW_EMPTY_kernel-module-fdpm = "1" + do_configure[noexec] = "1" python do_package_ipk_prepend () { diff --git a/meta-rcar-gen2/recipes-kernel/mmngr-module/mmngr-kernel-module.bb b/meta-rcar-gen2/recipes-kernel/mmngr-module/mmngr-kernel-module.bb index 32c6abd..96b3de7 100644 --- a/meta-rcar-gen2/recipes-kernel/mmngr-module/mmngr-kernel-module.bb +++ b/meta-rcar-gen2/recipes-kernel/mmngr-module/mmngr-kernel-module.bb @@ -73,9 +73,11 @@ FILES_${PN}-dev = " \ /usr/src/kernel/include/*.h \ " -RPROVIDES_${PN} += "mmngr-kernel-module" +RPROVIDES_${PN} += "mmngr-kernel-module kernel-module-mmngr" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +ALLOW_EMPTY_kernel-module-mmngr = "1" + do_configure[noexec] = "1" python do_package_ipk_prepend () { diff --git a/meta-rcar-gen2/recipes-kernel/mmngr-module/mmngrbuf-kernel-module.bb b/meta-rcar-gen2/recipes-kernel/mmngr-module/mmngrbuf-kernel-module.bb index ac91e0c..bda21ed 100644 --- a/meta-rcar-gen2/recipes-kernel/mmngr-module/mmngrbuf-kernel-module.bb +++ b/meta-rcar-gen2/recipes-kernel/mmngr-module/mmngrbuf-kernel-module.bb @@ -53,9 +53,11 @@ FILES_${PN}-dev = " \ /usr/src/kernel/include/*.h \ " -RPROVIDES_${PN} += "mmngrbuf-kernel-module" +RPROVIDES_${PN} += "mmngrbuf-kernel-module kernel-module-mmngrbuf" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +ALLOW_EMPTY_kernel-module-mmngrbuf = "1" + do_configure[noexec] = "1" python do_package_ipk_prepend () { diff --git a/meta-rcar-gen2/recipes-kernel/s3ctl-module/s3ctl-kernel-module.bb b/meta-rcar-gen2/recipes-kernel/s3ctl-module/s3ctl-kernel-module.bb index 211dd78..141be11 100644 --- a/meta-rcar-gen2/recipes-kernel/s3ctl-module/s3ctl-kernel-module.bb +++ b/meta-rcar-gen2/recipes-kernel/s3ctl-module/s3ctl-kernel-module.bb @@ -54,9 +54,11 @@ FILES_${PN}-dev = " \ /usr/src/kernel/include/s3ctl.symvers \ " -RPROVIDES_${PN} += "s3ctl-kernel-module" +RPROVIDES_${PN} += "s3ctl-kernel-module kernel-module-s3ctl" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +ALLOW_EMPTY_kernel-module-s3ctl = "1" + do_configure[noexec] = "1" python do_package_ipk_prepend () { diff --git a/meta-rcar-gen2/recipes-kernel/uvcs-module/uvcs-kernel-module.bb b/meta-rcar-gen2/recipes-kernel/uvcs-module/uvcs-kernel-module.bb index 17b0637..5212494 100644 --- a/meta-rcar-gen2/recipes-kernel/uvcs-module/uvcs-kernel-module.bb +++ b/meta-rcar-gen2/recipes-kernel/uvcs-module/uvcs-kernel-module.bb @@ -62,9 +62,11 @@ FILES_${PN}-dev = " \ /usr/src/kernel/include/uvcs.symvers \ " -RPROVIDES_${PN} += "uvcs-kernel-module" +RPROVIDES_${PN} += "uvcs-kernel-module kernel-module-uvcs-cmn" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +ALLOW_EMPTY_kernel-module-uvcs-cmn = "1" + python do_package_ipk_prepend () { d.setVar('ALLOW_EMPTY', '1') } diff --git a/meta-rcar-gen2/recipes-kernel/vspm-module/vspm-kernel-module.bb b/meta-rcar-gen2/recipes-kernel/vspm-module/vspm-kernel-module.bb index 1e88e6f..48c75d2 100644 --- a/meta-rcar-gen2/recipes-kernel/vspm-module/vspm-kernel-module.bb +++ b/meta-rcar-gen2/recipes-kernel/vspm-module/vspm-kernel-module.bb @@ -69,9 +69,11 @@ FILES_${PN}-dev = " \ /usr/src/kernel/include/vspm.symvers \ " -RPROVIDES_${PN} += "vspm-kernel-module" +RPROVIDES_${PN} += "vspm-kernel-module kernel-module-vspm" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +ALLOW_EMPTY_kernel-module-vspm = "1" + do_configure[noexec] = "1" python do_package_ipk_prepend () { -- cgit 1.2.3-korg