From 63903ffd3796719ff06459b2501ddc647cbef037 Mon Sep 17 00:00:00 2001 From: Jacob Stiffler Date: Sat, 6 Feb 2016 02:19:13 +0000 Subject: [PATCH] ipc-transport: Extract source info to common inc file * Also use new variables to specify the source info so this can be easily overridden and applied to each recipe. Signed-off-by: Jacob Stiffler Signed-off-by: Denys Dmytriyenko --- recipes-ti/ipc/ipc-transport-qmss-test_git.bb | 2 ++ recipes-ti/ipc/ipc-transport-qmss.inc | 8 ++------ recipes-ti/ipc/ipc-transport-qmss_git.bb | 2 ++ recipes-ti/ipc/ipc-transport-srio-test_git.bb | 2 ++ recipes-ti/ipc/ipc-transport-srio.inc | 8 ++------ recipes-ti/ipc/ipc-transport-srio_git.bb | 2 ++ recipes-ti/ipc/ipc-transport.inc | 15 +++++++++++++++ 7 files changed, 27 insertions(+), 12 deletions(-) create mode 100644 recipes-ti/ipc/ipc-transport.inc diff --git a/recipes-ti/ipc/ipc-transport-qmss-test_git.bb b/recipes-ti/ipc/ipc-transport-qmss-test_git.bb index e7c827ef..bfedaf5b 100644 --- a/recipes-ti/ipc/ipc-transport-qmss-test_git.bb +++ b/recipes-ti/ipc/ipc-transport-qmss-test_git.bb @@ -1,5 +1,7 @@ include ipc-transport-qmss.inc +PR = "${INC_PR}.0" + PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS = "ipc-transport-qmss ti-ipc" diff --git a/recipes-ti/ipc/ipc-transport-qmss.inc b/recipes-ti/ipc/ipc-transport-qmss.inc index 4b74eec5..a5c8dc40 100644 --- a/recipes-ti/ipc/ipc-transport-qmss.inc +++ b/recipes-ti/ipc/ipc-transport-qmss.inc @@ -1,13 +1,9 @@ DESCRIPTION = "TI QMSS-Based IPC MessageQ Transport" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=27bb0deb260c60120a8d7b91da7c3b02" +require ipc-transport.inc -BRANCH="master" -SRC_URI = "git://git.ti.com/keystone-linux/ipc-transport.git;protocol=git;branch=${BRANCH}" -# Below commit ID corresponds to DEV.IPC-TRANSPORT.02.00.00.01 -SRCREV = "88ea336c584ccec4b2c281cd7f75df9dff6d4edf" -PV = "02.00.00.01" +INC_PR_append = ".0" COMPATIBLE_MACHINE = "keystone" diff --git a/recipes-ti/ipc/ipc-transport-qmss_git.bb b/recipes-ti/ipc/ipc-transport-qmss_git.bb index cb77a12a..09acbf0b 100644 --- a/recipes-ti/ipc/ipc-transport-qmss_git.bb +++ b/recipes-ti/ipc/ipc-transport-qmss_git.bb @@ -1,5 +1,7 @@ include ipc-transport-qmss.inc +PR = "${INC_PR}.0" + DEPENDS = "ti-ipc mpm-transport" do_compile () { diff --git a/recipes-ti/ipc/ipc-transport-srio-test_git.bb b/recipes-ti/ipc/ipc-transport-srio-test_git.bb index 866fc35c..4e23fb21 100644 --- a/recipes-ti/ipc/ipc-transport-srio-test_git.bb +++ b/recipes-ti/ipc/ipc-transport-srio-test_git.bb @@ -1,5 +1,7 @@ include ipc-transport-srio.inc +PR = "${INC_PR}.0" + DEPENDS = "ipc-transport-srio ipc-transport-qmss ti-ipc" DEVICELIST = "k2h k2k" diff --git a/recipes-ti/ipc/ipc-transport-srio.inc b/recipes-ti/ipc/ipc-transport-srio.inc index 91e3be14..4b5c3051 100644 --- a/recipes-ti/ipc/ipc-transport-srio.inc +++ b/recipes-ti/ipc/ipc-transport-srio.inc @@ -1,13 +1,9 @@ DESCRIPTION = "TI SRIO-Based IPC MessageQ Transport" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=27bb0deb260c60120a8d7b91da7c3b02" +require ipc-transport.inc -BRANCH="master" -SRC_URI = "git://git.ti.com/keystone-linux/ipc-transport.git;protocol=git;branch=${BRANCH}" -# Below commit ID corresponds to DEV.IPC-TRANSPORT.02.00.00.01 -SRCREV = "88ea336c584ccec4b2c281cd7f75df9dff6d4edf" -PV = "02.00.00.01" +INC_PR_append = ".0" COMPATIBLE_MACHINE = "k2hk-evm" diff --git a/recipes-ti/ipc/ipc-transport-srio_git.bb b/recipes-ti/ipc/ipc-transport-srio_git.bb index 266aa4e2..f0586d8b 100644 --- a/recipes-ti/ipc/ipc-transport-srio_git.bb +++ b/recipes-ti/ipc/ipc-transport-srio_git.bb @@ -1,5 +1,7 @@ include ipc-transport-srio.inc +PR = "${INC_PR}.0" + DEPENDS = "ti-ipc mpm-transport" do_compile () { diff --git a/recipes-ti/ipc/ipc-transport.inc b/recipes-ti/ipc/ipc-transport.inc new file mode 100644 index 00000000..4ba3670b --- /dev/null +++ b/recipes-ti/ipc/ipc-transport.inc @@ -0,0 +1,15 @@ +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=27bb0deb260c60120a8d7b91da7c3b02" + +IPC_TRANSPORT_GIT_URI = "git://git.ti.com/keystone-linux/ipc-transport.git" +IPC_TRANSPORT_GIT_BRANCH = "master" +IPC_TRANSPORT_GIT_PROTOCOL = "git" + +# Below commit ID corresponds to DEV.IPC-TRANSPORT.02.00.00.01 +IPC_TRANSPORT_SRCREV = "88ea336c584ccec4b2c281cd7f75df9dff6d4edf" + +BRANCH="${IPC_TRANSPORT_GIT_BRANCH}" +SRC_URI = "${IPC_TRANSPORT_GIT_URI};protocol=${IPC_TRANSPORT_GIT_PROTOCOL};branch=${BRANCH}" +SRCREV = "${IPC_TRANSPORT_SRCREV}" +PV = "02.00.00.01" + +INC_PR = "r1"