Skip to content

Commit f398a04

Browse files
committed
chore: update dependencies, hermetic build
- Build Python dependencies hermetically - Download Go dependencies in prepare stage to ensure hermeticity - Fix ca-certificates permissions (fixes kres network issue) - Don't build sd-boot here, as we build systemd in pkgs - Publish packages to not be rebuilt in pkgs - Update toolchain for newer Go - Update dependencies - rekres Fixes: #424 Ref: siderolabs/pkgs#1153 Signed-off-by: Dmitry Sharshakov <dmitry.sharshakov@siderolabs.com>
1 parent 9db33dd commit f398a04

File tree

42 files changed

+540
-243
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+540
-243
lines changed

.kres.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@ kind: pkgfile.Build
33
spec:
44
targets:
55
- tools
6+
- tools-ca-certificates
7+
- tools-kmod
8+
- tools-libcap
9+
- tools-libselinux
10+
- tools-libsepol
11+
- tools-openssl
12+
- tools-pcre2
13+
- tools-util-linux
614
reproducibleTargetName: tools
715
---
816
kind: common.Renovate

Makefile

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2025-01-15T13:57:46Z by kres 3b3f992.
3+
# Generated on 2025-02-13T13:00:26Z by kres 5e9dc91.
44

55
# common variables
66

@@ -25,7 +25,7 @@ SOURCE_DATE_EPOCH := $(shell git log $(INITIAL_COMMIT_SHA) --pretty=%ct)
2525

2626
# sync bldr image with pkgfile
2727

28-
BLDR_RELEASE := v0.4.0-1-g76a2c8f
28+
BLDR_RELEASE := v0.4.1
2929
BLDR_IMAGE := ghcr.io/siderolabs/bldr:$(BLDR_RELEASE)
3030
BLDR := docker run --rm --user $(shell id -u):$(shell id -g) --volume $(PWD):/src --entrypoint=/bldr $(BLDR_IMAGE) --root=/src
3131

@@ -45,6 +45,14 @@ COMMON_ARGS += --build-arg=SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH)
4545
# targets defines all the available targets
4646

4747
TARGETS = tools
48+
TARGETS += tools-ca-certificates
49+
TARGETS += tools-kmod
50+
TARGETS += tools-libcap
51+
TARGETS += tools-libselinux
52+
TARGETS += tools-libsepol
53+
TARGETS += tools-openssl
54+
TARGETS += tools-pcre2
55+
TARGETS += tools-util-linux
4856

4957
# help menu
5058

Pkgfile

Lines changed: 111 additions & 65 deletions
Large diffs are not rendered by default.

curl/pkg.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: curl
22
variant: scratch
33
dependencies:
44
- stage: base
5-
- stage: openssl
5+
- stage: tools-openssl
66
runtime: true
77
- stage: zlib
88
runtime: true

deps.png

363 KB
Loading

fakeroot/pkg.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies:
66
- stage: autoconf
77
- stage: automake
88
- stage: libtool
9-
- stage: libcap
9+
- stage: tools-libcap
1010
steps:
1111
- sources:
1212
- url: https://salsa.debian.org/clint/fakeroot/-/archive/upstream/{{ .fakeroot_version }}/fakeroot-upstream-{{ .fakeroot_version }}.tar.gz

git/pkg.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dependencies:
55
- stage: zlib
66
runtime: true
77
- stage: gettext
8-
- stage: openssl
8+
- stage: tools-openssl
99
- stage: curl
1010
runtime: true
1111
- stage: autoconf

meson/pkg.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,17 @@ dependencies:
44
- stage: base
55
- stage: libffi
66
- stage: python3
7-
- stage: openssl
7+
- stage: python-setuptools
8+
- stage: tools-openssl
89
- stage: zlib
910
steps:
1011
- sources:
1112
- url: https://github.com/mesonbuild/meson/releases/download/{{ .meson_version }}/meson-{{ .meson_version }}.tar.gz
1213
destination: meson.tar.gz
1314
sha256: "{{ .meson_sha256 }}"
1415
sha512: "{{ .meson_sha512 }}"
15-
- network: default
1616
prepare:
1717
- |
18-
pip3 install setuptools
19-
2018
tar -xzf meson.tar.gz --strip-components=1
2119
build:
2220
- |

ninja/pkg.yaml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: ninja
2+
variant: scratch
3+
dependencies:
4+
- stage: base
5+
- stage: cmake
6+
- stage: curl
7+
- stage: libuv
8+
- stage: xz
9+
- stage: expat
10+
- stage: rhash
11+
steps:
12+
- sources:
13+
- url: https://github.com/ninja-build/ninja/archive/refs/tags/{{ .ninja_version }}.tar.gz
14+
destination: ninja.tar.gz
15+
sha256: "{{ .ninja_sha256 }}"
16+
sha512: "{{ .ninja_sha512 }}"
17+
prepare:
18+
- |
19+
tar -xzf ninja.tar.gz --strip-components=1
20+
cmake -Bbuild -DBUILD_TESTING=OFF
21+
build:
22+
- |
23+
cmake --build build
24+
install:
25+
- |
26+
install -m755 -D build/ninja /rootfs/usr/bin/ninja
27+
finalize:
28+
- from: /rootfs
29+
to: /

pahole/pkg.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ dependencies:
2020
- stage: xz
2121
steps:
2222
- sources:
23-
- url: https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-{{.pahole_version }}.tar.gz
23+
- url: https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-{{ .pahole_version }}.tar.gz
2424
destination: pahole.tar.gz
25-
sha256: "{{.pahole_sha256 }}"
26-
sha512: "{{.pahole_sha512 }}"
25+
sha256: "{{ .pahole_sha256 }}"
26+
sha512: "{{ .pahole_sha512 }}"
2727
prepare:
2828
- |
2929
tar -xzf pahole.tar.gz --strip-components=1

0 commit comments

Comments
 (0)