meta-digi: revert revisions to AUTOREV

Signed-off-by: Mike Engel <Mike.Engel@digi.com>
2018-12-04 16:38:07 +01:00 · 2018-12-04 16:38:07 +01:00 · dd5ba676ff
parent 29d7aa0c41
commit dd5ba676ff
10 changed files with 20 additions and 22 deletions
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb
@ -12,13 +12,13 @@ DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-n
 PROVIDES += "u-boot"

 SRCBRANCH = "v2015.04/maint"
-SRCREV = "5ea79bed5143fc47e5b11af2d44a04bab9af4092"
+SRCREV = "${AUTOREV}"

 # Select internal or Github U-Boot repo
 UBOOT_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}"

 SRC_URI = " \
-    ${UBOOT_GIT_URI};nobranch=1 \
+    ${UBOOT_GIT_URI};branch=${SRCBRANCH} \
 "

 SRC_URI_append = " \
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb
@ -13,7 +13,7 @@ DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-n
 PROVIDES += "u-boot"

 SRCBRANCH = "v2017.03/maint"
-SRCREV = "063eba9a4a5437833b8179375e9a23af91a982a8"
+SRCREV = "${AUTOREV}"

 S = "${WORKDIR}/git"

@ -21,7 +21,7 @@ S = "${WORKDIR}/git"
 UBOOT_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}"

 SRC_URI = " \
-    ${UBOOT_GIT_URI};nobranch=1 \
+    ${UBOOT_GIT_URI};branch=${SRCBRANCH} \
 "

 SRC_URI_append = " \
--- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb
+++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb
@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425
 DEPENDS = "trustfence-cst coreutils util-linux"

 SRCBRANCH = "v2017.03/maint"
-SRCREV = "063eba9a4a5437833b8179375e9a23af91a982a8"
+SRCREV = "${AUTOREV}"

 S = "${WORKDIR}"

@ -14,7 +14,7 @@ S = "${WORKDIR}"
 UBOOT_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}"

 SRC_URI = " \
-    ${UBOOT_GIT_URI};nobranch=1 \
+    ${UBOOT_GIT_URI};branch=${SRCBRANCH} \
    file://trustfence-sign-kernel.sh;name=kernel-script \
    file://sign_uimage;name=kernel-sign \
    file://encrypt_uimage;name=kernel-encrypt \
--- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb
+++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb
@ -11,13 +11,12 @@ PV_ccimx8x = "v4.0.11.208Q"

 SRCBRANCH = "dey-2.4/maint"
 SRCBRANCH_ccimx8x = "dey-2.4/maint_cc8x"
-SRCREV = "ae084f646ab6342e785a3e3e4977cd4f570680db"
-SRCREV_ccimx8x = "bb11723b14dab4c8d930bb38a08f736b2985d5e1"
+SRCREV = "${AUTOREV}"

 QCOM_GIT_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git', d)}"

 SRC_URI = " \
-    ${QCOM_GIT_URI};nobranch=1 \
+    ${QCOM_GIT_URI};branch=${SRCBRANCH} \
 "

 # Selects whether the interface is SDIO or PCI
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
@ -6,11 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 LOCALVERSION = "-dey"
 SRCBRANCH = "v4.9/dey-2.4/maint"
 SRCBRANCH_ccimx8x = "v4.9/dey-2.4/maint_cc8x"
-SRCREV = "a78b3d90543e3b751d02be146eea6ecef98026d5"
-SRCREV_ccimx8x = "c5bb360542d53dc8cfceaec5f2d9060e47fdc5bc"
+SRCREV = "${AUTOREV}"

 # Select internal or Github Linux repo
 LINUX_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git', d)}"
-SRC_URI = "${LINUX_GIT_URI};nobranch=1"
+SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}"

 S = "${WORKDIR}/git"
--- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb
+++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb
@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7
 DEPENDS = "confuse openssl recovery-utils zlib"

 SRCBRANCH = "master"
-SRCREV = "433c1a58a7e63933a60716195e6bb834b201bf1c"
+SRCREV = "${AUTOREV}"

 CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh"
 CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=git"

 CC_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}"

-SRC_URI = "${CC_GIT_URI};nobranch=1"
+SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}"

 S = "${WORKDIR}/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
@ -15,14 +15,14 @@ AWS_USER_LED_ccimx6sbc ?= "34"
 AWS_USER_LED_ccimx6qpsbc ?= "34"

 SRCBRANCH = "dey-2.4/maint"
-SRCREV = "95243cf2de71aa273f8088c7b2c7eb187f8ef179"
+SRCREV = "${AUTOREV}"

 CC_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh"
 CC_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=git"

 CC_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}"

-SRC_URI = "${CC_GIT_URI};nobranch=1"
+SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}"

 S = "${WORKDIR}/git/awsiot-sample"

--- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb
+++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb
@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425
 DEPENDS = "cryptoauthlib"

 SRCBRANCH = "dey-2.4/maint"
-SRCREV = "95243cf2de71aa273f8088c7b2c7eb187f8ef179"
+SRCREV = "${AUTOREV}"

 CC_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh"
 CC_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=git"

 CC_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}"

-SRC_URI = "${CC_GIT_URI};nobranch=1"
+SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}"

 S = "${WORKDIR}/git/cryptochip-get-random"

--- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb
+++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb
@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca
 DEPENDS = "libdigiapix"

 SRCBRANCH = "dey-2.4/maint"
-SRCREV = "95243cf2de71aa273f8088c7b2c7eb187f8ef179"
+SRCREV = "${AUTOREV}"

 LIBDIGIAPIX_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh"
 LIBDIGIAPIX_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=git"

 LIBDIGIAPIX_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_STASH}', '${LIBDIGIAPIX_GITHUB}', d)}"

-SRC_URI = "${LIBDIGIAPIX_GIT_URI};nobranch=1"
+SRC_URI = "${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH}"

 S = "${WORKDIR}/git"

--- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb
+++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb
@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca
 DEPENDS = "libsoc libsocketcan"

 SRCBRANCH ?= "master"
-SRCREV = "780f117f0dbd5d64912221650c1be391921fca40"
+SRCREV = "${AUTOREV}"

 LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh"
 LIBDIGIAPIX_URI_GITHUB = "git://github.com/digi-embedded/libdigiapix.git;protocol=git"
@ -17,7 +17,7 @@ LIBDIGIAPIX_URI_GITHUB = "git://github.com/digi-embedded/libdigiapix.git;protoco
 LIBDIGIAPIX_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_URI_STASH}', '${LIBDIGIAPIX_URI_GITHUB}', d)}"

 SRC_URI = " \
-    ${LIBDIGIAPIX_GIT_URI};nobranch=1 \
+    ${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \
    file://99-digiapix.rules \
    file://board.conf \
    file://digiapix.sh \