Skip to content

Commit

Permalink
pull in updates from systemd v254
Browse files Browse the repository at this point in the history
  • Loading branch information
charleseidsness committed Oct 30, 2023
2 parents 641dadb + 994c797 commit f3c8ed3
Show file tree
Hide file tree
Showing 2,742 changed files with 362,648 additions and 265,292 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ indent_style = space
indent_size = 8
max_line_length = 109

[*.sh]
[*.sh,mkosi.build,mkosi.prepare,mkosi.postinst]
indent_style = space
indent_size = 4

Expand Down
11 changes: 6 additions & 5 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@ body:
Do not submit bug reports about anything but the two most recently released *major* systemd versions upstream!
If there have been multiple stable releases for that major version, please consider updating to a recent one before reporting an issue.
When using a distro package, please make sure that the version reported is meaningful for upstream.
If a distro build is used, please just paste the package version, e.g. `systemd-250.7-1.fc36.x86_64`.
If a distro build is used, please just paste the package version, e.g. `systemd-253-6.fc38.x86_64`.
See https://github.com/systemd/systemd-stable/tags for the list of most recent releases.
For older version please use distribution trackers (see https://systemd.io/CONTRIBUTING#filing-issues).
placeholder: '251'
placeholder: '253'
validations:
required: true

- type: input
id: distro
attributes:
label: Used distribution
description: Used distribution and it's version
placeholder: Fedora 36
description: Used distribution and its version
placeholder: Fedora 38
validations:
required: false

Expand All @@ -37,7 +37,7 @@ body:
label: Linux kernel version used
description: |
Please use `uname -r` to get linux kernel version.
placeholder: 5.17.12-300.fc36.ppc64le
placeholder: kernel-6.2.5-300.fc38.x86_64
validations:
required: false

Expand Down Expand Up @@ -102,6 +102,7 @@ body:
- 'systemd-coredump'
- 'systemd-cryptsetup'
- 'systemd-delta'
- 'systemd-dissect'
- 'systemd-env-generator'
- 'systemd-fsck'
- 'systemd-gpt-auto-generator'
Expand Down
3 changes: 2 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ body:
- 'systemd-coredump'
- 'systemd-cryptsetup'
- 'systemd-delta'
- 'systemd-dissect'
- 'systemd-env-generator'
- 'systemd-fsck'
- 'systemd-gpt-auto-generator'
Expand Down Expand Up @@ -119,6 +120,6 @@ body:
attributes:
label: The systemd version you checked that didn't have the feature you are asking for
description: If this is not the most recently released upstream version, then please check first if it has that feature already.
placeholder: '251'
placeholder: '253'
validations:
required: false
3 changes: 3 additions & 0 deletions .github/advanced-issue-labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ policy:
- name: delta
keys: ['systemd-delta']

- name: dissect
keys: ['systemd-dissect']

- name: env
keys: ['systemd-env-generator']

Expand Down
12 changes: 12 additions & 0 deletions .github/development-freeze.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# syntax - https://github.com/redhat-plumbers-in-action/devel-freezer#policy
---

policy:
# tags like v253-rc1, v253-rc2, etc.
- tags: ['^\S*-rc\d+$']
feedback:
frozen-state: |
An -rc1 tag has been created and a release is being prepared, so please note that PRs introducing new features and APIs will be held back until the new version has been released.
unfreeze-state: |
We had successfully released a new major release. We are no longer in a development freeze phase.
We will try our best to get back to your PR as soon as possible. Thank you for your patience.
147 changes: 121 additions & 26 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,135 @@
# SPDX-License-Identifier: LGPL-2.1-or-later

hwdb:
- hwdb.d/**/*
units:
- units/**/*
documentation:
- NEWS
- docs/*
network:
- src/libsystemd-network/**/*
- src/network/**/*
udev:
- src/udev/**/*
- src/libudev/*
selinux:
- '**/*selinux*'
apparmor:
- '**/*apparmor*'
meson:
- meson_option.txt
mkosi:
- .mkosi/*
- mkosi.build
binfmt:
- '**/*binfmt*'
btrfs:
- '**/*btrfs*'
busctl:
- src/busctl/*
systemctl:
- src/systemctl/*
- '**/*busctl*'
cgls:
- '**/*cgls*'
cgtop:
- '**/*cgtop*'
ci:
- '.github/*'
coccinelle:
- coccinelle/*
coredump:
- '**/*coredump*'
documentation:
- NEWS
- README*
- docs/*
- man/*
env-generator:
- '**/*environment*generator*'
debug-generator:
- '**/debug-generator*'
fstab-generator:
- '**/*fstab-generator*'
growfs:
- '**/*growfs*'
hwdb:
- hwdb.d/**/*
journal:
- src/journal/*
- src/libsystemd/sd-journal/*
journal-remote:
- src/journal-remote/*
meson:
- meson_options.txt
- '**/meson.build'
mkosi:
- .mkosi/*
- mkosi.build
network:
- src/libsystemd-network/**/*
- src/network/**/*
portable:
- src/portable/**/*
rc-local-generator:
- src/rc-local-generator/*
repart:
- '**/*repart*'
resolve:
- src/resolve/*
- '**/*resolve*'
rfkill:
- '**/*rfkill*'
rpm:
- src/rpm/*
run:
- src/run/*
- man/systemd-run*
sd-boot/sd-stub/bootctl:
- src/boot/**/*
- man/bootctl*
- man/systemd-boot.xml
sd-bus:
- '**/sd-bus*/**'
sd-daemon:
- '**/sd-daemon*/**'
sd-device:
- '**/sd-device*/**'
sd-event:
- '**/sd-event*/**'
sd-hwdb:
- '**/sd-hwdb*/**'
sd-id128:
- '**/sd-id128*/**'
sd-netlink:
- '**/sd-netlink*/**'
sd-path:
- '**/sd-path*/**'
sd-resolve:
- '**/sd-resolve*/**'
selinux:
- '**/*selinux*'
sleep:
- '**/*sleep*'
smack:
- '**/*smack*'
socket-proxy:
- '**/*socket-proxy*'
sysv-generator:
- '**/*sysv-generator*'
systemctl:
- '**/systemctl*'
sysupdate:
- '**/*sysupdate*'
sysvcompat:
- '**/*sysv*'
sysctl:
- '**/*sysctl*'
timedate:
- src/timedate/*
- '**/*timedate*'
timesync:
- src/timesync/*
- '**/*timesync*'
tests:
- src/test/**/*
- src/fuzz/**/*
- test/**/*
- '**/test-*'
- .github/workflows/*
tpm2:
- '**/*tpm2*'
- '**/*tpm-*'
udev:
- src/udev/**/*
- src/libudev/*
- man/*udev*
uki:
- '**/ukify*'
units:
- units/**/*
userdb:
- '**/*userdb*'
util-lib:
- src/fundamental/**/*
- src/basic/**/*
- src/shared/**/*
vconsole:
- '**/*vconsole*'
xdg-autostart:
- '**/**xdg-autostart-generator*'
5 changes: 0 additions & 5 deletions .github/pull_request_template.md.disabled

This file was deleted.

27 changes: 12 additions & 15 deletions .github/workflows/build_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ success() { echo >&2 -e "\033[32;1m$1\033[0m"; }

ARGS=(
"--optimization=0"
"--optimization=s -Dgnu-efi=true -Defi-cflags=-m32 -Defi-libdir=/usr/lib32"
"--optimization=s"
"--optimization=3 -Db_lto=true -Ddns-over-tls=false"
"--optimization=3 -Db_lto=false"
"--optimization=3 -Db_lto=false -Dtpm2=false -Dlibfido2=false -Dp11kit=false"
"--optimization=3 -Ddns-over-tls=openssl"
"--optimization=3 -Dfexecve=true -Dstandalone-binaries=true -Dstatic-libsystemd=true -Dstatic-libudev=true"
"-Db_ndebug=true"
Expand All @@ -27,7 +27,6 @@ PACKAGES=(
kbd
libblkid-dev
libbpf-dev
libc6-dev-i386
libcap-dev
libcurl4-gnutls-dev
libfdisk-dev
Expand All @@ -42,17 +41,19 @@ PACKAGES=(
libqrencode-dev
libssl-dev
libtss2-dev
libxen-dev
libxkbcommon-dev
libxtables-dev
libzstd-dev
mold
mount
net-tools
perl
python3-evdev
python3-jinja2
python3-lxml
python3-pefile
python3-pip
python3-pyelftools
python3-pyparsing
python3-setuptools
quota
Expand Down Expand Up @@ -86,7 +87,7 @@ if [[ "$COMPILER" == clang ]]; then
"$RELEASE" "$RELEASE" "$COMPILER_VERSION" >/etc/apt/sources.list.d/llvm-toolchain.list
fi

PACKAGES+=("clang-$COMPILER_VERSION" "lldb-$COMPILER_VERSION" "lld-$COMPILER_VERSION" "clangd-$COMPILER_VERSION")
PACKAGES+=("clang-$COMPILER_VERSION" "lldb-$COMPILER_VERSION" "python3-lldb-$COMPILER_VERSION" "lld-$COMPILER_VERSION" "clangd-$COMPILER_VERSION")
elif [[ "$COMPILER" == gcc ]]; then
CC="gcc-$COMPILER_VERSION"
CXX="g++-$COMPILER_VERSION"
Expand Down Expand Up @@ -122,11 +123,6 @@ ninja --version
for args in "${ARGS[@]}"; do
SECONDS=0

# The install_tag feature introduced in 0.60 causes meson to fail with fatal-meson-warnings
# "Project targeting '>= 0.53.2' but tried to use feature introduced in '0.60.0': install_tag arg in custom_target"
# It can be safely removed from the CI since it isn't actually used anywhere to test anything.
find . -type f -name meson.build -exec sed -i '/install_tag/d' '{}' '+'

# mold < 1.1 does not support LTO.
if dpkg --compare-versions "$(dpkg-query --showformat='${Version}' --show mold)" ge 1.1; then
fatal "Newer mold version detected, please remove this workaround."
Expand All @@ -141,7 +137,8 @@ for args in "${ARGS[@]}"; do
if ! AR="$AR" \
CC="$CC" CC_LD="$LD" CFLAGS="-Werror" \
CXX="$CXX" CXX_LD="$LD" CXXFLAGS="-Werror" \
meson -Dtests=unsafe -Dslow-tests=true -Dfuzz-tests=true --werror \
meson setup \
-Dtests=unsafe -Dslow-tests=true -Dfuzz-tests=true --werror \
-Dnobody-group=nogroup -Dcryptolib="${CRYPTOLIB:?}" \
$args build; then

Expand All @@ -150,16 +147,16 @@ for args in "${ARGS[@]}"; do
fi

if ! meson compile -C build -v; then
fatal "'meson compile' failed with $args"
fatal "'meson compile' failed with '$args'"
fi

for loader in build/src/boot/efi/*.efi; do
if sbverify --list "$loader" |& grep -q "gap in section table"; then
for loader in build/src/boot/efi/*{.efi,.efi.stub}; do
if [[ "$(sbverify --list "$loader" 2>&1)" != "No signature table present" ]]; then
fatal "$loader: Gaps found in section table"
fi
done

git clean -dxf

success "Build with $args passed in $SECONDS seconds"
success "Build with '$args' passed in $SECONDS seconds"
done
10 changes: 5 additions & 5 deletions .github/workflows/build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ jobs:
matrix:
env:
- { COMPILER: "gcc", COMPILER_VERSION: "11", LINKER: "bfd", CRYPTOLIB: "gcrypt" }
- { COMPILER: "gcc", COMPILER_VERSION: "12", LINKER: "gold", CRYPTOLIB: "openssl" }
- { COMPILER: "clang", COMPILER_VERSION: "13", LINKER: "mold", CRYPTOLIB: "gcrypt" }
- { COMPILER: "clang", COMPILER_VERSION: "14", LINKER: "lld", CRYPTOLIB: "openssl" }
- { COMPILER: "clang", COMPILER_VERSION: "15", LINKER: "bfd", CRYPTOLIB: "auto" }
- { COMPILER: "gcc", COMPILER_VERSION: "13", LINKER: "gold", CRYPTOLIB: "openssl" }
- { COMPILER: "clang", COMPILER_VERSION: "14", LINKER: "mold", CRYPTOLIB: "gcrypt" }
- { COMPILER: "clang", COMPILER_VERSION: "15", LINKER: "lld", CRYPTOLIB: "openssl" }
- { COMPILER: "clang", COMPILER_VERSION: "16", LINKER: "bfd", CRYPTOLIB: "auto" }
env: ${{ matrix.env }}
steps:
- name: Repository checkout
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
- name: ${{ format('Build check ({0}-{1}-{2}-{3})', env.COMPILER, env.COMPILER_VERSION, env.LINKER, env.CRYPTOLIB) }}
run: sudo -E .github/workflows/build_test.sh
Loading

0 comments on commit f3c8ed3

Please sign in to comment.