From 60939c2303013dc02bbb888ec6aa75e0cae7266a Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Wed, 18 Sep 2019 16:28:25 +0200 Subject: [PATCH] dey-examples: move SRC_URI to shared include file Signed-off-by: Hector Palacios --- meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb | 2 -- .../recipes-digi/dey-examples/dey-examples-bt-gatt-server.bb | 2 -- .../recipes-digi/dey-examples/dey-examples-caamblob.bb | 2 -- .../recipes-digi/dey-examples/dey-examples-cryptochip.bb | 2 -- .../recipes-digi/dey-examples/dey-examples-digiapix.bb | 2 -- meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc | 2 ++ 6 files changed, 2 insertions(+), 10 deletions(-) diff --git a/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb b/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb index 6b9a696a6..1c3ee5f33 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb @@ -16,8 +16,6 @@ AWS_USER_LED_ccimx6ulsbc ?= "488" AWS_USER_LED_ccimx6sbc ?= "34" AWS_USER_LED_ccimx6qpsbc ?= "34" -SRC_URI = "${DEY_EXAMPLES_GIT_URI};branch=${SRCBRANCH}" - S = "${WORKDIR}/git/awsiot-sample" inherit aws-iot pkgconfig diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-bt-gatt-server.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-bt-gatt-server.bb index c91792622..dfb5fa273 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-bt-gatt-server.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-bt-gatt-server.bb @@ -11,8 +11,6 @@ inherit bluetooth DEPENDS = "${BLUEZ}" -SRC_URI = "${DEY_EXAMPLES_GIT_URI};branch=${SRCBRANCH}" - S = "${WORKDIR}/git/ble-gatt-server-example" do_install() { diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-caamblob.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-caamblob.bb index a5d40e17b..c211b02ca 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-caamblob.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-caamblob.bb @@ -7,8 +7,6 @@ SECTION = "examples" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI = "${DEY_EXAMPLES_GIT_URI};branch=${SRCBRANCH}" - S = "${WORKDIR}/git/caam-blob-example" inherit pkgconfig diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb index ba7235f4d..685ba4fc4 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb @@ -9,8 +9,6 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425 DEPENDS = "cryptoauthlib" -SRC_URI = "${DEY_EXAMPLES_GIT_URI};branch=${SRCBRANCH}" - S = "${WORKDIR}/git/cryptochip-get-random" inherit pkgconfig diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb index f5551e11e..14945028e 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb @@ -9,8 +9,6 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libdigiapix" -SRC_URI = "${DEY_EXAMPLES_GIT_URI};branch=${SRCBRANCH}" - S = "${WORKDIR}/git" inherit pkgconfig diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc index ecd7612de..a9549eece 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc @@ -7,3 +7,5 @@ DEY_EXAMPLES_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh" DEY_EXAMPLES_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=https" DEY_EXAMPLES_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DEY_EXAMPLES_STASH}', '${DEY_EXAMPLES_GITHUB}', d)}" + +SRC_URI = "${DEY_EXAMPLES_GIT_URI};branch=${SRCBRANCH}"