From b2e93503a9922ae401c5ed06f14dfd9e5fa0ccf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=9C=87=E5=AE=87?= Date: Tue, 2 Apr 2024 19:03:41 +0800 Subject: [PATCH] Inherit previous patches --- ...Update-vendor-ids-for-ieisystem-0750.patch | 27 +++++++++++++++++++ systemd-timesyncd-default-to-aliyun.patch | 11 ++++++++ systemd.spec | 8 ++++++ use-system-auth-in-pam-systemd-user.patch | 22 +++++++++++++++ 4 files changed, 68 insertions(+) create mode 100644 0004-Update-vendor-ids-for-ieisystem-0750.patch create mode 100644 systemd-timesyncd-default-to-aliyun.patch create mode 100644 use-system-auth-in-pam-systemd-user.patch diff --git a/0004-Update-vendor-ids-for-ieisystem-0750.patch b/0004-Update-vendor-ids-for-ieisystem-0750.patch new file mode 100644 index 0000000..fa81720 --- /dev/null +++ b/0004-Update-vendor-ids-for-ieisystem-0750.patch @@ -0,0 +1,27 @@ +From c9ff0e954bc6064e5704551539534fd3ac93b6d4 Mon Sep 17 00:00:00 2001 +From: wangkaiyuan +Date: Wed, 31 Jan 2024 19:41:48 +0800 +Subject: [PATCH] Update vendor ids for ieisystem 0750 + +Signed-off-by: wangkaiyuan +--- + hwdb.d/20-pci-vendor-model.hwdb | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/hwdb.d/20-pci-vendor-model.hwdb b/hwdb.d/20-pci-vendor-model.hwdb +index 9f6eca7..89072ab 100644 +--- a/hwdb.d/20-pci-vendor-model.hwdb ++++ b/hwdb.d/20-pci-vendor-model.hwdb +@@ -70736,6 +70736,9 @@ pci:v00001BD0d00001203* + pci:v00001BD4* + ID_VENDOR_FROM_DATABASE=Inspur Electronic Information Industry Co., Ltd. + ++pci:v00001BD4d00000750* ++ ID_MODEL_FROM_DATABASE=YHGCH ZX1000 ++ + pci:v00001BD4d00000911* + ID_MODEL_FROM_DATABASE=Arria10_PCIe_F10A1150 + +-- +2.31.1 + diff --git a/systemd-timesyncd-default-to-aliyun.patch b/systemd-timesyncd-default-to-aliyun.patch new file mode 100644 index 0000000..1862bee --- /dev/null +++ b/systemd-timesyncd-default-to-aliyun.patch @@ -0,0 +1,11 @@ +--- systemd-stable-252.4/src/timesync/timesyncd.conf.in.orig 2023-03-03 12:29:52.389506272 +0800 ++++ systemd-stable-252.4/src/timesync/timesyncd.conf.in 2023-03-03 12:30:20.177506272 +0800 +@@ -14,7 +14,7 @@ + + [Time] + #NTP= +-#FallbackNTP={{NTP_SERVERS}} ++FallbackNTP={{NTP_SERVERS}} + #RootDistanceMaxSec=5 + #PollIntervalMinSec=32 + #PollIntervalMaxSec=2048 diff --git a/systemd.spec b/systemd.spec index 1086e07..366f402 100644 --- a/systemd.spec +++ b/systemd.spec @@ -58,6 +58,11 @@ Source24: sysusers.generate-pre.sh Source31: systemd-tests-file-list Source32: systemd-devel-file-list +Patch0001: systemd-timesyncd-default-to-aliyun.patch + +Patch0201: use-system-auth-in-pam-systemd-user.patch +Patch0202: 0004-Update-vendor-ids-for-ieisystem-0750.patch + Patch0490: use-bfq-scheduler.patch @@ -2167,6 +2172,9 @@ fi %doc docs/DISTRO_PORTING.md docs/HACKING.md %changelog +* Tue Apr 2 2024 Zhenyu Wang - 255-1 +- Inherit previous patches + * Fri Mar 21 2024 Zhenyu Wang - 255 - update to 255 diff --git a/use-system-auth-in-pam-systemd-user.patch b/use-system-auth-in-pam-systemd-user.patch new file mode 100644 index 0000000..d5d5135 --- /dev/null +++ b/use-system-auth-in-pam-systemd-user.patch @@ -0,0 +1,22 @@ +From 4e6479054ae2090b99a50d6ae954d22efc8340a0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Wed, 14 Dec 2022 22:24:53 +0100 + +--- + src/login/systemd-user.in | 2 ++-- + 1 file changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/login/systemd-user.in b/src/login/systemd-user.in +index 9a665bd959..703a4b3174 100644 +--- a/src/login/systemd-user.in ++++ b/src/login/systemd-user.in +@@ -19,5 +19,5 @@ session required pam_namespace.so + {% if ENABLE_HOMED %} + -session optional pam_systemd_home.so + {% endif %} + session optional pam_umask.so silent +-session optional pam_systemd.so ++session include system-auth +-- +2.38.1 + -- Gitee