Sync and update the CI
Now that the logs, artifacts and essentially everything is in Swift, I'm
moving our mirror there as well. (The ironic part is that the Swift GW
is currently IPv4-only, but maybe that will change, and our VMs used to
be IPv6-only, and some of the original mirrors were IPv4-only as well...)
Here's how to seed the mirror in Swift:
mkdir mirror
cd mirror
ln -s ~/work/cesnet/gerrit/github/buildroot/buildroot/dl buildroot
cd ..
openstack object create ci-artifacts-public mirror/buildroot/*/*tar* mirror/buildroot/*/*.zip
I wonder how we'll be dealing with cache purging, but hey, perhaps I can
claims that this is "for license compliance", yay.
There were some random build failures which I assumed to be related to
Python. They were not, it was a change in libyang which now requires an
out-of-tree build.
The cla-sysrepod update enables removal of netsnmp, something which
should reduce the space consumption a bit, and also cut the configure
time substantially.
The disk space is, however, still running rather thin, so it needs an
increase :(.
Change-Id: I14e57c0394a65e48761418abe9529bea8d1d8762
diff --git a/board/czechlight/clearfog/usb-genimage.cfg b/board/czechlight/clearfog/usb-genimage.cfg
index 50c4fec..23679f4 100644
--- a/board/czechlight/clearfog/usb-genimage.cfg
+++ b/board/czechlight/clearfog/usb-genimage.cfg
@@ -10,7 +10,7 @@
"usb-reflash-factory.sh"
}
}
- size = 256M
+ size = 300M
}
image usb-flash.img {
diff --git a/ci/build.sh b/ci/build.sh
index a907ebf..16c4f71 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -21,7 +21,7 @@
exit 1
fi
-echo BR2_PRIMARY_SITE=\"https://ci-logs.gerrit.cesnet.cz/t/public/mirror/buildroot\" >> .config
+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
diff --git a/configs/czechlight_clearfog_defconfig b/configs/czechlight_clearfog_defconfig
index ff10c0b..ded3c4f 100644
--- a/configs/czechlight_clearfog_defconfig
+++ b/configs/czechlight_clearfog_defconfig
@@ -63,7 +63,7 @@
BR2_TARGET_ROOTFS_CPIO_UIMAGE=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
-BR2_TARGET_ROOTFS_EXT2_SIZE="256M"
+BR2_TARGET_ROOTFS_EXT2_SIZE="300M"
BR2_TARGET_ROOTFS_TAR_XZ=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
diff --git a/package/cla-sysrepo/Config.in b/package/cla-sysrepo/Config.in
index 046c470..bf7e7bc 100644
--- a/package/cla-sysrepo/Config.in
+++ b/package/cla-sysrepo/Config.in
@@ -3,7 +3,6 @@
select BR2_PACKAGE_SYSREPO
select BR2_PACKAGE_DOCOPT_CPP
select BR2_PACKAGE_SPDLOG
- select BR2_PACKAGE_NETSNMP
select BR2_PACKAGE_SYSTEMD
select BR2_PACKAGE_LIBGPIOD
help
diff --git a/package/cla-sysrepo/cla-sysrepo.mk b/package/cla-sysrepo/cla-sysrepo.mk
index ddef562..07366bc 100644
--- a/package/cla-sysrepo/cla-sysrepo.mk
+++ b/package/cla-sysrepo/cla-sysrepo.mk
@@ -2,7 +2,7 @@
CLA_SYSREPO_SITE = ssh://kundrat@cesnet.cz@gerrit.cesnet.cz:29418/CzechLight/cla-sysrepo
CLA_SYSREPO_SITE_METHOD = git
CLA_SYSREPO_INSTALL_STAGING = NO
-CLA_SYSREPO_DEPENDENCIES = sysrepo docopt-cpp spdlog netsnmp systemd libgpiod
+CLA_SYSREPO_DEPENDENCIES = sysrepo docopt-cpp spdlog systemd libgpiod
CLA_SYSREPO_CONF_OPTS = -DTHREADS_PTHREAD_ARG:STRING=-pthread
CLA_SYSREPO_LICENSE_FILES = LICENSE.md
diff --git a/submodules/buildroot b/submodules/buildroot
index 4653534..7fde7ce 160000
--- a/submodules/buildroot
+++ b/submodules/buildroot
@@ -1 +1 @@
-Subproject commit 465353454e9972a180c9a6bf05d8cb613c49aedd
+Subproject commit 7fde7ce523935a3ae057f26b0646c25f9deaebd6
diff --git a/submodules/cla-sysrepo b/submodules/cla-sysrepo
index e3a5f75..44609c6 160000
--- a/submodules/cla-sysrepo
+++ b/submodules/cla-sysrepo
@@ -1 +1 @@
-Subproject commit e3a5f758595bbb74e6af724e7573cfa2b036855e
+Subproject commit 44609c6ddc664a4958ba96e8f1d304e3ea712430
diff --git a/submodules/netconf-cli b/submodules/netconf-cli
index a33cf08..dba6358 160000
--- a/submodules/netconf-cli
+++ b/submodules/netconf-cli
@@ -1 +1 @@
-Subproject commit a33cf0891f5fc871cb7e725b429199ad4e3064ee
+Subproject commit dba635849522a96fc864c3323e979d954d5c9a72