1
0
mirror of https://github.com/systemd/systemd synced 2026-04-26 08:54:50 +02:00

Compare commits

..

No commits in common. "a34ecd1c37b1d93062b08cbb5b0091ca047b8b5e" and "8bc46fc00649e28a32a338b79656ab0f834e70d9" have entirely different histories.

5 changed files with 9 additions and 34 deletions

View File

@ -123,13 +123,9 @@ for args in "${ARGS[@]}"; do
# src/boot/efi/meson.build:52:16: ERROR: Fatal warnings enabled, aborting
# when LINKER is set to lld so let's just not turn meson warnings into errors with lld
# to make sure that the build systemd can pick up the correct efi-ld linker automatically.
# We use some features (like install_tag) that were introduced in 0.60, but that don't
# break running with older versions
# FIXME: re-enable once the minimum version is bumped to 0.60
#if [[ "$LINKER" != lld ]]; then
# additional_meson_args="--fatal-meson-warnings"
#fi
additional_meson_args=""
if [[ "$LINKER" != lld ]]; then
additional_meson_args="--fatal-meson-warnings"
fi
info "Checking build with $args"
# shellcheck disable=SC2086
if ! AR="$AR" \

View File

@ -60,11 +60,7 @@ for phase in "${PHASES[@]}"; do
# The docs build is slow and is not affected by compiler/flags, so do it just once
MESON_ARGS+=(-Dman=true)
fi
# We use some features (like install_tag) that were introduced in 0.60, but that don't
# break running with older versions
# FIXME: re-enable once the minimum version is bumped to 0.60
# MESON_ARGS+=(--fatal-meson-warnings)
run_meson -Dnobody-group=nogroup --werror -Dtests=unsafe -Dslow-tests=true -Dfuzz-tests=true "${MESON_ARGS[@]}" build
run_meson --fatal-meson-warnings -Dnobody-group=nogroup --werror -Dtests=unsafe -Dslow-tests=true -Dfuzz-tests=true "${MESON_ARGS[@]}" build
ninja -C build -v
meson test -C build --print-errorlogs
;;
@ -83,11 +79,7 @@ for phase in "${PHASES[@]}"; do
MESON_ARGS+=(-Dskip-deps=true)
fi
fi
# We use some features (like install_tag) that were introduced in 0.60, but that don't
# break running with older versions
# FIXME: re-enable once the minimum version is bumped to 0.60
# MESON_ARGS+=(--fatal-meson-warnings)
run_meson -Dnobody-group=nogroup --werror -Dtests=unsafe -Db_sanitize=address,undefined "${MESON_ARGS[@]}" build
run_meson --fatal-meson-warnings -Dnobody-group=nogroup --werror -Dtests=unsafe -Db_sanitize=address,undefined "${MESON_ARGS[@]}" build
ninja -C build -v
export ASAN_OPTIONS=strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1

View File

@ -724,11 +724,6 @@ evdev:atkbd:dmi:bvn*:bvr*:svnHP*:pnHP*ProBook*455*G5*:*
KEYBOARD_KEY_85=unknown # lid close; also reported via special evdev
KEYBOARD_KEY_f8=wlan # Wireless HW switch button
# HP ProBook 11G2
evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHP*:pnHPProBook11G2*:pvr*
KEYBOARD_KEY_d8=!f23 # Fn+F2: touchpad off
KEYBOARD_KEY_d9=!f22 # Fn+F2: touchpad on
# HP mt44 Mobile Thin Client
evdev:atkbd:dmi:bvn*:bvr*:svnHP*:pnHP*mt44*Mobile*Thin*Client*:*
KEYBOARD_KEY_64=calendar # Calendar icon (Fn + F12)

View File

@ -1906,7 +1906,6 @@ libsystemd = shared_library(
librt],
link_depends : libsystemd_sym,
install : true,
install_tag: 'libsystemd',
install_dir : rootlibdir)
install_libsystemd_static = static_library(
@ -1920,7 +1919,6 @@ install_libsystemd_static = static_library(
include_directories : libsystemd_includes,
build_by_default : static_libsystemd != 'false',
install : static_libsystemd != 'false',
install_tag: 'libsystemd',
install_dir : rootlibdir,
pic : static_libsystemd_pic,
dependencies : [threads,
@ -1948,7 +1946,6 @@ libudev = shared_library(
dependencies : [threads],
link_depends : libudev_sym,
install : true,
install_tag: 'libudev',
install_dir : rootlibdir)
install_libudev_static = static_library(
@ -1962,7 +1959,6 @@ install_libudev_static = static_library(
include_directories : includes,
build_by_default : static_libudev != 'false',
install : static_libudev != 'false',
install_tag: 'libudev',
install_dir : rootlibdir,
link_depends : libudev_sym,
dependencies : libshared_deps + [libmount],

View File

@ -410,8 +410,8 @@ foreach file : fundamental_source_paths + common_sources + systemd_boot_sources
endif
endforeach
foreach tuple : [['systemd-boot@0@.@1@', systemd_boot_objects, false, 'systemd-boot'],
['linux@0@.@1@.stub', stub_objects, true, 'systemd-stub']]
foreach tuple : [['systemd-boot@0@.@1@', systemd_boot_objects, false],
['linux@0@.@1@.stub', stub_objects, true]]
elf = custom_target(
tuple[0].format(efi_arch[0], 'elf'),
input : tuple[1],
@ -425,10 +425,9 @@ foreach tuple : [['systemd-boot@0@.@1@', systemd_boot_objects, false, 'systemd-b
'-lgnuefi',
'-lgcc'],
install : tuple[2],
install_tag: tuple[3],
install_dir : bootlibdir)
efi = custom_target(
custom_target(
tuple[0].format(efi_arch[0], 'efi'),
input : elf,
output : tuple[0].format(efi_arch[0], 'efi'),
@ -447,8 +446,5 @@ foreach tuple : [['systemd-boot@0@.@1@', systemd_boot_objects, false, 'systemd-b
efi_format,
'@INPUT@', '@OUTPUT@'],
install : true,
install_tag: tuple[3],
install_dir : bootlibdir)
alias_target(tuple[3], efi)
endforeach