chore: bump dependencies

Pkgs bump + open-iscsi 2.1.9. Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com>
siderolabs · Jul 4, 2023 · 048de33 · 048de33
1 parent b98fed7
commit 048de33
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@ endif
 
 # keep in sync with Pkgfile
 BLDR_RELEASE ?= v0.2.0
-PKGS ?= v1.5.0-alpha.0-28-gedd725a
+PKGS ?= v1.5.0-alpha.0-31-g43451e6
 
 BUILD := docker buildx build
 PLATFORM ?= linux/amd64,linux/arm64

diff --git a/Pkgfile b/Pkgfile
@@ -4,7 +4,7 @@ format: v1alpha2
 
 vars:
   PKGS_PREFIX: ghcr.io/siderolabs
-  LINUX_FIRMWARE_VERSION: "20230515" # update this when updating PKGS_VERSION in Makefile
+  LINUX_FIRMWARE_VERSION: "20230625" # update this when updating PKGS_VERSION in Makefile
   DRBD_DRIVER_VERSION: 9.2.4 # update this when updating PKGS_VERSION in Makefile
 
 labels:

diff --git a/hack/release.toml b/hack/release.toml
@@ -30,9 +30,10 @@ Tailscale is now supported as Talos System Extension. Requires Talos v1.5.0 or l
     [notes.updates]
         title = "Component Updates"
         description = """\
-* Linux firmware: 20230515
+* Linux firmware: 20230625
 * DRBD: 9.2.4
 * Intel ucode: 20230613
+* Open iSCSI: 2.1.9
 """
 
 

diff --git a/storage/iscsi-tools/open-iscsi/pkg.yaml b/storage/iscsi-tools/open-iscsi/pkg.yaml
@@ -12,8 +12,8 @@ steps:
   - sources:
       - url: https://github.com/open-iscsi/open-iscsi/archive/refs/tags/{{ .OPEN_ISCSI_VERSION }}.tar.gz
         destination: open-iscsi.tar.gz
-        sha256: 9565bdf6b68b223e1e0d455d9a04d7536724a3f5b5a254e9398d06b2a0c6b6d2
-        sha512: 168ce68dc495cc8b2f217ad0373851d681f9274036b8ec562ece513de493adfdbba55f2038518f246f5244f6405102b2e096a9cce15e73fce9654f06790002c1
+        sha256: 60e2a1e3058a8af7f702e86a5a0511b05b8754d29d3d2df4e0e301399b5cf70a
+        sha512: 25c28da5918b775ca54d3e55591eca0b4f7b5be33d803cad28fce1e9b2334b43cee1423a4e1819497b322e0f420dcd8d74226f442ca432233d1753565b11a5bb
     prepare:
       - |
         mkdir -p /usr/bin \
@@ -37,14 +37,15 @@ steps:
       - |
         export PKG_CONFIG_PATH=/usr/lib/pkgconfig
 
+        # musl doesn't have glob_onlydir but by spec it's also not guaranteed to return only dirs anyway
         LDFLAGS="$LDFLAGS -L/usr/local/lib" \
         make \
           prefix=/usr/local \
           exec_prefix=/usr/local \
           localstatedir=/var \
           sysconfdir=/usr/local/etc \
           mandir=/usr/local/share/man \
-          OPTFLAGS="$CFLAGS -I/usr/local/include -DNO_SYSTEMD"
+          OPTFLAGS="$CFLAGS -I/usr/local/include -DNO_SYSTEMD -DGLOB_ONLYDIR=0"
     install:
       - |
         mkdir -p /usr/local/etc

diff --git a/storage/iscsi-tools/vars.yaml b/storage/iscsi-tools/vars.yaml
@@ -1,5 +1,5 @@
 VERSION: v0.1.4
 # renovate: datasource=github-tags depName=open-iscsi/open-iscsi
-OPEN_ISCSI_VERSION: 2.1.8
+OPEN_ISCSI_VERSION: 2.1.9
 # renovate: datasource=github-tags extractVersion=^v(?<version>.*)$ depName=open-iscsi/open-isns
 OPEN_ISNS_VERSION: 0.102