From bc937ade566528cc097c9321694c0f5f5ef8cbf6 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 25 Oct 2018 22:44:12 -0300 Subject: classes/use-imx-headers: Easy linux-imx-headers use This allow to easy reuse of binary packages among similar SoCs. The usual use for this is to share SoC specific packages among different boards independently of the kernel version it is using, as far it is ABI compatible with the official version it will just work. Following recipes has been reworked to make use of the class: - imx-lib - imx-test - imx-vpu-hantro - imx-vpu - imx-alsa-plugins - gstreamer1.0-plugins-base - gstreamer1.0-plugins-imx - imx-gst1.0-plugin Signed-off-by: Otavio Salvador Signed-off-by: Tom Hochstein --- recipes-bsp/imx-lib/imx-lib_git.bb | 7 +++---- recipes-bsp/imx-test/imx-test_git.bb | 11 +++++------ recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.8.0.bb | 5 +---- recipes-bsp/imx-vpu/imx-vpu_5.4.38.bb | 7 ++----- 4 files changed, 11 insertions(+), 19 deletions(-) (limited to 'recipes-bsp') diff --git a/recipes-bsp/imx-lib/imx-lib_git.bb b/recipes-bsp/imx-lib/imx-lib_git.bb index d9258a1c5..d94b2daac 100644 --- a/recipes-bsp/imx-lib/imx-lib_git.bb +++ b/recipes-bsp/imx-lib/imx-lib_git.bb @@ -6,8 +6,6 @@ DESCRIPTION = "Platform specific libraries for imx platform" LICENSE = "LGPLv2.1" SECTION = "multimedia" -DEPENDS = "linux-imx-headers" - LIC_FILES_CHKSUM = "file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24" PE = "1" @@ -20,6 +18,8 @@ SRCREV = "3f777974c0c146817e2ff5cb0340ca66a1f99e57" S = "${WORKDIR}/git" +inherit use-imx-headers + PLATFORM_mx6q = "IMX6Q" PLATFORM_mx6dl = "IMX6Q" PLATFORM_mx6sl = "IMX6S" @@ -33,7 +33,7 @@ PARALLEL_MAKE="-j 1" EXTRA_OEMAKE = "" do_compile () { - INCLUDE_DIR="-I${STAGING_INCDIR}/imx" + INCLUDE_DIR="-I${STAGING_INCDIR_IMX}" oe_runmake CROSS_COMPILE="${HOST_PREFIX}" PLATFORM="${PLATFORM}" INCLUDE="${INCLUDE_DIR}" all } @@ -42,4 +42,3 @@ do_install () { } COMPATIBLE_MACHINE = "(mx6|mx7)" -PACKAGE_ARCH = "${MACHINE_SOCARCH}" diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb index 729e2670a..fae459cac 100644 --- a/recipes-bsp/imx-test/imx-test_git.bb +++ b/recipes-bsp/imx-test/imx-test_git.bb @@ -8,7 +8,7 @@ SECTION = "base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -DEPENDS = "linux-imx-headers alsa-lib libdrm" +DEPENDS = "alsa-lib libdrm" DEPENDS_append_mx6 = " imx-lib" DEPENDS_append_mx7 = " imx-lib" @@ -24,7 +24,7 @@ SRC_URI = " \ SRCREV = "3a87347ae408ef0234314a279ee74d9b015f06be" S = "${WORKDIR}/git" -inherit module-base +inherit module-base use-imx-headers INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" @@ -55,9 +55,9 @@ do_compile() { CFLAGS="${TOOLCHAIN_OPTIONS}" oe_runmake V=1 VERBOSE='' \ CROSS_COMPILE=${TARGET_PREFIX} \ - INC="-I${STAGING_INCDIR} \ - -I${S}/include \ - -I${STAGING_INCDIR}/imx" \ + INC="-I${S}/include \ + -I${STAGING_INCDIR} \ + -I${STAGING_INCDIR_IMX}" \ CC="${CC} -L${STAGING_LIBDIR} ${LDFLAGS}" \ SDKTARGETSYSROOT=${STAGING_DIR_HOST} \ LINUXPATH=${STAGING_KERNEL_DIR} \ @@ -82,5 +82,4 @@ RDEPENDS_${PN} = "bash" FILES_${PN}-dbg += "/unit_tests/.debug" -PACKAGE_ARCH = "${MACHINE_SOCARCH}" COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.8.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.8.0.bb index 25ef41ed8..c49f90db1 100644 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.8.0.bb +++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.8.0.bb @@ -4,8 +4,6 @@ DESCRIPTION = "i.MX Hantro VPU library" LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://COPYING;md5=5ab1a30d0cd181e3408077727ea5a2db" -DEPENDS = "linux-imx-headers" - PROVIDES = "virtual/imxvpu" SRC_URI = " \ @@ -15,7 +13,7 @@ SRC_URI = " \ SRC_URI[md5sum] = "140796ddd6f1be47cffb7e5e2bfe0fb6" SRC_URI[sha256sum] = "c092a5b0f8897bae54154f58e47b6d2de033da01ee231a8cd779a51bbe962606" -inherit fsl-eula-unpack +inherit fsl-eula-unpack use-imx-headers PARALLEL_MAKE="-j 1" @@ -34,5 +32,4 @@ do_install () { FILES_${PN} += "/unit_tests" -PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE = "(mx8mq|mx8mm)" diff --git a/recipes-bsp/imx-vpu/imx-vpu_5.4.38.bb b/recipes-bsp/imx-vpu/imx-vpu_5.4.38.bb index aebee4f05..185bb3d1b 100644 --- a/recipes-bsp/imx-vpu/imx-vpu_5.4.38.bb +++ b/recipes-bsp/imx-vpu/imx-vpu_5.4.38.bb @@ -6,8 +6,6 @@ DESCRIPTION = "Freescale Chips&Media VPU library" LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://COPYING;md5=75abe2fa1d16ca79f87cde926f05f72d" -DEPENDS = "linux-imx-headers" - PROVIDES = "virtual/imxvpu" PE = "1" @@ -17,12 +15,12 @@ SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true" SRC_URI[md5sum] = "521d5f839829f8d1f2a6a0e60270243e" SRC_URI[sha256sum] = "34bed0ddf6c797f444bddfa5d5495adc751ff268b6431d8beb48129c89c9e47f" -inherit fsl-eula-unpack +inherit fsl-eula-unpack use-imx-headers PLATFORM_mx6 = "IMX6Q" do_compile () { - INCLUDE_DIR="-I${STAGING_INCDIR}/imx" + INCLUDE_DIR="-I${STAGING_INCDIR_IMX}" oe_runmake CROSS_COMPILE="${HOST_PREFIX}" PLATFORM="${PLATFORM}" INCLUDE="${INCLUDE_DIR}" all } @@ -30,5 +28,4 @@ do_install () { oe_runmake PLATFORM="${PLATFORM}" DEST_DIR="${D}" install } -PACKAGE_ARCH = "${MACHINE_SOCARCH}" COMPATIBLE_MACHINE = "(mx6q|mx6dl)" -- cgit v1.2.3-54-g00ecf