From 03357a6e3e178b292ce50cbad50ebcfed12c97df Mon Sep 17 00:00:00 2001
From: Avi Deitcher <avi@deitcher.net>
Date: Wed, 15 Nov 2023 19:29:01 +0200
Subject: [PATCH] bump linuxkit to version that supports sbom; disable for now

Signed-off-by: Avi Deitcher <avi@deitcher.net>
---
 Makefile            | 2 +-
 tools/makerootfs.sh | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 17bc7ac22a..413b3e8ca6 100644
--- a/Makefile
+++ b/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
diff --git a/tools/makerootfs.sh b/tools/makerootfs.sh
index 7962cf7f63..306d9dc57c 100755
--- a/tools/makerootfs.sh
+++ b/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