chore: bump deps

Bump deps Ref: - #574 - #575 Signed-off-by: Noel Georgi <[email protected]>
siderolabs · Sep 12, 2022 · 606ff32 · 606ff32
1 parent eee5c8a
commit 606ff32
Show file tree

Hide file tree

Showing 30 changed files with 627 additions and 747 deletions.
diff --git a/Makefile b/Makefile
@@ -11,7 +11,7 @@ SOURCE_DATE_EPOCH ?= "1559424892"
 
 # Sync bldr image with Pkgfile
 BLDR ?= docker run --rm --volume $(PWD):/tools --entrypoint=/bldr \
-	ghcr.io/siderolabs/bldr:v0.2.0-alpha.8-frontend graph --root=/tools
+	ghcr.io/siderolabs/bldr:v0.2.0-alpha.10 graph --root=/tools
 
 BUILD := docker buildx build
 PLATFORM ?= linux/amd64,linux/arm64

diff --git a/Pkgfile b/Pkgfile
diff --git a/cryptsetup/pkg.yaml b/cryptsetup/pkg.yaml
@@ -23,6 +23,8 @@ steps:
 
         ./configure \
           --prefix=/usr \
+          --disable-asciidoc \
+          --disable-ssh-token \
           --enable-static-cryptsetup || (cat config.log; exit 1)
     build:
       - |

diff --git a/eudev/pkg.yaml b/eudev/pkg.yaml
@@ -17,6 +17,9 @@ steps:
         # Required by gperf.
         cp /toolchain/lib/libstdc++* /lib
 
+        mkdir -p /usr/bin \
+            && ln -sf /toolchain/bin/env /usr/bin/env
+
         autoreconf -f -i -s
 
         cat > config.cache << "EOF"

diff --git a/ipmitool/patches/7ccea283dd62a05a320c1921e3d8d71a87772637.patch b/ipmitool/patches/7ccea283dd62a05a320c1921e3d8d71a87772637.patch
diff --git a/ipmitool/patches/gcc-10.patch b/ipmitool/patches/gcc-10.patch
diff --git a/ipmitool/patches/openssl-1.1.patch b/ipmitool/patches/openssl-1.1.patch
diff --git a/ipmitool/pkg.yaml b/ipmitool/pkg.yaml
@@ -6,17 +6,18 @@ dependencies:
   - stage: openssl
 steps:
   - sources:
-      - url: https://github.com/ipmitool/ipmitool/releases/download/IPMITOOL_{{ .ipmitool_version }}/ipmitool-{{ .ipmitool_version | replace "_" "." }}.tar.gz
+      - url: https://github.com/ipmitool/ipmitool/archive/refs/tags/IPMITOOL_{{ .ipmitool_version }}.tar.gz
         destination: ipmitool.tar.gz
-        sha256: e93fe5966d59e16bb4317c9c588cdf35d6100753a0ba957c493b064bcad52493
-        sha512: 970a3ea69a2a06bf4bb49b07ddea2d575d79afe163f742a53dd29331889d74411d412e7a2117f1964c416b147ad4dc4212dec1fc653521ce710ed1eb45a185a3
+        sha256: "{{ .ipmitool_sha256 }}"
+        sha512: "{{ .ipmitool_sha512 }}"
     prepare:
       - |
         tar -xzf ipmitool.tar.gz --strip-components=1
 
-        patch -p1 -i /pkg/patches/openssl-1.1.patch
-        patch -p1 -i /pkg/patches/7ccea283dd62a05a320c1921e3d8d71a87772637.patch
-        patch -p1 -i /pkg/patches/gcc-10.patch
+        mkdir -p /usr/bin \
+            && ln -sf /toolchain/bin/env /usr/bin/env
+
+        ./bootstrap
 
         mkdir build
         cd build