feat: use reproducibly built Python packages

Update pkgs (and tools) and use reproducible Python tools instead of downloading them from PyPI. Signed-off-by: Dmitrii Sharshakov <[email protected]>
siderolabs · Feb 20, 2025 · 8732ec1 · 8732ec1
1 parent c6b6c61
commit 8732ec1
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 37 deletions.
diff --git a/.kres.yaml b/.kres.yaml
@@ -67,7 +67,7 @@ spec:
       - name: EXTENSIONS_IMAGE_REF
         defaultValue: $(REGISTRY_AND_USERNAME)/extensions:$(TAG)
       - name: PKGS
-        defaultValue: v1.10.0-alpha.0-37-g359807b
+        defaultValue: v1.10.0-alpha.0-40-ge1f11f0
       - name: PKGS_PREFIX
         defaultValue: ghcr.io/siderolabs
   useBldrPkgTagResolver: true

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
 #
-# Generated on 2025-02-14T14:44:17Z by kres 8a48729.
+# Generated on 2025-02-20T20:33:13Z by kres 8a48729.
 
 # common variables
 
@@ -48,7 +48,7 @@ COMMON_ARGS += --build-arg=PKGS_PREFIX="$(PKGS_PREFIX)"
 # extra variables
 
 EXTENSIONS_IMAGE_REF ?= $(REGISTRY_AND_USERNAME)/extensions:$(TAG)
-PKGS ?= v1.10.0-alpha.0-37-g359807b
+PKGS ?= v1.10.0-alpha.0-40-ge1f11f0
 PKGS_PREFIX ?= ghcr.io/siderolabs
 
 # targets defines all the available targets

diff --git a/Pkgfile b/Pkgfile
@@ -1,4 +1,4 @@
-# syntax = ghcr.io/siderolabs/bldr:v0.4.0-1-g76a2c8f
+# syntax = ghcr.io/siderolabs/bldr:v0.4.1
 
 format: v1alpha2
 

diff --git a/guest-agents/qemu-guest-agent/glib/pkg.yaml b/guest-agents/qemu-guest-agent/glib/pkg.yaml
@@ -11,15 +11,10 @@ steps:
         destination: glib.tar.xz
         sha256: 8428d672c8485636d940f03ce8dcdc174f9b3892ac8b2eea76dd281af6a6e937
         sha512: 1686ef719122d2b3e8bcc569ba1e125cde51fbe645811e1eb7ddd49e300ff834eed712bb619bba13629f23ad5f801fdc2d37e3103b5150ad3cb7ff9d1168d902
-  - network: default
     prepare:
       - |
         tar -xf glib.tar.xz --strip-components=1
         rm glib.tar.xz
-      - |
-        mkdir -p /usr/bin
-        pip3 install ninja packaging
-  - network: none
     build:
       - |
         export PKG_CONFIG_PATH=/usr/lib/pkgconfig

diff --git a/guest-agents/qemu-guest-agent/pkg.yaml b/guest-agents/qemu-guest-agent/pkg.yaml
@@ -12,18 +12,13 @@ steps:
         destination: qemu.tar.xz
         sha256: f859f0bc65e1f533d040bbe8c92bcfecee5af2c921a6687c652fb44d089bd894
         sha512: f92548623e4e31400c823a2d78417a8a4ecfccb07f3ee4883e2f2ad33054539d2a37d076dbc64df42c6c86c08fa7c2c975cd6e823aa14d5f20cef83348006813
-  - network: default
     prepare:
       - |
         sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml
       - |
         tar -xf qemu.tar.xz --strip-components=1
         rm qemu.tar.xz
       - |
-        mkdir -p /usr/bin
-
-        pip3 install ninja
-
         extra_args=( )
 
         if [[ "${ARCH}" == aarch64 ]]; then
@@ -45,7 +40,6 @@ steps:
           --enable-guest-agent \
           --enable-stack-protector \
           "${extra_args[@]}"
-  - network: none
     build:
       - |
         make -j $(nproc) qemu-ga

