Skip to content

Commit 1be1647

Browse files
NikolaMilosaNikolaMilosa
authored
fix: add missing systemd deps (#1852)
1 parent 6c991aa commit 1be1647

File tree

5 files changed

+152
-16
lines changed

5 files changed

+152
-16
lines changed

‎MODULE.bazel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ http_file(
138138

139139
http_file(
140140
name = "target_determinator",
141-
sha256 = "6eaa8921e6c614c309536af3dc7ca23f52e5ced30b9032e6443bbe0d41a8ae33",
142-
url = "https://github.com/bazel-contrib/target-determinator/releases/download/v0.30.3/target-determinator.linux.amd64",
141+
sha256 = "792ed4c6f53aad60e8255686c272f28d3c039eaaef03518dbbde33519713802a",
142+
url = "https://github.com/bazel-contrib/target-determinator/releases/download/v0.32.0/target-determinator.linux.amd64",
143143
executable = True
144144
)
145145

‎images/BUILD.bazel‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
load("@rules_oci//oci:defs.bzl", "oci_image")
2020
load("@aspect_bazel_lib//lib:tar.bzl", "tar")
21-
load("@rules_distroless//distroless:defs.bzl", "group", "passwd", "cacerts", "home")
21+
load("@rules_distroless//distroless:defs.bzl", "group", "passwd", "cacerts", "home", "flatten")
2222

2323
package(default_visibility = ["//visibility:public"])
2424

@@ -118,6 +118,18 @@ tar(
118118
],
119119
)
120120

121+
flatten(
122+
name = "ubuntu_apk_flat",
123+
tars = [
124+
# Packages that are installed from apt
125+
# We need to flatten them because each file ends up
126+
# being a layer and it becomes impossible to
127+
# import the built image into docker.
128+
"@ubuntu_24_04_packages//:ubuntu_24_04_packages",
129+
],
130+
deduplicate = True,
131+
)
132+
121133
oci_image(
122134
name = "ubuntu_24_04",
123135
architecture = select({
@@ -135,9 +147,7 @@ oci_image(
135147
":home",
136148
":cacerts",
137149
":cacerts-symlink",
138-
# Packages listed in this manifest (see YAML files in this folder)
139-
# get installed in the container by this rule.
140-
"@ubuntu_24_04_packages//:ubuntu_24_04_packages",
141-
"clang-symlinks",
150+
":ubuntu_apk_flat",
151+
":clang-symlinks",
142152
],
143153
)

‎images/ubuntu_24_04_packages.lock.json‎

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3390,6 +3390,68 @@
33903390
],
33913391
"version": "3.4.6-1build1"
33923392
},
3393+
{
3394+
"arch": "amd64",
3395+
"dependencies": [
3396+
{
3397+
"key": "libsystemd0_255.4-1ubuntu8.10_amd64",
3398+
"name": "libsystemd0",
3399+
"version": "255.4-1ubuntu8.10"
3400+
},
3401+
{
3402+
"key": "libzstd1_1.5.5-p-dfsg2-2build1.1_amd64",
3403+
"name": "libzstd1",
3404+
"version": "1.5.5+dfsg2-2build1.1"
3405+
},
3406+
{
3407+
"key": "libc6_2.39-0ubuntu8.5_amd64",
3408+
"name": "libc6",
3409+
"version": "2.39-0ubuntu8.5"
3410+
},
3411+
{
3412+
"key": "libgcc-s1_14.2.0-4ubuntu2_24.04_amd64",
3413+
"name": "libgcc-s1",
3414+
"version": "14.2.0-4ubuntu2~24.04"
3415+
},
3416+
{
3417+
"key": "gcc-14-base_14.2.0-4ubuntu2_24.04_amd64",
3418+
"name": "gcc-14-base",
3419+
"version": "14.2.0-4ubuntu2~24.04"
3420+
},
3421+
{
3422+
"key": "liblzma5_5.6.1-p-really5.4.5-1ubuntu0.2_amd64",
3423+
"name": "liblzma5",
3424+
"version": "5.6.1+really5.4.5-1ubuntu0.2"
3425+
},
3426+
{
3427+
"key": "liblz4-1_1.9.4-1build1.1_amd64",
3428+
"name": "liblz4-1",
3429+
"version": "1.9.4-1build1.1"
3430+
},
3431+
{
3432+
"key": "libgcrypt20_1.10.3-2build1_amd64",
3433+
"name": "libgcrypt20",
3434+
"version": "1.10.3-2build1"
3435+
},
3436+
{
3437+
"key": "libgpg-error0_1.47-3build2.1_amd64",
3438+
"name": "libgpg-error0",
3439+
"version": "1.47-3build2.1"
3440+
},
3441+
{
3442+
"key": "libcap2_1-2.66-5ubuntu2.2_amd64",
3443+
"name": "libcap2",
3444+
"version": "1:2.66-5ubuntu2.2"
3445+
}
3446+
],
3447+
"key": "libsystemd-dev_255.4-1ubuntu8.10_amd64",
3448+
"name": "libsystemd-dev",
3449+
"sha256": "f19affec2fd8671f595b8078aad998845a233857500e058252f16f743facad39",
3450+
"urls": [
3451+
"https://snapshot.ubuntu.com/ubuntu/20250826T000000Z/pool/main/s/systemd/libsystemd-dev_255.4-1ubuntu8.10_amd64.deb"
3452+
],
3453+
"version": "255.4-1ubuntu8.10"
3454+
},
33933455
{
33943456
"arch": "arm64",
33953457
"dependencies": [],
@@ -6758,6 +6820,68 @@
67586820
"https://snapshot.ubuntu.com/ubuntu/20250826T000000Z/pool/main/libf/libffi/libffi-dev_3.4.6-1build1_arm64.deb"
67596821
],
67606822
"version": "3.4.6-1build1"
6823+
},
6824+
{
6825+
"arch": "arm64",
6826+
"dependencies": [
6827+
{
6828+
"key": "libsystemd0_255.4-1ubuntu8.10_arm64",
6829+
"name": "libsystemd0",
6830+
"version": "255.4-1ubuntu8.10"
6831+
},
6832+
{
6833+
"key": "libzstd1_1.5.5-p-dfsg2-2build1.1_arm64",
6834+
"name": "libzstd1",
6835+
"version": "1.5.5+dfsg2-2build1.1"
6836+
},
6837+
{
6838+
"key": "libc6_2.39-0ubuntu8.5_arm64",
6839+
"name": "libc6",
6840+
"version": "2.39-0ubuntu8.5"
6841+
},
6842+
{
6843+
"key": "libgcc-s1_14.2.0-4ubuntu2_24.04_arm64",
6844+
"name": "libgcc-s1",
6845+
"version": "14.2.0-4ubuntu2~24.04"
6846+
},
6847+
{
6848+
"key": "gcc-14-base_14.2.0-4ubuntu2_24.04_arm64",
6849+
"name": "gcc-14-base",
6850+
"version": "14.2.0-4ubuntu2~24.04"
6851+
},
6852+
{
6853+
"key": "liblzma5_5.6.1-p-really5.4.5-1ubuntu0.2_arm64",
6854+
"name": "liblzma5",
6855+
"version": "5.6.1+really5.4.5-1ubuntu0.2"
6856+
},
6857+
{
6858+
"key": "liblz4-1_1.9.4-1build1.1_arm64",
6859+
"name": "liblz4-1",
6860+
"version": "1.9.4-1build1.1"
6861+
},
6862+
{
6863+
"key": "libgcrypt20_1.10.3-2build1_arm64",
6864+
"name": "libgcrypt20",
6865+
"version": "1.10.3-2build1"
6866+
},
6867+
{
6868+
"key": "libgpg-error0_1.47-3build2.1_arm64",
6869+
"name": "libgpg-error0",
6870+
"version": "1.47-3build2.1"
6871+
},
6872+
{
6873+
"key": "libcap2_1-2.66-5ubuntu2.2_arm64",
6874+
"name": "libcap2",
6875+
"version": "1:2.66-5ubuntu2.2"
6876+
}
6877+
],
6878+
"key": "libsystemd-dev_255.4-1ubuntu8.10_arm64",
6879+
"name": "libsystemd-dev",
6880+
"sha256": "bebccd1494632a8f95101f85ddc11d46299d10e9891775784c479d1b97092eb2",
6881+
"urls": [
6882+
"https://snapshot.ubuntu.com/ubuntu/20250826T000000Z/pool/main/s/systemd/libsystemd-dev_255.4-1ubuntu8.10_arm64.deb"
6883+
],
6884+
"version": "255.4-1ubuntu8.10"
67616885
}
67626886
],
67636887
"version": 1

