From adf55f98514d0bd1ab4a2f1e6c01a529d2f87bee Mon Sep 17 00:00:00 2001
From: Stefan Catargiu <13122921+5kt@users.noreply.github.com>
Date: Thu, 9 Oct 2025 15:56:27 +0000
Subject: [PATCH] Update to latest GL

---
 .github/workflows/dev.yml         |  2 +-
 .github/workflows/nightly.yaml    |  4 ++--
 .github/workflows/upload_oci.yml  |  2 +-
 bin                               |  1 -
 bin/.constants.sh                 |  1 +
 bin/.dpkg-arch.sh                 |  1 +
 bin/.fix-apt-comments.sh          |  1 +
 bin/.tar-exclude                  |  1 +
 bin/README.md                     |  1 +
 bin/check-pkgs-availability.py    |  1 +
 bin/check-pkgs-pipelines.py       |  1 +
 bin/clean-build-result-repository |  1 +
 bin/find-build-container-for      |  1 +
 bin/garden-chroot                 |  1 +
 bin/garden-debian-sources-list    |  1 +
 bin/garden-version                |  1 +
 bin/get_arch.sh                   |  1 +
 bin/get_filename                  |  1 +
 bin/gl-flavors-parse              | 20 ++++++++++++++++++++
 bin/glrd                          |  1 +
 bin/inject-sshkey                 |  1 +
 bin/make-ali-ami                  |  1 +
 bin/make-gcp-ami                  |  1 +
 bin/make-vhd                      |  1 +
 bin/shrink.sh                     |  1 +
 bin/start-vm                      |  1 +
 bin/upload-openstack              |  1 +
 bin/urlescape                     |  1 +
 bin/uuid_hash                     |  1 +
 features/_kdump                   |  1 +
 gardenlinux                       |  2 +-
 tests-ng                          |  1 +
 32 files changed, 51 insertions(+), 6 deletions(-)
 delete mode 120000 bin
 create mode 120000 bin/.constants.sh
 create mode 120000 bin/.dpkg-arch.sh
 create mode 120000 bin/.fix-apt-comments.sh
 create mode 120000 bin/.tar-exclude
 create mode 120000 bin/README.md
 create mode 120000 bin/check-pkgs-availability.py
 create mode 120000 bin/check-pkgs-pipelines.py
 create mode 120000 bin/clean-build-result-repository
 create mode 120000 bin/find-build-container-for
 create mode 120000 bin/garden-chroot
 create mode 120000 bin/garden-debian-sources-list
 create mode 120000 bin/garden-version
 create mode 120000 bin/get_arch.sh
 create mode 120000 bin/get_filename
 create mode 100755 bin/gl-flavors-parse
 create mode 120000 bin/glrd
 create mode 120000 bin/inject-sshkey
 create mode 120000 bin/make-ali-ami
 create mode 120000 bin/make-gcp-ami
 create mode 120000 bin/make-vhd
 create mode 120000 bin/shrink.sh
 create mode 120000 bin/start-vm
 create mode 120000 bin/upload-openstack
 create mode 120000 bin/urlescape
 create mode 120000 bin/uuid_hash
 create mode 120000 features/_kdump
 create mode 120000 tests-ng

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 1f67f55c..d7162e32 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -26,7 +26,7 @@ jobs:
         run: echo "VERSION=$(cat VERSION)" >> $GITHUB_OUTPUT
   build:
     needs: [set_version]
-    uses: gardenlinux/gardenlinux/.github/workflows/build.yml@c1a1f112762be72b7f154ec931dfe4c57b4d2d44
+    uses: gardenlinux/gardenlinux/.github/workflows/build.yml@838bb469f9b05d98a5057e139078d791d1922348
     with:
       version: ${{ needs.set_version.outputs.VERSION }}
       # to set target to "release" or "nightly" we need proper KMS secrets
diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
index e43b0f38..d127c56e 100644
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/nightly.yaml
@@ -19,7 +19,7 @@ jobs:
           submodules: recursive
   build:
     needs: [checkout]
-    uses: gardenlinux/gardenlinux/.github/workflows/build.yml@c1a1f112762be72b7f154ec931dfe4c57b4d2d44
+    uses: gardenlinux/gardenlinux/.github/workflows/build.yml@838bb469f9b05d98a5057e139078d791d1922348
     with:
       version: ${{ inputs.version || 'now' }}
       # to set target to "release" or "nightly" we need proper KMS secrets
@@ -36,7 +36,7 @@ jobs:
     name: Run glcli to publish to OCI
     needs: [build]
     # use custom upload_oci.yml as we do not sign the images
-    # uses: gardenlinux/gardenlinux/.github/workflows/upload_oci.yml@c1a1f112762be72b7f154ec931dfe4c57b4d2d44
+    # uses: gardenlinux/gardenlinux/.github/workflows/upload_oci.yml@838bb469f9b05d98a5057e139078d791d1922348
     uses: ./.github/workflows/upload_oci.yml
     with:
       version: ${{ needs.build.outputs.version }}
