diff options
| author |   Stephen Lawrence <stephen.lawrence@renesas.com> | 2017-08-11 18:39:08 +0100 |
|---|---|---|
| committer |   Ronan Le Martret <ronan.lemartret@iot.bzh> | 2017-09-15 10:20:15 +0200 |
| commit | ad16a469ea8eaf7cb5a5e0440eaba0d8b5920ee4 (patch) | |
| tree | 2c592471b4a28fc0d3283586688cde82746d1e2b /meta-rcar-gen3 | |
| parent | c58ac103b8fd7a807f10f235e111c36f36a75c1a (diff) | |
kernel-module: adopt to YP 2.3 package name change
In YP 2.3 (Pyro) kernel module packages are now suffixed with the kernel
version by default [1].
[1] http://www.yoctoproject.org/docs/2.3/ref-manual/ref-manual.html#migration-2.3-miscellaneous-changes
Adopt to the change by updating RPROVIDES to add the required information.
At the same time avoid text duplication by using the ${PN} variable to set
the package name.
This avoids do_rootfs task errors of the form:
"ERROR: core-image-weston-1.0-r0 do_rootfs: Unable to install packages.
Solver encountered 3 problem(s):
Problem 1/3:
- nothing provides kernel-module-qos-4.9.0-yocto-standard needed by kernel-module-qos-1.0-r0.m3ulcb"
Signed-off-by: Stephen Lawrence <stephen.lawrence@renesas.com>
Diffstat (limited to 'meta-rcar-gen3')
6 files changed, 27 insertions, 7 deletions
diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bb index bdfd0a8..6e1ead9 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bb @@ -52,4 +52,8 @@ module_clean_symbol() { rm -f ${STAGING_KERNEL_BUILDDIR}/GLES.symvers } -RPROVIDES_${PN} += "kernel-module-pvrsrvkm kernel-module-dc-linuxfb" +RPROVIDES_${PN} += " \ + ${PN}-${KERNEL_VERSION} \ + kernel-module-pvrsrvkm \ + kernel-module-dc-linuxfb \ +" diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bb index 766852e..d12f6f2 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bb @@ -67,4 +67,7 @@ FILES_${PN} = " \ /lib/modules/${KERNEL_VERSION}/extra/mmngr.ko \ " -RPROVIDES_${PN} += "kernel-module-mmngr" +RPROVIDES_${PN} += " \ + kernel-module-mmngr \ + ${PN}-${KERNEL_VERSION} \ +" diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bb index 4f61ee6..bdbf768 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bb @@ -49,4 +49,7 @@ FILES_${PN} = " \ /lib/modules/${KERNEL_VERSION}/extra/mmngrbuf.ko \ " -RPROVIDES_${PN} += "kernel-module-mmngrbuf" +RPROVIDES_${PN} += " \ + kernel-module-mmngrbuf \ + kernel-module-mmngrbuf-${KERNEL_VERSION} \ +" diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-qos/kernel-module-qos.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-qos/kernel-module-qos.bb index 2210245..2c9a973 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-qos/kernel-module-qos.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-qos/kernel-module-qos.bb @@ -57,3 +57,5 @@ PACKAGES = " \ FILES_${PN} = " \ /lib/modules/${KERNEL_VERSION}/extra/qos.ko \ " + +RPROVIDES_${PN} += "${PN}-${KERNEL_VERSION}" diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bb index 2b05d6a..b3fe755 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bb @@ -61,4 +61,8 @@ FILES_${PN} = " \ /lib/modules/${KERNEL_VERSION}/extra/vspm_if.ko \ " -RPROVIDES_${PN} += "kernel-module-vspmif kernel-module-vspm-if" +RPROVIDES_${PN} += " \ + kernel-module-vspm-if-${KERNEL_VERSION} \ + kernel-module-vspmif \ + kernel-module-vspm-if \ +" diff --git a/meta-rcar-gen3/recipes-kernel/optee-linuxdriver/optee-linuxdriver_git.bb b/meta-rcar-gen3/recipes-kernel/optee-linuxdriver/optee-linuxdriver_git.bb index 642354d..ed0d496 100644 --- a/meta-rcar-gen3/recipes-kernel/optee-linuxdriver/optee-linuxdriver_git.bb +++ b/meta-rcar-gen3/recipes-kernel/optee-linuxdriver/optee-linuxdriver_git.bb @@ -70,6 +70,10 @@ FILES_${PN}-armtz = " \ /lib/modules/${KERNEL_VERSION}/extra/optee_armtz.ko \ " -RPROVIDES_${PN} += "optee-linuxdriver" -RPROVIDES_${PN} += "kernel-module-optee" -RPROVIDES_${PN} += "kernel-module-optee-armtz" +RPROVIDES_${PN} += " \ + optee-linuxdriver \ + kernel-module-optee \ + kernel-module-optee-armtz \ + kernel-module-optee-${KERNEL_VERSION} \ + kernel-module-optee-armtz-${KERNEL_VERSION} \ +" |