diff --git a/storage/fuse3/pkg.yaml b/storage/fuse3/pkg.yaml
@@ -10,30 +10,24 @@ steps:
         destination: fuse.tar.gz
         sha256: f797055d9296b275e981f5f62d4e32e089614fc253d1ef2985851025b8a0ce87
         sha512: 3e8889863cd67dada67271f095f694dc9e5aaf2561fd1e2285aee95b5a54e692bb195ab8fce57fc2bdf08d0ea17b6d56ca4967b4e4371d639d6133907b2370d3
-  - network: default
     prepare:
       - |
         sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml
       - |
         tar -xzf fuse.tar.gz --strip-components=1
 
-        mkdir -p /usr/bin
-        pip3 install ninja
-
         mkdir -p /rootfs/usr/local/etc
         mkdir -p /rootfs/usr/local/bin
         mkdir -p /rootfs/etc/init.d
 
         mkdir _build
         meson setup _build
         meson configure -D useroot=false -D initscriptdir='' _build
-  - network: none
     build:
       - |
         ninja -C _build
     install:
       - |
-
         DESTDIR=/rootfs ninja -C _build install
     test:
       - |

diff --git a/storage/iscsi-tools/open-iscsi/pkg.yaml b/storage/iscsi-tools/open-iscsi/pkg.yaml
@@ -14,7 +14,6 @@ steps:
         sha512: 18b92d3e9a85d8de66734d95e9ca74a8acc5167a98830134c18ad5e226b29a00d358f952edfab67b643c454ec63c0a382c7ab7e7e76970f7574b46cea0d5c82d
     env:
       SOURCE_DATE_EPOCH: {{ .BUILD_ARG_SOURCE_DATE_EPOCH }}
-  - network: default
     prepare:
       - |
         tar -xzf open-iscsi.tar.gz --strip-components=1
@@ -24,9 +23,6 @@ steps:
         patch -p1 < /pkg/patches/add-missing-headers.patch
         patch -p1 < /pkg/patches/dont-use-lib64.patch
         patch -p1 < /pkg/patches/remove-werror.patch
-
-        pip3 install ninja
-  - network: none
     build:
       - |
         export PKG_CONFIG_PATH=/usr/lib/pkgconfig

diff --git a/tools/nvme-cli/libnvme/pkg.yaml b/tools/nvme-cli/libnvme/pkg.yaml
@@ -11,22 +11,17 @@ steps:
         destination: libnvme.tar.gz
         sha256: 6d5d8ba2cc4c94a61a994c9f7f25b3b26ef973fb5c0daa37729890903f37a1f1
         sha512: 8720f2907a3d13af44fb3deec883cd6eb247d5861c4459b5fe0e67ff9ecfb565462a5faf39d43e08b5284f3e8ca8e72d41b333984beaa45d3287b1a258f3e59d
-  - network: default
     prepare:
       - |
         tar xf libnvme.tar.gz --strip-components=1
 
-        mkdir -p /usr/bin
-        pip3 install ninja
-
         export PKG_CONFIG_PATH=/usr/lib/pkgconfig
 
         meson setup \
           -Db_lto=true \
           -Djson-c=enabled \
           -Dpython=disabled \
           .build
-  - network: none
     build:
       - |
         meson compile -C .build

diff --git a/tools/nvme-cli/pkg.yaml b/tools/nvme-cli/pkg.yaml
@@ -16,18 +16,12 @@ steps:
         destination: nvme-cli.tar.gz
         sha256: 5e4dc73dbb488c6b1e6ad1c78d0c62b624076fcb0c052bd9039674a1dbd6517b
         sha512: 33de20ad990a3b87fef46fa486832edde41907223aa6b8a47606e605b360745fd7e2054226bf93a59b2a09c6bc04d0b684e4b3bb27c3fc0e6110c64a558cadc0
-  - network: default
     prepare:
       - |
         tar xf nvme-cli.tar.gz --strip-components=1
 
         export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/local/lib/pkgconfig
 
-        mkdir -p /usr/bin
-        pip3 install ninja
-
-        export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/local/lib/pkgconfig
-
         patch -p1 < /pkg/patches/locale.patch
         patch -p1 < /pkg/patches/basename.patch
 
@@ -38,7 +32,6 @@ steps:
           .build
       - |
         sed -i 's#$VERSION#{{ .NVME_CLI_VERSION }}#' /pkg/manifest.yaml
-  - network: none
     build:
       - |
         meson compile -C .build