diff --git a/.github/workflows/upload_oci.yml b/.github/workflows/upload_oci.yml
index b308e1e4..d8e0032f 100644
--- a/.github/workflows/upload_oci.yml
+++ b/.github/workflows/upload_oci.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   generate_matrix_publish:
     name: Generate flavors matrix to publish
-    uses: gardenlinux/gardenlinux/.github/workflows/build_flavors_matrix.yml@c1a1f112762be72b7f154ec931dfe4c57b4d2d44
+    uses: gardenlinux/gardenlinux/.github/workflows/build_flavors_matrix.yml@838bb469f9b05d98a5057e139078d791d1922348
     with:
       flags: '--exclude "bare-*" --no-arch --json-by-arch --build --test'
   upload_gl_artifacts:
diff --git a/bin b/bin
deleted file mode 120000
index c0428f4b..00000000
--- a/bin
+++ /dev/null
@@ -1 +0,0 @@
-gardenlinux/bin
\ No newline at end of file
diff --git a/bin/.constants.sh b/bin/.constants.sh
new file mode 120000
index 00000000..db80173e
--- /dev/null
+++ b/bin/.constants.sh
@@ -0,0 +1 @@
+../gardenlinux/bin/.constants.sh
\ No newline at end of file
diff --git a/bin/.dpkg-arch.sh b/bin/.dpkg-arch.sh
new file mode 120000
index 00000000..31f89c9d
--- /dev/null
+++ b/bin/.dpkg-arch.sh
@@ -0,0 +1 @@
+../gardenlinux/bin/.dpkg-arch.sh
\ No newline at end of file
diff --git a/bin/.fix-apt-comments.sh b/bin/.fix-apt-comments.sh
new file mode 120000
index 00000000..f81f1671
--- /dev/null
+++ b/bin/.fix-apt-comments.sh
@@ -0,0 +1 @@
+../gardenlinux/bin/.fix-apt-comments.sh
\ No newline at end of file
diff --git a/bin/.tar-exclude b/bin/.tar-exclude
new file mode 120000
index 00000000..c4bb0541
--- /dev/null
+++ b/bin/.tar-exclude
@@ -0,0 +1 @@
+../gardenlinux/bin/.tar-exclude
\ No newline at end of file
diff --git a/bin/README.md b/bin/README.md
new file mode 120000
index 00000000..f389492e
--- /dev/null
+++ b/bin/README.md
@@ -0,0 +1 @@
+../gardenlinux/bin/README.md
\ No newline at end of file
diff --git a/bin/check-pkgs-availability.py b/bin/check-pkgs-availability.py
new file mode 120000
index 00000000..141f763a
--- /dev/null
+++ b/bin/check-pkgs-availability.py
@@ -0,0 +1 @@
+../gardenlinux/bin/check-pkgs-availability.py
\ No newline at end of file
diff --git a/bin/check-pkgs-pipelines.py b/bin/check-pkgs-pipelines.py
new file mode 120000
index 00000000..0e755487
--- /dev/null
+++ b/bin/check-pkgs-pipelines.py
@@ -0,0 +1 @@
+../gardenlinux/bin/check-pkgs-pipelines.py
\ No newline at end of file
diff --git a/bin/clean-build-result-repository b/bin/clean-build-result-repository
new file mode 120000
index 00000000..31c7d360
--- /dev/null
+++ b/bin/clean-build-result-repository
@@ -0,0 +1 @@
+.cicd-cli.py
\ No newline at end of file
diff --git a/bin/find-build-container-for b/bin/find-build-container-for
new file mode 120000
index 00000000..038e829c
--- /dev/null
+++ b/bin/find-build-container-for
@@ -0,0 +1 @@
+../gardenlinux/bin/find-build-container-for
\ No newline at end of file
diff --git a/bin/garden-chroot b/bin/garden-chroot
new file mode 120000
index 00000000..0dc85cc0
--- /dev/null
+++ b/bin/garden-chroot
@@ -0,0 +1 @@
+../gardenlinux/bin/garden-chroot
\ No newline at end of file
diff --git a/bin/garden-debian-sources-list b/bin/garden-debian-sources-list
new file mode 120000
index 00000000..cb248b09
--- /dev/null
+++ b/bin/garden-debian-sources-list
@@ -0,0 +1 @@
+../gardenlinux/bin/garden-debian-sources-list
\ No newline at end of file
diff --git a/bin/garden-version b/bin/garden-version
new file mode 120000
index 00000000..d88969eb
--- /dev/null
+++ b/bin/garden-version
@@ -0,0 +1 @@
+../gardenlinux/bin/garden-version
\ No newline at end of file
diff --git a/bin/get_arch.sh b/bin/get_arch.sh
new file mode 120000
index 00000000..213d5bdd
--- /dev/null
+++ b/bin/get_arch.sh
@@ -0,0 +1 @@
+../gardenlinux/bin/get_arch.sh
\ No newline at end of file
diff --git a/bin/get_filename b/bin/get_filename
new file mode 120000
index 00000000..0d7404be
--- /dev/null
+++ b/bin/get_filename
@@ -0,0 +1 @@
+../gardenlinux/bin/get_filename
\ No newline at end of file
diff --git a/bin/gl-flavors-parse b/bin/gl-flavors-parse
new file mode 100755
index 00000000..a090a99f
--- /dev/null
+++ b/bin/gl-flavors-parse
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+set -Eeuo pipefail
+
+thisDir="$(dirname "$(readlink -fn "$BASH_SOURCE")")"
+rootDir="$(dirname "${thisDir}")"
+
+if ! [ -x "$(type -P gl-flavors-parse)" ]; then
+  if [ ! -d "${rootDir}/venv" ]; then
+    python -m venv "${rootDir}/venv"
+    . "${rootDir}/venv/bin/activate"
+    pip install -r "${rootDir}/requirements.txt"
+  else
+    . "${rootDir}/venv/bin/activate"
+  fi
+fi
+
+pushd "${rootDir}" &> /dev/null
+gl-flavors-parse "$@"
+popd &> /dev/null
diff --git a/bin/glrd b/bin/glrd
new file mode 120000
index 00000000..46c15b26
--- /dev/null
+++ b/bin/glrd
@@ -0,0 +1 @@
+../gardenlinux/bin/glrd
\ No newline at end of file
diff --git a/bin/inject-sshkey b/bin/inject-sshkey
new file mode 120000
index 00000000..74ebd3b5
--- /dev/null
+++ b/bin/inject-sshkey
@@ -0,0 +1 @@
+../gardenlinux/bin/inject-sshkey
\ No newline at end of file
diff --git a/bin/make-ali-ami b/bin/make-ali-ami
new file mode 120000
index 00000000..a735fba3
--- /dev/null
+++ b/bin/make-ali-ami
@@ -0,0 +1 @@
+../gardenlinux/bin/make-ali-ami
\ No newline at end of file
diff --git a/bin/make-gcp-ami b/bin/make-gcp-ami
new file mode 120000
index 00000000..bf489c11
--- /dev/null
+++ b/bin/make-gcp-ami
@@ -0,0 +1 @@
+../gardenlinux/bin/make-gcp-ami
\ No newline at end of file
diff --git a/bin/make-vhd b/bin/make-vhd
new file mode 120000
index 00000000..a05fe7f9
--- /dev/null
+++ b/bin/make-vhd
@@ -0,0 +1 @@
+../gardenlinux/bin/make-vhd
\ No newline at end of file
diff --git a/bin/shrink.sh b/bin/shrink.sh
new file mode 120000
index 00000000..d1c50c03
--- /dev/null
+++ b/bin/shrink.sh
@@ -0,0 +1 @@
+../gardenlinux/bin/shrink.sh
\ No newline at end of file
diff --git a/bin/start-vm b/bin/start-vm
new file mode 120000
index 00000000..f46bdc2f
--- /dev/null
+++ b/bin/start-vm
@@ -0,0 +1 @@
+../gardenlinux/bin/start-vm
\ No newline at end of file
diff --git a/bin/upload-openstack b/bin/upload-openstack
new file mode 120000
index 00000000..8a716e5d
--- /dev/null
+++ b/bin/upload-openstack
@@ -0,0 +1 @@
+../gardenlinux/bin/upload-openstack
\ No newline at end of file
diff --git a/bin/urlescape b/bin/urlescape
new file mode 120000
index 00000000..50a7d006
--- /dev/null
+++ b/bin/urlescape
@@ -0,0 +1 @@
+../gardenlinux/bin/urlescape
\ No newline at end of file
diff --git a/bin/uuid_hash b/bin/uuid_hash
new file mode 120000
index 00000000..b20bd6c7
--- /dev/null
+++ b/bin/uuid_hash
@@ -0,0 +1 @@
+../gardenlinux/bin/uuid_hash
\ No newline at end of file
diff --git a/features/_kdump b/features/_kdump
new file mode 120000
index 00000000..a96ce3a4
--- /dev/null
+++ b/features/_kdump
@@ -0,0 +1 @@
+../gardenlinux/features/_kdump
\ No newline at end of file
diff --git a/gardenlinux b/gardenlinux
index c1a1f112..838bb469 160000
--- a/gardenlinux
+++ b/gardenlinux
@@ -1 +1 @@
-Subproject commit c1a1f112762be72b7f154ec931dfe4c57b4d2d44
+Subproject commit 838bb469f9b05d98a5057e139078d791d1922348
diff --git a/tests-ng b/tests-ng
new file mode 120000
index 00000000..7faa99ab
--- /dev/null
+++ b/tests-ng
@@ -0,0 +1 @@
+gardenlinux/tests-ng
\ No newline at end of file