‎images/ubuntu_24_04_packages.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,4 @@ packages:
4545
- "build-essential" # commit annotator (Bazel / Bazelisk)
4646
- "clang-20" # partial IC build process run by target-determinator in commit annotator
4747
- "libffi-dev" # necessary to build the IC just like clang
48+
- "libsystemd-dev"

‎release-controller/commit_annotator.py‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,37 @@
33
import logging
44
import os
55
import pathlib
6+
import re
67
import shlex
78
import subprocess
89
import sys
9-
import re
1010
import threading
1111
import time
1212
import typing
13-
from prometheus_client import start_http_server, Gauge
14-
from tenacity import retry, stop_after_delay, retry_if_exception_type, after_log
13+
14+
from prometheus_client import Gauge, start_http_server
15+
from tenacity import after_log, retry, retry_if_exception_type, stop_after_delay
1516

1617
sys.path.append(os.path.join(os.path.dirname(__file__)))
1718

19+
from datetime import datetime
20+
1821
from commit_annotation import (
1922
CHANGED_NOTES_NAMESPACES,
2023
COMMIT_BELONGS,
2124
COMMIT_DOES_NOT_BELONG,
2225
CommitInclusionState,
2326
GitRepoAnnotator,
2427
)
25-
from git_repo import GitRepo
26-
from datetime import datetime
27-
from util import conventional_logging, resolve_binary, DefaultSubcommandArgParser
28-
from process_watchdog import Watchdog
29-
3028
from const import (
31-
OsKind,
3229
GUESTOS,
3330
HOSTOS,
3431
OS_KINDS,
32+
OsKind,
3533
)
34+
from git_repo import GitRepo
35+
from process_watchdog import Watchdog
36+
from util import DefaultSubcommandArgParser, conventional_logging, resolve_binary
3637

3738
BAZEL_TARGETS = {
3839
# All targets that produce the update image for GuestOS.

0 commit comments

Comments
 (0)