Skip to content

deps: update to Fedora 42 #3929

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

deps: update to Fedora 42 #3929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5208b78
[wip] chore: update to Fedora 42
msanft Aug 25, 2025
350233c
image: update shasums
msanft Aug 25, 2025
77fe1ea
image: fix build
msanft Aug 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion debugd/filebeat/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fedora:40@sha256:3c86d25fef9d2001712bc3d9b091fc40cf04be4767e48f1aa3b785bf58d300ed AS release
FROM fedora:42@sha256:3da64cb89971a1cdbc6046e307eeebcb54f7281c0a606ee48d9995473f6b88d5 AS release

RUN dnf install -y https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-8.6.2-x86_64.rpm

Expand Down
4 changes: 2 additions & 2 deletions debugd/logstash/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM fedora:40@sha256:3c86d25fef9d2001712bc3d9b091fc40cf04be4767e48f1aa3b785bf58d300ed AS build
FROM fedora:42@sha256:3da64cb89971a1cdbc6046e307eeebcb54f7281c0a606ee48d9995473f6b88d5 AS build

ARG LOGSTASH_VER=8.6.1

RUN curl -fsSLO https://artifacts.opensearch.org/logstash/logstash-oss-with-opensearch-output-plugin-$LOGSTASH_VER-linux-x64.tar.gz
RUN tar -zxvf logstash-oss-with-opensearch-output-plugin-$LOGSTASH_VER-linux-x64.tar.gz

FROM fedora:40@sha256:3c86d25fef9d2001712bc3d9b091fc40cf04be4767e48f1aa3b785bf58d300ed AS release
FROM fedora:42@sha256:3da64cb89971a1cdbc6046e307eeebcb54f7281c0a606ee48d9995473f6b88d5 AS release

COPY --from=build logstash-* /usr/share/logstash

Expand Down
2 changes: 1 addition & 1 deletion debugd/metricbeat/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fedora:40@sha256:3c86d25fef9d2001712bc3d9b091fc40cf04be4767e48f1aa3b785bf58d300ed AS release
FROM fedora:42@sha256:3da64cb89971a1cdbc6046e307eeebcb54f7281c0a606ee48d9995473f6b88d5 AS release

RUN dnf install -y https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-8.9.2-x86_64.rpm

Expand Down
3 changes: 2 additions & 1 deletion image/base/mkosi.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Distribution]
Distribution=fedora
Release=40
Release=42
RepositoryKeyFetch=yes

[Output]
Expand Down Expand Up @@ -63,6 +63,7 @@ Packages=passwd
vim
curl
wget
rpm

RemoveFiles=/var/log
RemoveFiles=/var/cache
Expand Down
2 changes: 1 addition & 1 deletion image/base/mkosi.finalize
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ set -euxo pipefail
# /etc/shadow-.
tmp=$(mktemp)
cp -a "${BUILDROOT}/etc/shadow-" "${tmp}"
mkosi-chroot chage -d "" etcd
mkosi-chroot chage -d "" etcd || true
cp -a "${tmp}" "${BUILDROOT}/etc/shadow-"
6 changes: 3 additions & 3 deletions image/base/mkosi.postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@ mkosi-chroot rpm -qa --qf '%{name};%{version};%{license}\n' --dbpath "/var/lib/r
cp "${BUILDROOT}/usr/share/constellation/packagemanifest" "${OUTPUTDIR}/"

# copy rpmdb to outputs
cp "${BUILDROOT}"/var/lib/rpm/{rpmdb.sqlite-wal,rpmdb.sqlite-shm,rpmdb.sqlite,.rpm.lock} "${OUTPUTDIR}/"
cp "${BUILDROOT}"/var/lib/rpm/{rpmdb.sqlite-wal,rpmdb.sqlite-shm,rpmdb.sqlite} "${OUTPUTDIR}/"

# FIXME(msanft):
# Hack to satisfy Bazel's [output expectations](./BUILD.bazel).
# 2 Bazel packages can't share the same output paths, as it seems, and the
# files being copied around here aren't large, so copying them around doesn't
# hurt.
cp "${OUTPUTDIR}/packagemanifest" "${OUTPUTDIR}/lts-packagemanifest"
cp "${OUTPUTDIR}/.rpm.lock" "${OUTPUTDIR}/lts-.rpm.lock"
touch "${OUTPUTDIR}/lts-.rpm.lock"
cp "${OUTPUTDIR}/rpmdb.sqlite" "${OUTPUTDIR}/lts-rpmdb.sqlite"
cp "${OUTPUTDIR}/rpmdb.sqlite-shm" "${OUTPUTDIR}/lts-rpmdb.sqlite-shm"
cp "${OUTPUTDIR}/rpmdb.sqlite-wal" "${OUTPUTDIR}/lts-rpmdb.sqlite-wal"
cp "${OUTPUTDIR}/packagemanifest" "${OUTPUTDIR}/mainline-packagemanifest"
cp "${OUTPUTDIR}/.rpm.lock" "${OUTPUTDIR}/mainline-.rpm.lock"
touch "${OUTPUTDIR}/mainline-.rpm.lock"
cp "${OUTPUTDIR}/rpmdb.sqlite" "${OUTPUTDIR}/mainline-rpmdb.sqlite"
cp "${OUTPUTDIR}/rpmdb.sqlite-shm" "${OUTPUTDIR}/mainline-rpmdb.sqlite-shm"
cp "${OUTPUTDIR}/rpmdb.sqlite-wal" "${OUTPUTDIR}/mainline-rpmdb.sqlite-wal"
2 changes: 1 addition & 1 deletion image/initrd/mkosi.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Distribution]
Distribution=fedora
Release=40
Release=42
RepositoryKeyFetch=yes

[Output]
Expand Down
716 changes: 357 additions & 359 deletions image/mirror/SHA256SUMS
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions image/mirror/packages.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@ cryptsetup
curl
dbus
device-mapper
dracut
e2fsprogs
ec2-utils
efitools
ethtool
file
fuse-libs
google-compute-engine-guest-configs-udev
grub2
gzip
iproute
iproute-tc
Expand All @@ -23,6 +27,7 @@ openssh-server
passt-selinux
passwd
podman
rpm
sbsigntools
selinux-policy
selinux-policy-targeted
Expand Down
2 changes: 1 addition & 1 deletion image/mirror/update_packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ download() {
"${DNF5}" \
"--config=${DNF_CONF}" \
"--setopt=reposdir=${REPOSDIR}" \
"--releasever=40" \
"--releasever=42" \
download \
"--destdir=${OUTDIR}" \
--resolve --alldeps \
Expand Down
2 changes: 1 addition & 1 deletion image/system/mkosi.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Distribution]
Distribution=fedora
Release=40
Release=42
RepositoryKeyFetch=yes

[Output]
Expand Down
Loading