From 73c1b85d89022aaf1ee814249c3894823572fa65 Mon Sep 17 00:00:00 2001 From: Jacob Stiffler Date: Fri, 15 Nov 2019 21:14:41 +0000 Subject: [PATCH] osal: migrate to ti-pdk-fetch.bbclass Signed-off-by: Jacob Stiffler Signed-off-by: Denys Dmytriyenko --- recipes-bsp/osal/osal-rtos_git.bb | 2 -- recipes-bsp/osal/osal-test_git.bb | 2 -- recipes-bsp/osal/osal.inc | 14 ++++---------- recipes-bsp/osal/osal_git.bb | 2 -- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/recipes-bsp/osal/osal-rtos_git.bb b/recipes-bsp/osal/osal-rtos_git.bb index 62d1f997..a718f7ca 100644 --- a/recipes-bsp/osal/osal-rtos_git.bb +++ b/recipes-bsp/osal/osal-rtos_git.bb @@ -5,8 +5,6 @@ PR = "${INC_PR}.0" COMPATIBLE_MACHINE_append = "|c66x|k3" -S = "${WORKDIR}/${OSAL_GIT_DESTSUFFIX}" - DEPENDS_append_ti33x = " starterware-rtos" DEPENDS_append_ti43x = " starterware-rtos" diff --git a/recipes-bsp/osal/osal-test_git.bb b/recipes-bsp/osal/osal-test_git.bb index 58156e3b..354aa797 100644 --- a/recipes-bsp/osal/osal-test_git.bb +++ b/recipes-bsp/osal/osal-test_git.bb @@ -6,8 +6,6 @@ include osal.inc 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 () { diff --git a/recipes-bsp/osal/osal.inc b/recipes-bsp/osal/osal.inc index b0b015c7..1f0a0778 100644 --- a/recipes-bsp/osal/osal.inc +++ b/recipes-bsp/osal/osal.inc @@ -4,17 +4,11 @@ LIC_FILES_CHKSUM = "file://osal.h;beginline=1;endline=31;md5=6fbde6922f8bca1e6cd COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|keystone|omapl1" PACKAGE_ARCH = "${MACHINE_ARCH}" -OSAL_GIT_URI = "git://git.ti.com/keystone-rtos/osal.git" -OSAL_GIT_PROTOCOL = "git" -OSAL_GIT_BRANCH = "master" -OSAL_GIT_DESTSUFFIX = "git/ti/osal" +inherit ti-pdk-fetch -# Below commit ID corresponding to "DEV.OSAL.01.00.00.16B" -OSAL_SRCREV = "b78489d9d78d9366f1865aa847b743b1b29f6fd4" +TI_PDK_COMP = "ti.osal" -BRANCH = "${OSAL_GIT_BRANCH}" -SRC_URI = "${OSAL_GIT_URI};destsuffix=${OSAL_GIT_DESTSUFFIX};protocol=${OSAL_GIT_PROTOCOL};branch=${BRANCH}" +PE = "1" -SRCREV = "${OSAL_SRCREV}" -PV = "01.00.00.16B" INC_PR = "r0" + diff --git a/recipes-bsp/osal/osal_git.bb b/recipes-bsp/osal/osal_git.bb index 8f589376..4f881d2e 100644 --- a/recipes-bsp/osal/osal_git.bb +++ b/recipes-bsp/osal/osal_git.bb @@ -6,8 +6,6 @@ include osal.inc PR = "${INC_PR}.1" -S = "${WORKDIR}/${OSAL_GIT_DESTSUFFIX}" - EXTRA_OEMAKE = "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR}" do_compile () {