From 6e12eca32dc1316689a74f929e334f02feac06ab Mon Sep 17 00:00:00 2001 From: Gary Thomas Date: Tue, 6 Oct 2015 10:03:47 -0600 Subject: [PATCH] kernel-module-imx-gpu-viv: Better work-around for change in name of busfreq-imx.h The renaming of include/linux/busfreq-imx6.h to include/linux/busfreq-imx.h is not consistent over the many kernel versions currently being built. This changeset works around this inconsistency by creating a local symbolic link to whatever file is actually present in the kernel sources. Signed-off-by: Gary Thomas --- ...nel-version-check-for-3.14-based-ker.patch | 35 ------------------- .../work-around-include-file-rename.patch | 30 ++++++++++++++++ .../kernel-module-imx-gpu-viv_5.0.11.p7.1.bb | 9 ++++- 3 files changed, 38 insertions(+), 36 deletions(-) delete mode 100644 recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv/platform-Fix-kernel-version-check-for-3.14-based-ker.patch create mode 100644 recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv/work-around-include-file-rename.patch diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv/platform-Fix-kernel-version-check-for-3.14-based-ker.patch b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv/platform-Fix-kernel-version-check-for-3.14-based-ker.patch deleted file mode 100644 index 3dc06176..00000000 --- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv/platform-Fix-kernel-version-check-for-3.14-based-ker.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 617bdbec386a1237e2a148989318cc4a1360788a Mon Sep 17 00:00:00 2001 -From: Otavio Salvador -Date: Tue, 18 Aug 2015 23:08:48 +0000 -Subject: [PATCH] platform: Fix kernel version check for 3.14-based kernels -Organization: O.S. Systems Software LTDA. - -The build fail about the bus frequency header (linux/busfreq-imx6.h) -not being found is caused by the mistaken check for the wrong kernel -version. - -This patch fixes it by adding the right kernel version to be checked. - -Upstream-Status: Pending - -Signed-off-by: Otavio Salvador ---- - .../os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c b/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c -index a2e72ff..241614a 100644 ---- a/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c -+++ b/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c -@@ -40,7 +40,7 @@ - #include - #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) - #include --#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0) - #include - #include - #else --- -2.1.4 - diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv/work-around-include-file-rename.patch b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv/work-around-include-file-rename.patch new file mode 100644 index 00000000..5b923924 --- /dev/null +++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv/work-around-include-file-rename.patch @@ -0,0 +1,30 @@ +From 3ec514cf260b82f4701b6fed521ce470d9faf8c9 Mon Sep 17 00:00:00 2001 +From: Gary Thomas +Date: Tue, 6 Oct 2015 09:32:22 -0600 +Subject: [PATCH] kernel-module-imx-gpu-viv: Better work-around for change in name of busfreq-imx.h + +The renaming of include/linux/busfreq-imx6.h to include/linux/busfreq-imx.h +is not consistent over the many kernel versions currently being built. This +changeset works around this inconsistency by creating a local symbolic link +to whatever file is actually present in the kernel sources. + +Signed-off-by: Gary Thomas +Upstream-status: Innapropriate [requires OE recipe support] +---- +Index: kernel-module-imx-gpu-viv-5.0.11.p7.1/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c +=================================================================== +--- kernel-module-imx-gpu-viv-5.0.11.p7.1.orig/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c ++++ kernel-module-imx-gpu-viv-5.0.11.p7.1/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c +@@ -74,11 +74,8 @@ + #include + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) + #include +-#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) +-#include +-#include + #else +-#include ++#include "busfreq-imx.h" + #include + #endif + #endif diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p7.1.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p7.1.bb index 3218b4e5..7e8414b3 100644 --- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p7.1.bb +++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p7.1.bb @@ -10,7 +10,14 @@ inherit module SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.tar.gz \ file://updatemakefile.patch \ - file://platform-Fix-kernel-version-check-for-3.14-based-ker.patch" + file://work-around-include-file-rename.patch \ +" SRC_URI[md5sum] = "a251a94390986371f75b338ad938e46f" SRC_URI[sha256sum] = "9aaef0a62bc2be69dc568228192b060c54970b5c700fee602d83a4d13e04a9b3" + +# Work around inconsistent naming of +do_compile_prepend () { + ln -sf ${STAGING_KERNEL_DIR}/include/linux/busfreq-imx*.h kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/platform/freescale/busfreq-imx.h +} + -- 2.40.1