bump linuxkit to version that supports sbom; disable for now

Signed-off-by: Avi Deitcher <[email protected]>

Makefile

@@ -295,7 +295,7 @@ DOCKER_GO = _() { $(SET_X); mkdir -p $(CURDIR)/.go/src/$${3:-dummy} ; mkdir -p $
 
 PARSE_PKGS=$(if $(strip $(EVE_HASH)),EVE_HASH=)$(EVE_HASH) DOCKER_ARCH_TAG=$(DOCKER_ARCH_TAG) KERNEL_TAG=$(KERNEL_TAG) ./tools/parse-pkgs.sh
 LINUXKIT=$(BUILDTOOLS_BIN)/linuxkit
-LINUXKIT_VERSION=7164b2c04d40eb276cee6e16c7fa617fe6840a17
+LINUXKIT_VERSION=bbd9b85fc153a9d64f839d37591b0dcbe5375407
 LINUXKIT_SOURCE=https://github.com/linuxkit/linuxkit.git
 LINUXKIT_OPTS=$(if $(strip $(EVE_HASH)),--hash) $(EVE_HASH) $(if $(strip $(EVE_REL)),--release) $(EVE_REL)
 LINUXKIT_PKG_TARGET=build

tools/makerootfs.sh

@@ -24,8 +24,9 @@ do_image() {
     ARCHARG="--arch ${arch}"
   fi
   : > "$IMAGE"
+  # sbom disabled for now; will be re-enabled later
   # shellcheck disable=SC2086
-  linuxkit build --docker ${ARCHARG} -o - "$ymlfile" | docker run -i --rm -v /dev:/dev --privileged -v "$IMAGE:/rootfs.img" "${MKROOTFS_TAG}"
+  linuxkit build --no-sbom --docker ${ARCHARG} -o - "$ymlfile" | docker run -i --rm -v /dev:/dev --privileged -v "$IMAGE:/rootfs.img" "${MKROOTFS_TAG}"
 }
 
 # mode 1 - generate tarfile from yml and save
@@ -40,8 +41,9 @@ do_tar() {
   if [ -n "$arch" ]; then
     ARCHARG="--arch ${arch}"
   fi
+  # sbom disabled for now; will be re-enabled later
   # shellcheck disable=SC2086
-  linuxkit build --docker ${ARCHARG} --o "${tarfile}" "$ymlfile"
+  linuxkit build --no-sbom --docker ${ARCHARG} --o "${tarfile}" "$ymlfile"
 }
 
 # mode 2 - generate image from tarfile