diff --git a/20006-systemd-Add-sw64.patch b/20006-systemd-Add-sw64.patch index f1e0e6aab5532bbf8a19d205679173c9b62dbfcf..f62efc271a8436a42bf9ed3e07e5481afe87b3c8 100644 --- a/20006-systemd-Add-sw64.patch +++ b/20006-systemd-Add-sw64.patch @@ -1,15 +1,15 @@ -From 1d1259c0bada01ed92d991b44be1f53042837187 Mon Sep 17 00:00:00 2001 -From: rpm-build -Date: Fri, 12 May 2023 15:33:42 +0800 -Subject: [PATCH] Add sw64 architecture +From 6cdb604db829800ec1803d61533bd1947c841911 Mon Sep 17 00:00:00 2001 +From: Weisson +Date: Thu, 26 Sep 2024 13:54:58 +0800 +Subject: [PATCH] Add sw64 architecture. -Signed-off-by: rpm-build +Signed-off-by: Weisson --- src/basic/architecture.c | 3 +++ src/basic/architecture.h | 4 ++++ src/basic/missing.h | 2 +- - src/basic/missing_syscall.h | 4 +++- - 4 files changed, 11 insertions(+), 2 deletions(-) + src/basic/missing_syscall.h | 2 ++ + 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/basic/architecture.c b/src/basic/architecture.c index 96bbf97..72b98a3 100644 @@ -68,18 +68,9 @@ index b937661..c2913b5 100644 #elif defined(__parisc__) || defined(__hppa__) #define __O_TMPFILE 0400000000 diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h -index 014dd2b..3acf59f 100644 +index 014dd2b..51a54b2 100644 --- a/src/basic/missing_syscall.h +++ b/src/basic/missing_syscall.h -@@ -182,7 +182,7 @@ static inline int missing_setns(int fd, int nstype) { - /* ======================================================================= */ - - static inline pid_t raw_getpid(void) { --#if defined(__alpha__) -+#if defined(__alpha__) || defined(__sw_64__) - return (pid_t) syscall(__NR_getxpid); - #else - return (pid_t) syscall(__NR_getpid); @@ -405,6 +405,8 @@ static inline int missing_bpf(int cmd, union bpf_attr *attr, size_t size) { # define __NR_statx 360 # elif defined __x86_64__ @@ -90,5 +81,5 @@ index 014dd2b..3acf59f 100644 # warning "__NR_statx not defined for your architecture" # endif -- -2.31.1 +2.39.3 diff --git a/systemd.spec b/systemd.spec index ea72e8f0de495135fe8c7a3dd4a2d42ba1732bc5..72bfa801a040523663abf5505a8b34fa5e57267b 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.2 +%define anolis_release .0.3 #global gitcommit 10e465b5321bd53c1fc59ffab27e724535c6bc0f %{?gitcommit:%global gitcommitshort %(c=%{gitcommit}; echo ${c:0:7})} @@ -1833,6 +1833,9 @@ fi %files tests -f .file-list-tests %changelog +* Thu Sep 26 2024 Weisson - 239-82.0.3 +- bugfix: sw8a machine seems not to support getxpid syscall any more, replace it with getpid. + * Tue Sep 24 2024 Zhongling He - 239-82.0.2 - core, udev: remove old device on move event