summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2024-03-13 15:08:16 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-04-16 08:07:01 +0100
commit051e5476e8523ac859bf99afd53434cb7286684b (patch)
tree77676f6e3e7a57ddea9b1960f0cb2bbbbd89535d /meta
parentaeaeaed8effe0945806efe7969fd4af34600ea05 (diff)
downloadpoky-051e5476e8523ac859bf99afd53434cb7286684b.tar.gz
psmisc: upgrade 23.6 -> 23.7
0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch refreshed for 23.7 Changelog: =========== * build-sys: Make disable-statx work * fuser: Fallback to stat() if no statx() Debian 1030747 * fuser: silently ignore EACCES when scanning proc directories * killall: small formatting fixes Debian * pstree: Do not assume root PID * pslog: include config.h * misc: Update gettext to 0.21 (From OE-Core rev: 5a5e5cce2edd0f0bccc69f3ec68dd86810b873c2) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch6
-rw-r--r--meta/recipes-extended/psmisc/psmisc_23.7.bb (renamed from meta/recipes-extended/psmisc/psmisc_23.6.bb)2
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch b/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch
index ca13bdbd15..01335bdf40 100644
--- a/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch
+++ b/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch
@@ -1,4 +1,4 @@
1From 115fcf1daff18aa2f2e130d63704f04031878db0 Mon Sep 17 00:00:00 2001 1From 338d2d46d1c20ebadf317938af98d0532a62f8d4 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 24 Mar 2016 15:46:14 +0000 3Date: Thu, 24 Mar 2016 15:46:14 +0000
4Subject: [PATCH] Use UINTPTR_MAX instead of __WORDSIZE 4Subject: [PATCH] Use UINTPTR_MAX instead of __WORDSIZE
@@ -13,7 +13,7 @@ Upstream-Status: Pending
13 1 file changed, 8 insertions(+), 5 deletions(-) 13 1 file changed, 8 insertions(+), 5 deletions(-)
14 14
15diff --git a/src/peekfd.c b/src/peekfd.c 15diff --git a/src/peekfd.c b/src/peekfd.c
16index 5aa990a..7e8e3fc 100644 16index 36dff04..2b4b1dc 100644
17--- a/src/peekfd.c 17--- a/src/peekfd.c
18+++ b/src/peekfd.c 18+++ b/src/peekfd.c
19@@ -30,8 +30,11 @@ 19@@ -30,8 +30,11 @@
@@ -28,7 +28,7 @@ index 5aa990a..7e8e3fc 100644
28 #include <getopt.h> 28 #include <getopt.h>
29 #include <ctype.h> 29 #include <ctype.h>
30 #include <dirent.h> 30 #include <dirent.h>
31@@ -266,11 +269,11 @@ int main(int argc, char **argv) 31@@ -341,11 +344,11 @@ int main(int argc, char **argv)
32 if (WIFSTOPPED(status)) { 32 if (WIFSTOPPED(status)) {
33 #ifdef PPC 33 #ifdef PPC
34 struct pt_regs regs; 34 struct pt_regs regs;
diff --git a/meta/recipes-extended/psmisc/psmisc_23.6.bb b/meta/recipes-extended/psmisc/psmisc_23.7.bb
index 2e55ad00bd..ea272cd92d 100644
--- a/meta/recipes-extended/psmisc/psmisc_23.6.bb
+++ b/meta/recipes-extended/psmisc/psmisc_23.7.bb
@@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
5SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https;branch=master \ 5SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https;branch=master \
6 file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \ 6 file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \
7 " 7 "
8SRCREV = "3098e641dc1ddb210186f53464255670b480377b" 8SRCREV = "9091d6dbcce3d8fb87adf9249a2eb346d25a562c"
9S = "${WORKDIR}/git" 9S = "${WORKDIR}/git"