Merge branch 'revert-d70d5a7a' into 'master'

Revert "iqrf: use master branches"

See merge request !4

recipes-iqrf/iqrf-gateway-controller/iqrf-gateway-controller_git.bb → recipes-iqrf/iqrf-gateway-controller/iqrf-gateway-controller_1.2.0.bb

@@ -7,10 +7,7 @@ inherit cmake systemd
 
 DEPENDS = "boost rapidjson websocketpp asio"
 
-SRCREV = "${AUTOREV}"
-
-#SRC_URI = "git://git@gitlab.iqrf.org:2222/gateway/iqrf-gateway-controller.git;protocol=ssh;tag=v${PV};branch=release/v1.2.x;name=gw-controller
-SRC_URI = "gitsm://git@gitlab.iqrf.org:2222/gateway/iqrf-gateway-controller.git;protocol=ssh \
+SRC_URI = "git://git@gitlab.iqrf.org:2222/gateway/iqrf-gateway-controller.git;protocol=ssh;tag=v${PV};branch=release/v1.2.x;name=gw-controller \
 	file://0001-Fix-webapp-factory-reset.patch \
 "
 

recipes-iqrf/iqrf-gateway-daemon/iqrf-gateway-daemon_git.bb → recipes-iqrf/iqrf-gateway-daemon/iqrf-gateway-daemon_2.3.6.bb

@@ -7,10 +7,7 @@ inherit cmake systemd python3native
 DEPENDS = "shape shapeware python3-native python3-requests-native libzip"
 RDEPEND_${PN} += "shape shapeware"
 
-SRCREV = "${AUTOREV}"
-
-#SRC_URI = "gitsm://gitlab.iqrf.org/open-source/iqrf-gateway-daemon.git;protocol=https;tag=v${PV};branch=release/v2.3;name=daemon
-SRC_URI = "gitsm://git@gitlab.iqrf.org:2222/open-source/iqrf-gateway-daemon.git;protocol=ssh \
+SRC_URI = "gitsm://gitlab.iqrf.org/open-source/iqrf-gateway-daemon.git;protocol=https;tag=v${PV};branch=release/v2.3;name=daemon \
 	file://0001-First-working-verion.patch \
 	file://0002-wip.patch \
 	file://iqrf-gateway-daemon.service \

recipes-iqrf/iqrf-gateway-uploader/iqrf-gateway-uploader_git.bb → recipes-iqrf/iqrf-gateway-uploader/iqrf-gateway-uploader_1.0.0.bb

@@ -7,10 +7,10 @@ inherit cmake systemd
 
 DEPENDS = "boost rapidjson"
 
-SRCREV = "${AUTOREV}"
+#SRCREV = "${AUTOREV}"
 
-#SRC_URI = "gitsm://git@gitlab.iqrf.org:2222/gateway/iqrf-gateway-uploader.git;protocol=ssh;tag=v${PV};branch=release/v1.0.x;name=gw-uploader
-SRC_URI = "gitsm://git@gitlab.iqrf.org:2222/gateway/iqrf-gateway-uploader.git;protocol=ssh \
+#SRC_URI = "gitsm://git@gitlab.iqrf.org:2222/gateway/iqrf-gateway-uploader.git;protocol=ssh
+SRC_URI = "gitsm://git@gitlab.iqrf.org:2222/gateway/iqrf-gateway-uploader.git;protocol=ssh;tag=v${PV};branch=release/v1.0.x;name=gw-uploader \
 	file://spi-reset-tr.patch \
 "
 

recipes-iqrf/iqrf-gateway-webapp/iqrf-gateway-webapp_git.bb → recipes-iqrf/iqrf-gateway-webapp/iqrf-gateway-webapp_2.3.0.bb

@@ -5,10 +5,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=534a83444ef586160601129ce929c6fd"
 DEPENDS += "composer-native php-native openssl-native nodejs-native"
 RDEPENDS_${PN} += "nginx php php-cgi php-cli php-fpm php-opcache php-phar python3-core"
 
-SRCREV = "${AUTOREV}"
+#SRCREV = "${AUTOREV}"
 
-#SRC_URI = "git://gitlab.iqrf.org/open-source/iqrf-gateway-webapp.git;protocol=https;tag=v${PV};branch=v2.3.x
-SRC_URI = "gitsm://git@gitlab.iqrf.org:2222/open-source/iqrf-gateway-webapp.git;protocol=ssh \
+#SRC_URI = "git://gitlab.iqrf.org/open-source/iqrf-gateway-webapp.git;protocol=https
+SRC_URI = "git://gitlab.iqrf.org/open-source/iqrf-gateway-webapp.git;protocol=https;tag=v${PV};branch=v2.3.x \
 	file://0001-app-config-Disable-sudo.patch \
 	file://0002-Makefile-fixes.patch \
 	file://0003-Features-for-Yocto-image.patch \