Add an on-device dashboard, project Gammarus
...and update everything. In just one commit because I'm super-green and
everything has been merged already anyway.
Change-Id: I7dbe85e66855d2758183db36094a0b7f8b1e351e
diff --git a/.gitmodules b/.gitmodules
index 6c1729d..5497189 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,3 +9,6 @@
[submodule "submodules/netconf-cli"]
path = submodules/netconf-cli
url = ../netconf-cli
+[submodule "submodules/gammarus"]
+ path = submodules/gammarus
+ url = ../gammarus
diff --git a/.zuul.yaml b/.zuul.yaml
index d60b5d3..1f78aef 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -8,6 +8,7 @@
- github/buildroot/buildroot
- CzechLight/dependencies
- CzechLight/cla-sysrepo
+ - CzechLight/gammarus
- CzechLight/netconf-cli
- github/CESNET/libyang
- github/sysrepo/libredblack
diff --git a/ci/build.sh b/ci/build.sh
index 16c4f71..7b20606 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -24,7 +24,7 @@
echo BR2_PRIMARY_SITE=\"https://object-store.cloud.muni.cz/swift/v1/ci-artifacts-public/mirror/buildroot\" >> .config
make source -j${CI_PARALLEL_JOBS} --output-sync=target
-make -j${CI_PARALLEL_JOBS} --output-sync=target
+make -j${CI_PARALLEL_JOBS} --output-sync=target rootfs-czechlight-rauc
mv images/update.raucb ~/zuul-output/artifacts/
if [[ "${ZUUL_JOB_NAME}" =~ clearfog ]]; then
diff --git a/configs/czechlight_clearfog_defconfig b/configs/czechlight_clearfog_defconfig
index 490b7d4..be94d43 100644
--- a/configs/czechlight_clearfog_defconfig
+++ b/configs/czechlight_clearfog_defconfig
@@ -64,7 +64,7 @@
BR2_TARGET_ROOTFS_CPIO_UIMAGE=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
-BR2_TARGET_ROOTFS_EXT2_SIZE="300M"
+BR2_TARGET_ROOTFS_EXT2_SIZE="333M"
BR2_TARGET_ROOTFS_TAR_XZ=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
@@ -95,4 +95,5 @@
CZECHLIGHT_RAUC_SLOT_A_CFG_DEV="/dev/mmcblk0p2"
CZECHLIGHT_RAUC_SLOT_B_ROOTFS_DEV="/dev/mmcblk0p3"
CZECHLIGHT_RAUC_SLOT_B_CFG_DEV="/dev/mmcblk0p4"
+BR2_PACKAGE_GAMMARUS=y
CZECHLIGHT_NETCONF=y
diff --git a/dev-setup-git.sh b/dev-setup-git.sh
index 9563e1d..5c0b314 100755
--- a/dev-setup-git.sh
+++ b/dev-setup-git.sh
@@ -19,6 +19,7 @@
NETOPEER2_CLI_OVERRIDE_SRCDIR = ${CZECHLIGHT_BR2_EXT_LOC}/submodules/cla-sysrepo/submodules/dependencies/Netopeer2
CLA_SYSREPO_OVERRIDE_SRCDIR = ${CZECHLIGHT_BR2_EXT_LOC}/submodules/cla-sysrepo
NETCONF_CLI_OVERRIDE_SRCDIR = ${CZECHLIGHT_BR2_EXT_LOC}/submodules/netconf-cli
+GAMMARUS_OVERRIDE_SRCDIR = ${CZECHLIGHT_BR2_EXT_LOC}/submodules/gammarus
EOF
# We have to run make first so that the proxy Makefile is created and the BR2_EXTERNAL is remembered
diff --git a/package/Config.in b/package/Config.in
index 88752cc..e0491d7 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -3,4 +3,5 @@
source "$BR2_EXTERNAL_CZECHLIGHT_PATH/package/czechlight-clearfog-leds/Config.in"
source "$BR2_EXTERNAL_CZECHLIGHT_PATH/package/czechlight-rauc/Config.in"
source "$BR2_EXTERNAL_CZECHLIGHT_PATH/package/czechlight-separate-boot/Config.in"
+source "$BR2_EXTERNAL_CZECHLIGHT_PATH/package/gammarus/Config.in"
source "$BR2_EXTERNAL_CZECHLIGHT_PATH/package/grub2-tools/Config.in"
diff --git a/package/gammarus/Config.in b/package/gammarus/Config.in
new file mode 100644
index 0000000..1e866af
--- /dev/null
+++ b/package/gammarus/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_GAMMARUS
+ bool "gammarus"
+ select BR2_PACKAGE_SOCAT
+ select BR2_PACKAGE_NGHTTP2_APPS
+ help
+ Web dashboard for CzechLight devices
diff --git a/package/gammarus/gammarus.mk b/package/gammarus/gammarus.mk
new file mode 100644
index 0000000..8315285
--- /dev/null
+++ b/package/gammarus/gammarus.mk
@@ -0,0 +1,12 @@
+GAMMARUS_VERSION = master
+GAMMARUS_SITE = ssh://gerrit.cesnet.cz:29418/CzechLight/gammarus
+GAMMARUS_SITE_METHOD = git
+GAMMARUS_INSTALL_STAGING = NO
+GAMMARUS_INSTALL_TARGET = YES
+GAMMARUS_LICENSE = Apache-2.0
+
+define GAMMARUS_INSTALL_TARGET_CMDS
+ $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+endef
+
+$(eval $(generic-package))
diff --git a/submodules/buildroot b/submodules/buildroot
index 225eed5..7b1ccce 160000
--- a/submodules/buildroot
+++ b/submodules/buildroot
@@ -1 +1 @@
-Subproject commit 225eed5a4c7704a2c0f535f71532a4e05576f17b
+Subproject commit 7b1cccee2dae6a74546bc0877b038ca21c4c8885
diff --git a/submodules/cla-sysrepo b/submodules/cla-sysrepo
index 11f1359..7b36807 160000
--- a/submodules/cla-sysrepo
+++ b/submodules/cla-sysrepo
@@ -1 +1 @@
-Subproject commit 11f1359e2ba2df76079a7331cd0f41ecdb7c535b
+Subproject commit 7b36807fa2ffd07d4c11531ee692f69708a39247
diff --git a/submodules/gammarus b/submodules/gammarus
new file mode 160000
index 0000000..f823704
--- /dev/null
+++ b/submodules/gammarus
@@ -0,0 +1 @@
+Subproject commit f823704d0880caf96fcb2320b8f7ad67dcb95f6e
diff --git a/submodules/netconf-cli b/submodules/netconf-cli
index 89ddad3..a8ce67e 160000
--- a/submodules/netconf-cli
+++ b/submodules/netconf-cli
@@ -1 +1 @@
-Subproject commit 89ddad38a305df4a03e98c203c1fafe8a75153ff
+Subproject commit a8ce67ecb22105ce0e2af35a987487a859e53eb5