v2.5.2

Author: brod-intel

CHANGELOG.md

@@ -163,6 +163,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Fixed default initrd size being to big
 - Fixed Miscellaneous bugs
 
+## [2.5.2] - 2022-06-30
+### Changed
+- Fixed Linuxkit compiling on Ubuntu 22.04
+- Fixed Miscellaneous bugs
+
 
 
 
@@ -176,4 +181,5 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 [2.0.3]: https://github.com/intel/Edge-Software-Provisioner/compare/v2.0.2...v2.0.3
 [2.0.4]: https://github.com/intel/Edge-Software-Provisioner/compare/v2.0.3...v2.0.4
 [2.5.0]: https://github.com/intel/Edge-Software-Provisioner/compare/v2.0.3...v2.5
-[2.5.1]: https://github.com/intel/Edge-Software-Provisioner/compare/v2.5...v2.5.1
+[2.5.1]: https://github.com/intel/Edge-Software-Provisioner/compare/v2.5...v2.5.1
+[2.5.2]: https://github.com/intel/Edge-Software-Provisioner/compare/v2.5.1...v2.5.2

scripts/buildUOS.sh

@@ -9,6 +9,9 @@
 # source "textutils.sh"
 # source "fleutils.sh"
 
+##### NOTE ####
+# Linuxkit will not compile in Docker version 20.x or later
+
 set -u
 
 export GIT_COMMIT=$(git log -1 --oneline 2> /dev/null | awk '{print $1}')
@@ -64,6 +67,10 @@ if podman -v >/dev/null 2>&1; then
             mkdir -p $(pwd)/lib/docker && \
             docker run -d --privileged --name builder-docker ${DOCKER_RUN_ARGS} -v /tmp/builder:/var/run -v $(pwd)/lib/docker:/var/lib/docker docker:19.03.12-dind && \
             sleep 10 && \
+            docker exec -t builder-docker sh -c '\
+                mkdir /sys/fs/cgroup/systemd && \
+                mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd \
+            ' && \
             docker run -t --rm --privileged ${DOCKER_RUN_ARGS} -v $(pwd):/uos -v /tmp/builder:/var/run -v /tmp/host-builder:/tmp/host-docker docker:19.03.12-dind sh -c '\
                 apk update && apk add --no-cache \
                     alpine-sdk \
@@ -110,6 +117,10 @@ else
             docker run -d --privileged --name builder-docker ${DOCKER_RUN_ARGS} -v /tmp/builder:/var/run -v $(pwd)/lib/docker:/var/lib/docker docker:19.03.12-dind && \
             echo 'Waiting for Docker'; \
             while (! docker -H unix:////tmp/builder/docker.sock ps > /dev/null 2>&1); do echo -n '.'; sleep 0.5; done; echo 'ready' && \
+            docker exec -t builder-docker sh -c '\
+                mkdir /sys/fs/cgroup/systemd && \
+                mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd \
+            ' && \
             docker run -t ${DOCKER_RUN_ARGS} --rm -v $(pwd):/uos -v /tmp/builder:/var/run -v /var/run:/tmp/host-docker docker:19.03.12-dind sh -c '\
                 apk update && apk add --no-cache \
                     alpine-sdk \