Merge 9aa7f22f1f into 5b2926d941

2024-11-24 00:13:31 +01:00
7 changed files with 0 additions and 13 deletions
--- a/3
+++ b/3
@ -764,9 +764,6 @@ CHANGES WITH 257 in spe:
          other cases EnterNamespace= might be an suitable approach to acquire
          symbolized backtraces.)

-        Special thanks to Nick Owens for bringing attention to and testing
-        fixes for issue #34516.
-
        Contributions from: 12paper, A. Wilcox, Abderrahim Kitouni,
        Adrian Vovk, Alain Greppin, Allison Karlitskaya, Alyssa Ross,
        Anders Jonsson, Andika Triwidada, Andres Beltran, Anouk Ceyssens,
--- a/hwdb.d/60-sensor.hwdb
+++ b/hwdb.d/60-sensor.hwdb
@ -295,10 +295,6 @@ sensor:modalias:acpi:MXC6655*:dmi:*:svnCHUWIInnovationAndTechnology*:pnHi10X:*
 sensor:modalias:acpi:KIOX000A*:dmi:*:svnCHUWIInnovationAndTechnology*:pnHi10X:*
 ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1

-# Chuwi Hi10 X1
-sensor:modalias:acpi:NSA2513*:dmi:*:svnCHUWIInnovationAndTechnology*:pnHi10X1:*
- ACCEL_MOUNT_MATRIX=0, 1, 0; -1, 0, 0; 0, 0, 1
-
 # Chuwi Hi10 Go
 sensor:modalias:acpi:MXC6655*:dmi:*:svnCHUWIINNOVATIONLIMITED:pnHi10Go:*
 ACCEL_MOUNT_MATRIX=-1, 0, 0; 0,-1, 0; 0, 0, 1
--- a/mkosi.conf.d/05-tools/mkosi.conf.d/arch.conf
+++ b/mkosi.conf.d/05-tools/mkosi.conf.d/arch.conf
@ -6,7 +6,6 @@ ToolsTreeDistribution=arch
 [Build]
 ToolsTreePackages=
        cryptsetup
-        github-cli
        libcap
        libmicrohttpd
        python-jinja
--- a/mkosi.conf.d/05-tools/mkosi.conf.d/debian-ubuntu.conf
+++ b/mkosi.conf.d/05-tools/mkosi.conf.d/debian-ubuntu.conf
@ -6,7 +6,6 @@ ToolsTreeDistribution=|ubuntu

 [Build]
 ToolsTreePackages=
-        gh
        libblkid-dev
        libcap-dev
        libcryptsetup-dev
--- a/mkosi.conf.d/05-tools/mkosi.conf.d/fedora.conf
+++ b/mkosi.conf.d/05-tools/mkosi.conf.d/fedora.conf
@ -5,5 +5,4 @@ ToolsTreeDistribution=fedora

 [Build]
 ToolsTreePackages=
-        gh
        ruff
--- a/mkosi.conf.d/05-tools/mkosi.conf.d/opensuse.conf
+++ b/mkosi.conf.d/05-tools/mkosi.conf.d/opensuse.conf
@ -5,7 +5,6 @@ ToolsTreeDistribution=opensuse

 [Build]
 ToolsTreePackages=
-        gh
        pkgconfig(blkid)
        pkgconfig(libcap)
        pkgconfig(libcryptsetup)
--- a/test/TEST-73-LOCALE/meson.build
+++ b/test/TEST-73-LOCALE/meson.build
@ -4,7 +4,5 @@ integration_tests += [
        integration_test_template + {
                'name' : fs.name(meson.current_source_dir()),
                'priority' : 10,
-                # TODO: Remove when https://github.com/systemd/systemd/issues/35335 is fixed.
-                'coredump-exclude-regex' : '/systemd-localed',
        },
 ]