Merge branch 'feature/autorev'

recipes-iqrf/iqrf-gateway-webapp/iqrf-gateway-webapp/0001-app-config-Disable-sudo.patch

@@ -19,7 +19,6 @@ index 30b561d..4306ec4 100644
 +	sudo: false
  	# Controller configuration
  	controller:
- 		# Path to directory containing IQRF Gateway Controller configuration
+ 		# Path to directory containing IQRF Gateway Controller's configuration
 -- 
 2.9.0.windows.1
-

recipes-iqrf/iqrf-gateway-webapp/iqrf-gateway-webapp/0002-Makefile-fixes.patch

-From 3b3e45bf88f22796c51a92d203c5118b548eb9d2 Mon Sep 17 00:00:00 2001
+From 0069e42c502b8e663358d77aafaf6dbee6d00a52 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Roman=20Ondr=C3=A1=C4=8Dek?= <ondracek.roman@centrum.cz>
-Date: Mon, 26 Oct 2020 00:31:20 +0100
+Date: Sat, 20 Feb 2021 21:48:31 +0100
 Subject: [PATCH] Makefile fixes
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -12,10 +12,10 @@ Signed-off-by: Roman Ondráček <ondracek.roman@centrum.cz>
  1 file changed, 6 insertions(+), 3 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 8cd66fd8..bc544910 100644
+index a1f05159..c97803de 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -58,7 +58,7 @@ deps:
+@@ -59,7 +59,7 @@ deps:
  qa: lint cs
  
  install:
@@ -24,10 +24,10 @@ index 8cd66fd8..bc544910 100644
  	install -d $(CONFIG_DIR)
  	cp app/config/* $(CONFIG_DIR)
  	install -d $(CONFIG_DIR)/certs
-@@ -71,8 +71,8 @@ install:
- 	cp version.json $(DATA_DIR)
- 	cp -r vendor/ $(DATA_DIR)
+@@ -74,8 +74,8 @@ install:
  	cp -r www/ $(DATA_DIR)
+ 	install -d $(SYSTEMD_DIR)
+ 	install -m 0644 install/config/systemd/* $(SYSTEMD_DIR)
 -	install -d -o www-data $(LOG_DIR)
 -	install -d -o www-data ${DESTDIR}/var/lib/iqrf-gateway-webapp
 +	install -d $(LOG_DIR)
@@ -35,13 +35,13 @@ index 8cd66fd8..bc544910 100644
  	# Delete documentation
  	find ${VENDOR_DIR} -type f -name "AUTHORS*" -delete
  	find ${VENDOR_DIR} -type f -name "CHANGELOG*" -delete
-@@ -146,3 +146,6 @@ temp/code-checker:
+@@ -149,3 +149,6 @@ temp/code-checker:
  
  test: deps
  	vendor/bin/tester -p phpdbg -c ./tests/php.ini ./tests
 +
-+clean:
++clear:
 +	true
 -- 
-2.28.0
+2.30.1
 

recipes-iqrf/iqrf-gateway-webapp/iqrf-gateway-webapp/0003-Features-for-Yocto-image.patch

-From e842b17cc1d9dc63191f487265fec6c34952de5e Mon Sep 17 00:00:00 2001
+From e4bfc9df5ed57d46c04c4d88a23cea11a38252bb Mon Sep 17 00:00:00 2001
 From: Rostislav Spinar <rostislav.spinar@iqrf.com>
-Date: Mon, 8 Feb 2021 21:20:16 +0100
+Date: Wed, 3 Mar 2021 12:38:44 +0100
 Subject: [PATCH] Features for Yocto image
 
 ---
- app/config/features.neon | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
+ app/config/features.neon | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/app/config/features.neon b/app/config/features.neon
-index ba1f18f..d006eb0 100644
+index ba1f18f..959c154 100644
 --- a/app/config/features.neon
 +++ b/app/config/features.neon
 @@ -1,13 +1,13 @@
@@ -16,7 +16,7 @@ index ba1f18f..d006eb0 100644
  docs:
  	enabled: true
 -	url: https://docs.iqrf.org/iqrf-gateway/
-+	url: https://docs.iqrf.org/iqube
++	url: https://docs.iqrf.org/iqube/
  grafana:
  	enabled: false
  	url: /grafana/
@@ -27,7 +27,15 @@ index ba1f18f..d006eb0 100644
  # IQRF Gateway Translator configuration
  iqrfGatewayTranslator:
  	enabled: false
-@@ -23,13 +23,13 @@ nodeRed:
+@@ -16,20 +16,20 @@ mender:
+ 	enabled: false
+ # Network manager
+ networkManager:
+-	enabled: false
++	enabled: true
+ # Node-RED
+ nodeRed:
+ 	enabled: false
  	url: /node-red/
  # PIXLA mamagement system
  pixla:

recipes-iqrf/iqrf-gateway-webapp/iqrf-gateway-webapp/0004-NPM-downgrade-ESLint-TypeScript-parser-due-to-bug.patch

-From f09c71599e62b4c77a913754ff671efc11ee48b4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Roman=20Ondr=C3=A1=C4=8Dek?= <ondracek.roman@centrum.cz>
-Date: Thu, 21 Jan 2021 23:15:49 +0100
-Subject: [PATCH] NPM: downgrade ESLint TypeScript parser due to bug
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Roman Ondráček <ondracek.roman@centrum.cz>
----
- package.json | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/package.json b/package.json
-index 714d3353..9f037b35 100644
---- a/package.json
-+++ b/package.json
-@@ -66,8 +66,8 @@
- 		"@types/prismjs": "^1.16.2",
- 		"@types/uuid": "^8.3.0",
- 		"@types/vue-datetime": "^1.0.1",
--		"@typescript-eslint/eslint-plugin": "^4.10.0",
--		"@typescript-eslint/parser": "^4.10.0",
-+		"@typescript-eslint/eslint-plugin": "4.13.0",
-+		"@typescript-eslint/parser": "4.13.0",
- 		"@vue/cli-plugin-babel": "^4.5.9",
- 		"@vue/cli-plugin-eslint": "^4.5.9",
- 		"@vue/cli-plugin-router": "^4.5.9",
--- 
-2.30.0
-

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

@@ -3,13 +3,14 @@ HOMEPAGE = "https://gitlab.iqrf.org/open-source/iqrf-gateway-webapp"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 
 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"
+RDEPENDS_${PN} += "nginx php php-cgi php-cli php-fpm php-opcache php-phar php-curl php-xsl python3-core"
 
-SRC_URI = "git://gitlab.iqrf.org/open-source/iqrf-gateway-webapp.git;protocol=https;tag=v${PV};branch=v2.2.x \
+SRCREV = "${AUTOREV}"
+
+SRC_URI = "git://gitlab.iqrf.org/open-source/iqrf-gateway-webapp.git;protocol=https \
 	file://0001-app-config-Disable-sudo.patch \
 	file://0002-Makefile-fixes.patch \
 	file://0003-Features-for-Yocto-image.patch \
-	file://0004-NPM-downgrade-ESLint-TypeScript-parser-due-to-bug.patch \
 	file://iqrf-gateway-webapp-setup.service \
 	file://setup_webapp.py \
 "
@@ -48,7 +49,7 @@ do_install() {
 	install -m 755 ${WORKDIR}/setup_webapp.py ${D}${sbindir}
 }
 
-FILES_${PN} += "${sbindir}/* ${sysconfdir}/tmpfiles.d/*"
+FILES_${PN} += "${sbindir}/* ${sysconfdir}/tmpfiles.d/* ${systemd_system_unitdir}/*"
 
 inherit systemd