From d3243e66eed682cc2d807dcd42be0f2b1f4dca7c Mon Sep 17 00:00:00 2001 From: Jacob Stiffler Date: Mon, 8 May 2017 19:54:22 +0000 Subject: osal: utilize oe_runmake * Use the oe_runmake wrapper to invoke make * Supply common make arguments to EXTRA_OEMAKE such as which makefile to invoke. * This resolves build issues when osal needs to be reconfigured as do_configure would make the clean target of the incorrect makefile. Signed-off-by: Jacob Stiffler Signed-off-by: Denys Dmytriyenko --- recipes-bsp/osal/osal-test_git.bb | 10 ++++++---- recipes-bsp/osal/osal_git.bb | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) (limited to 'recipes-bsp/osal') diff --git a/recipes-bsp/osal/osal-test_git.bb b/recipes-bsp/osal/osal-test_git.bb index 9d4fa6d3..58156e3b 100644 --- a/recipes-bsp/osal/osal-test_git.bb +++ b/recipes-bsp/osal/osal-test_git.bb @@ -4,17 +4,19 @@ DEPENDS="common-csl-ip osal" include osal.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" S = "${WORKDIR}/${OSAL_GIT_DESTSUFFIX}" +EXTRA_OEMAKE = "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR} OSAL_SRC_DIR=${S}" + do_compile () { # Build the tests - make -f makefile_armv7 clean PDK_INSTALL_PATH=${STAGING_INCDIR} - make -f makefile_armv7 tests PDK_INSTALL_PATH=${STAGING_INCDIR} OSAL_SRC_DIR=${S} + oe_runmake clean + oe_runmake tests } do_install () { # Install the binary - make -f makefile_armv7 installbin PDK_INSTALL_PATH=${STAGING_INCDIR} INSTALL_BIN_BASE_DIR=${D}${bindir} OSAL_SRC_DIR=${S} + oe_runmake installbin INSTALL_BIN_BASE_DIR=${D}${bindir} } diff --git a/recipes-bsp/osal/osal_git.bb b/recipes-bsp/osal/osal_git.bb index ecb46b22..bb30ab5a 100644 --- a/recipes-bsp/osal/osal_git.bb +++ b/recipes-bsp/osal/osal_git.bb @@ -4,17 +4,19 @@ DEPENDS="common-csl-ip" include osal.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" S = "${WORKDIR}/${OSAL_GIT_DESTSUFFIX}" +EXTRA_OEMAKE = "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR}" + do_compile () { # Build the lib - make -f makefile_armv7 clean PDK_INSTALL_PATH=${STAGING_INCDIR} - make -f makefile_armv7 lib PDK_INSTALL_PATH=${STAGING_INCDIR} + oe_runmake clean + oe_runmake lib } do_install () { # Install the lib - make -f makefile_armv7 install PDK_INSTALL_PATH=${STAGING_INCDIR} INSTALL_INC_BASE_DIR=${D}${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir} + oe_runmake install INSTALL_INC_BASE_DIR=${D}${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir} } -- cgit v1.2.3-54-g00ecf