diff options
Diffstat (limited to 'meta/recipes-extended/psmisc')
-rw-r--r-- | meta/recipes-extended/psmisc/psmisc.inc | 33 | ||||
-rw-r--r-- | meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch | 6 | ||||
-rw-r--r-- | meta/recipes-extended/psmisc/psmisc_23.7.bb (renamed from meta/recipes-extended/psmisc/psmisc_23.4.bb) | 6 |
3 files changed, 24 insertions, 21 deletions
diff --git a/meta/recipes-extended/psmisc/psmisc.inc b/meta/recipes-extended/psmisc/psmisc.inc index 6ab1288152..23e98d21be 100644 --- a/meta/recipes-extended/psmisc/psmisc.inc +++ b/meta/recipes-extended/psmisc/psmisc.inc | |||
@@ -8,7 +8,7 @@ processes identified by name. The fuser command identifies the PIDs \ | |||
8 | of processes that are using specified files or filesystems." | 8 | of processes that are using specified files or filesystems." |
9 | SECTION = "base" | 9 | SECTION = "base" |
10 | DEPENDS = "ncurses virtual/libintl" | 10 | DEPENDS = "ncurses virtual/libintl" |
11 | LICENSE = "GPLv2" | 11 | LICENSE = "GPL-2.0-only" |
12 | 12 | ||
13 | SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz" | 13 | SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz" |
14 | 14 | ||
@@ -19,38 +19,41 @@ inherit autotools gettext | |||
19 | # Upstream has a custom autogen.sh which invokes po/update-potfiles as they | 19 | # Upstream has a custom autogen.sh which invokes po/update-potfiles as they |
20 | # don't ship a po/POTFILES.in (which is silly). Without that file gettext | 20 | # don't ship a po/POTFILES.in (which is silly). Without that file gettext |
21 | # doesn't believe po/ is a gettext directory and won't generate po/Makefile. | 21 | # doesn't believe po/ is a gettext directory and won't generate po/Makefile. |
22 | do_configure_prepend() { | 22 | do_configure:prepend() { |
23 | ( cd ${S} && po/update-potfiles ) | 23 | ( cd ${S} && po/update-potfiles ) |
24 | } | 24 | } |
25 | 25 | ||
26 | 26 | ||
27 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" | 27 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" |
28 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | 28 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," |
29 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" | ||
29 | 30 | ||
30 | ALLOW_EMPTY_${PN} = "1" | 31 | ALLOW_EMPTY:${PN} = "1" |
31 | 32 | ||
32 | PACKAGES =+ "fuser fuser-doc killall killall-doc pstree pstree-doc" | 33 | PACKAGES =+ "fuser fuser-doc killall killall-doc pstree pstree-doc" |
33 | PACKAGES += "psmisc-extras" | 34 | PACKAGES += "psmisc-extras" |
34 | 35 | ||
35 | FILES_${PN} = "" | 36 | FILES:${PN} = "" |
36 | RDEPENDS_${PN} = "fuser killall pstree" | 37 | RDEPENDS:${PN} = "fuser killall pstree" |
37 | 38 | ||
38 | FILES_fuser = "${bindir}/fuser.${BPN}" | 39 | FILES:fuser = "${bindir}/fuser.${BPN}" |
39 | FILES_fuser-doc = "${mandir}/man1/fuser*" | 40 | FILES:fuser-doc = "${mandir}/man1/fuser*" |
40 | 41 | ||
41 | FILES_killall = "${bindir}/killall.${BPN}" | 42 | FILES:killall = "${bindir}/killall.${BPN}" |
42 | FILES_killall-doc = "${mandir}/man1/killall*" | 43 | FILES:killall-doc = "${mandir}/man1/killall*" |
43 | 44 | ||
44 | FILES_pstree = "${bindir}/pstree" | 45 | FILES:pstree = "${bindir}/pstree" |
45 | FILES_pstree-doc = "${mandir}/man1/pstree*" | 46 | FILES:pstree-doc = "${mandir}/man1/pstree*" |
46 | 47 | ||
47 | FILES_psmisc-extras = "${bindir}" | 48 | FILES:psmisc-extras = "${bindir}" |
48 | FILES_psmisc-extras-doc = "${mandir}" | 49 | FILES:psmisc-extras-doc = "${mandir}" |
49 | 50 | ||
50 | inherit update-alternatives | 51 | inherit update-alternatives |
51 | 52 | ||
52 | ALTERNATIVE_PRIORITY = "90" | 53 | ALTERNATIVE_PRIORITY = "90" |
53 | 54 | ||
54 | ALTERNATIVE_killall = "killall" | 55 | ALTERNATIVE:killall = "killall" |
55 | 56 | ||
56 | ALTERNATIVE_fuser = "fuser" | 57 | ALTERNATIVE:fuser = "fuser" |
58 | |||
59 | ALTERNATIVE:pstree = "pstree" | ||
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 @@ | |||
1 | From 115fcf1daff18aa2f2e130d63704f04031878db0 Mon Sep 17 00:00:00 2001 | 1 | From 338d2d46d1c20ebadf317938af98d0532a62f8d4 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 24 Mar 2016 15:46:14 +0000 | 3 | Date: Thu, 24 Mar 2016 15:46:14 +0000 |
4 | Subject: [PATCH] Use UINTPTR_MAX instead of __WORDSIZE | 4 | Subject: [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 | ||
15 | diff --git a/src/peekfd.c b/src/peekfd.c | 15 | diff --git a/src/peekfd.c b/src/peekfd.c |
16 | index 5aa990a..7e8e3fc 100644 | 16 | index 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.4.bb b/meta/recipes-extended/psmisc/psmisc_23.7.bb index 894443f4ef..ea272cd92d 100644 --- a/meta/recipes-extended/psmisc/psmisc_23.4.bb +++ b/meta/recipes-extended/psmisc/psmisc_23.7.bb | |||
@@ -1,9 +1,9 @@ | |||
1 | require psmisc.inc | 1 | require psmisc.inc |
2 | LICENSE = "GPLv2" | 2 | LICENSE = "GPL-2.0-only" |
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" |
4 | 4 | ||
5 | SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https \ | 5 | SRC_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 | " |
8 | SRCREV = "5fab6b7ab385080f1db725d6803136ec1841a15f" | 8 | SRCREV = "9091d6dbcce3d8fb87adf9249a2eb346d25a562c" |
9 | S = "${WORKDIR}/git" | 9 | S = "${WORKDIR}/git" |