summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMykyta Dorokhin <mykyta.dorokhin@globallogic.com>2021-02-09 14:10:49 +0200
committerMykyta Dorokhin <mykyta.dorokhin@globallogic.com>2021-02-09 14:10:49 +0200
commit0b4a7982a56cdf145502231c6e6003338817e7cd (patch)
treebd711ab5ae38021802f367f74c5c9fe060031b52
parent6b76023b4c9a535c2fe021d70faf75044b027f22 (diff)
parent8f533895110c11516053c9bc11fe245d251dd769 (diff)
downloadmeta-multitech-0b4a7982a56cdf145502231c6e6003338817e7cd.tar.gz
meta-multitech-0b4a7982a56cdf145502231c6e6003338817e7cd.tar.bz2
meta-multitech-0b4a7982a56cdf145502231c6e6003338817e7cd.zip
Merge remote-tracking branch 'origin/dunfell' into md/linux-5.4.81
-rw-r--r--recipes-bsp/multitech/mtac-eth_1.1.1.bb2
-rw-r--r--recipes-bsp/multitech/mtac-gpiob_1.1.2.bb2
-rw-r--r--recipes-bsp/multitech/mtac-lora_1.1.5.bb2
-rw-r--r--recipes-bsp/multitech/mtac-mfser_1.1.1.bb2
-rw-r--r--recipes-bsp/multitech/mtac-pulse_1.1.1.bb2
-rw-r--r--recipes-bsp/multitech/mtac-xdot_1.1.1.bb2
-rw-r--r--recipes-bsp/multitech/mtac_4.0.7.bb3
-rw-r--r--recipes-bsp/multitech/mts-id-eeprom.inc3
-rw-r--r--recipes-bsp/multitech/mts-io-sysfs_0.1.14.bb (renamed from recipes-bsp/multitech/mts-io-sysfs_0.1.13.bb)3
-rw-r--r--recipes-bsp/multitech/mts-io.inc2
10 files changed, 10 insertions, 13 deletions
diff --git a/recipes-bsp/multitech/mtac-eth_1.1.1.bb b/recipes-bsp/multitech/mtac-eth_1.1.1.bb
index 4000d31..4f9d830 100644
--- a/recipes-bsp/multitech/mtac-eth_1.1.1.bb
+++ b/recipes-bsp/multitech/mtac-eth_1.1.1.bb
@@ -15,7 +15,7 @@ SRCREV = "${PV}"
PR = "${INC_PR}.1${KERNEL_MODULE_PACKAGE_SUFFIX}"
SRC_URI = " \
- git://git@gitlab.multitech.net/mirrors/mtac-eth.git;protocol=ssh \
+ git://git.multitech.net/mtac-eth.git;protocol=git;branch=master \
"
S = "${WORKDIR}/git"
diff --git a/recipes-bsp/multitech/mtac-gpiob_1.1.2.bb b/recipes-bsp/multitech/mtac-gpiob_1.1.2.bb
index 39f415d..3b704d1 100644
--- a/recipes-bsp/multitech/mtac-gpiob_1.1.2.bb
+++ b/recipes-bsp/multitech/mtac-gpiob_1.1.2.bb
@@ -17,7 +17,7 @@ SRCREV = "${PV}"
PR = "${INC_PR}.1${KERNEL_MODULE_PACKAGE_SUFFIX}"
SRC_URI = " \
- git://git@gitlab.multitech.net/mirrors/mtac-gpiob.git;protocol=ssh \
+ git://git.multitech.net/mtac-gpiob.git;protocol=git;branch=master \
"
S = "${WORKDIR}/git"
diff --git a/recipes-bsp/multitech/mtac-lora_1.1.5.bb b/recipes-bsp/multitech/mtac-lora_1.1.5.bb
index 1e30a07..357da00 100644
--- a/recipes-bsp/multitech/mtac-lora_1.1.5.bb
+++ b/recipes-bsp/multitech/mtac-lora_1.1.5.bb
@@ -15,7 +15,7 @@ SRCREV = "${PV}"
PR = "${INC_PR}.1${KERNEL_MODULE_PACKAGE_SUFFIX}"
SRC_URI = " \
- git://git@gitlab.multitech.net/mirrors/mtac-lora.git;protocol=ssh \
+ git://git.multitech.net/mtac-lora.git;protocol=git;branch=master \
"
S = "${WORKDIR}/git"
diff --git a/recipes-bsp/multitech/mtac-mfser_1.1.1.bb b/recipes-bsp/multitech/mtac-mfser_1.1.1.bb
index 7942526..21e22a2 100644
--- a/recipes-bsp/multitech/mtac-mfser_1.1.1.bb
+++ b/recipes-bsp/multitech/mtac-mfser_1.1.1.bb
@@ -15,7 +15,7 @@ SRCREV = "${PV}"
PR = "${INC_PR}.1${KERNEL_MODULE_PACKAGE_SUFFIX}"
SRC_URI = " \
- git://git@gitlab.multitech.net/mirrors/mtac-mfser.git;protocol=ssh \
+ git://git.multitech.net/mtac-mfser.git;protocol=git;branch=master \
"
S = "${WORKDIR}/git"
diff --git a/recipes-bsp/multitech/mtac-pulse_1.1.1.bb b/recipes-bsp/multitech/mtac-pulse_1.1.1.bb
index d00f962..c744b39 100644
--- a/recipes-bsp/multitech/mtac-pulse_1.1.1.bb
+++ b/recipes-bsp/multitech/mtac-pulse_1.1.1.bb
@@ -15,7 +15,7 @@ SRCREV = "${PV}"
PR = "${INC_PR}.1${KERNEL_MODULE_PACKAGE_SUFFIX}"
SRC_URI = " \
- git://git@gitlab.multitech.net/mirrors/mtac-pulse.git;protocol=ssh \
+ git://git.multitech.net/mtac-pulse.git;protocol=git;branch=master \
"
S = "${WORKDIR}/git"
diff --git a/recipes-bsp/multitech/mtac-xdot_1.1.1.bb b/recipes-bsp/multitech/mtac-xdot_1.1.1.bb
index 65bb3c3..c03250e 100644
--- a/recipes-bsp/multitech/mtac-xdot_1.1.1.bb
+++ b/recipes-bsp/multitech/mtac-xdot_1.1.1.bb
@@ -15,7 +15,7 @@ SRCREV = "${PV}"
PR = "${INC_PR}.1${KERNEL_MODULE_PACKAGE_SUFFIX}"
SRC_URI = " \
- git://git@gitlab.multitech.net/mirrors/mtac-xdot.git;protocol=ssh \
+ git://git.multitech.net/mtac-xdot.git;protocol=git;branch=master \
file://xdot-util \
"
S = "${WORKDIR}/git"
diff --git a/recipes-bsp/multitech/mtac_4.0.7.bb b/recipes-bsp/multitech/mtac_4.0.7.bb
index ca872e2..caf1092 100644
--- a/recipes-bsp/multitech/mtac_4.0.7.bb
+++ b/recipes-bsp/multitech/mtac_4.0.7.bb
@@ -19,9 +19,8 @@ RPROVIDES_kernel-module-${PN} = "mtac"
PR = "${INC_PR}.1${KERNEL_MODULE_PACKAGE_SUFFIX}"
-# git://git.multitech.net/mtac.git;protocol=git
SRC_URI = " \
- git://git@gitlab.multitech.net/mirrors/mtac.git;protocol=ssh \
+ git://git.multitech.net/mtac.git;protocol=git;branch=master \
"
S = "${WORKDIR}/git"
diff --git a/recipes-bsp/multitech/mts-id-eeprom.inc b/recipes-bsp/multitech/mts-id-eeprom.inc
index 0ea455a..bfe9d9f 100644
--- a/recipes-bsp/multitech/mts-id-eeprom.inc
+++ b/recipes-bsp/multitech/mts-id-eeprom.inc
@@ -25,8 +25,7 @@ TARGET_CFLAGS_append_mtcpmhs = " -D MTCDT3B"
SRCREV = "${PV}"
-# SRC_URI = "git://git.multitech.net/mts-id-eeprom.git;protocol=git"
-SRC_URI = "git://git@gitlab.multitech.net/mirrors/mts-id-eeprom;protocol=ssh"
+SRC_URI = "git://git.multitech.net/mts-id-eeprom;protocol=git;branch=master"
SRC_URI_append_mtcdt = " file://mtcdt-fpga-v31.hex file://mtcdt-fpga-v35.hex"
SRC_URI_append_mtcap = " file://mtcap-fpga-v31.hex file://mtcap-fpga-v35.hex"
diff --git a/recipes-bsp/multitech/mts-io-sysfs_0.1.13.bb b/recipes-bsp/multitech/mts-io-sysfs_0.1.14.bb
index 8ad2bce..074ce11 100644
--- a/recipes-bsp/multitech/mts-io-sysfs_0.1.13.bb
+++ b/recipes-bsp/multitech/mts-io-sysfs_0.1.14.bb
@@ -12,8 +12,7 @@ PR = "r0"
SRCREV = "${PV}"
-# "git://git.multitech.net/mts-io-sysfs;protocol=git;branch=master
-SRC_URI = "git://git@gitlab.multitech.net/mirrors/mts-io-sysfs;protocol=ssh;branch=master \
+SRC_URI = "git://git.multitech.net/mts-io-sysfs.git;protocol=git;branch=master \
file://mts-io-sysfs.init"
S = "${WORKDIR}/git"
diff --git a/recipes-bsp/multitech/mts-io.inc b/recipes-bsp/multitech/mts-io.inc
index f62719d..59d9049 100644
--- a/recipes-bsp/multitech/mts-io.inc
+++ b/recipes-bsp/multitech/mts-io.inc
@@ -19,7 +19,7 @@ RDEPENDS_${PN}-noarch_append_mtcap = " mts-io-sysfs i2c-tools"
# git://git.multitech.net/mts-io.git;protocol=git
SRC_URI = " \
- git://git@gitlab.multitech.net/mirrors/mts-io;protocol=ssh \
+ git://git.multitech.net/mts-io.git;protocol=git;branch=master \
file://led-status_heartbeat_trigger \
file://lora-led-updater \
file://mts-io.init \