Merge master

Signed-off-by: Waldemar Kozaczuk <jwkozaczuk@gmail.com>

Author: wkozaczuk

.gitmodules

@@ -18,3 +18,6 @@
 [submodule "musl_1.1.24"]
 	path = musl_1.1.24
 	url = https://github.com/osvunikernel/musl
+[submodule "kbuild"]
+	path = kbuild
+	url = https://github.com/osvunikernel/kbuild-standalone.git

.travis.yml

@@ -44,21 +44,29 @@ jobs:
         - docker exec build ./scripts/osv-version.sh > /tmp/osv-version
         - export ARTIFACTS_DIR="$(mktemp -d)"
         - cp /tmp/osv-version "$ARTIFACTS_DIR"
-        - docker cp build:/root/.capstan/repository/osv-loader/osv-loader.qemu "$ARTIFACTS_DIR"
-        - gzip "$ARTIFACTS_DIR"/osv-loader.qemu
-        - docker cp build:/git-repos/osv/build/release/loader-stripped.elf "$ARTIFACTS_DIR"/loader.elf
-        - gzip "$ARTIFACTS_DIR"/loader.elf
+        - docker cp build:/root/.capstan/repository/osv-loader/osv-loader.qemu.x86_64 "$ARTIFACTS_DIR"/osv-loader-with-zfs.qemu.x86_64
+        - gzip "$ARTIFACTS_DIR"/osv-loader-with-zfs.qemu.x86_64
+        - docker cp build:/git-repos/osv/build/release/loader-stripped.elf "$ARTIFACTS_DIR"/loader-with-zfs.elf.x86_64
+        - gzip "$ARTIFACTS_DIR"/loader-with-zfs.elf.x86_64
         - docker cp build:/root/.capstan/repository/osv-loader/index.yaml "$ARTIFACTS_DIR"
-        - docker cp build:/root/.capstan/packages/osv.bootstrap.mpm "$ARTIFACTS_DIR"
+        - docker cp build:/root/.capstan/packages/osv.zfs.mpm.x86_64 "$ARTIFACTS_DIR"
+        - docker cp build:/root/.capstan/packages/osv.zfs.yaml "$ARTIFACTS_DIR"
+        - docker cp build:/root/.capstan/packages/osv.bootstrap.mpm.x86_64 "$ARTIFACTS_DIR"
         - docker cp build:/root/.capstan/packages/osv.bootstrap.yaml "$ARTIFACTS_DIR"
-        - docker cp build:/root/.capstan/packages/osv.common-tests.mpm "$ARTIFACTS_DIR"
+        - docker cp build:/root/.capstan/packages/osv.common-tests.mpm.x86_64 "$ARTIFACTS_DIR"
         - docker cp build:/root/.capstan/packages/osv.common-tests.yaml "$ARTIFACTS_DIR"
-        - docker cp build:/root/.capstan/packages/osv.zfs-tests.mpm "$ARTIFACTS_DIR"
+        - docker cp build:/root/.capstan/packages/osv.zfs-tests.mpm.x86_64 "$ARTIFACTS_DIR"
         - docker cp build:/root/.capstan/packages/osv.zfs-tests.yaml "$ARTIFACTS_DIR"
-        - docker cp build:/root/.capstan/packages/osv.rofs-tests.mpm "$ARTIFACTS_DIR"
+        - docker cp build:/root/.capstan/packages/osv.rofs-tests.mpm.x86_64 "$ARTIFACTS_DIR"
         - docker cp build:/root/.capstan/packages/osv.rofs-tests.yaml "$ARTIFACTS_DIR"
-        - docker cp build:/root/.capstan/packages/osv.httpserver-monitoring-api.mpm "$ARTIFACTS_DIR"
+        - docker cp build:/root/.capstan/packages/osv.httpserver-monitoring-api.mpm.x86_64 "$ARTIFACTS_DIR"
         - docker cp build:/root/.capstan/packages/osv.httpserver-monitoring-api.yaml "$ARTIFACTS_DIR"
+        - docker exec build rm -rf ./build/release.x64
+        - docker exec build ./scripts/build-capstan-mpm-packages kernel conf_hide_symbols=1 fs=rofs loader_image=osv-loader-hidden
+        - docker cp build:/root/.capstan/repository/osv-loader-hidden/osv-loader-hidden.qemu.x86_64 "$ARTIFACTS_DIR"/osv-loader-hidden.qemu.x86_64
+        - gzip "$ARTIFACTS_DIR"/osv-loader-hidden.qemu.x86_64
+        - docker cp build:/git-repos/osv/build/release/loader-stripped.elf "$ARTIFACTS_DIR"/loader-hidden.elf.x86_64
+        - gzip "$ARTIFACTS_DIR"/loader-hidden.elf.x86_64
         - ./.travis/cirp/cleanup4.sh
         - ./.travis/cirp/publish.sh "$ARTIFACTS_DIR" $(cat /tmp/osv-version)
         - ./.travis/cirp/cleanup5.sh

.travis/cirp/install.sh

@@ -74,4 +74,7 @@ python3 -m pip install --user setuptools
 # OSX keeps re-installing it tough, as it uses a temp per-script virtualenv.
 if ! python3 -m pip list --format=columns | grep '^ci-release-publisher '; then
   python3 -m pip install --user https://files.pythonhosted.org/packages/49/20/2631e993daa85b35c8390e8124570b0321825e6a77e566492b4637566983/ci_release_publisher-0.3.0.tar.gz
+  # Downgrade to specific version of urllib3 to avoid the 'AttributeError: type object 'Retry' has no attribute 'DEFAULT_METHOD_WHITELIST'
+  python3 -m pip uninstall -y urllib3
+  python3 -m pip install urllib3==1.26.15
 fi