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.3.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 \ of processes that are using specified files or filesystems." SECTION = "base" DEPENDS = "ncurses virtual/libintl" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz" @@ -19,38 +19,41 @@ inherit autotools gettext # Upstream has a custom autogen.sh which invokes po/update-potfiles as they # don't ship a po/POTFILES.in (which is silly). Without that file gettext # doesn't believe po/ is a gettext directory and won't generate po/Makefile. -do_configure_prepend() { +do_configure:prepend() { ( cd ${S} && po/update-potfiles ) } PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," +PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" PACKAGES =+ "fuser fuser-doc killall killall-doc pstree pstree-doc" PACKAGES += "psmisc-extras" -FILES_${PN} = "" -RDEPENDS_${PN} = "fuser killall pstree" +FILES:${PN} = "" +RDEPENDS:${PN} = "fuser killall pstree" -FILES_fuser = "${bindir}/fuser.${BPN}" -FILES_fuser-doc = "${mandir}/man1/fuser*" +FILES:fuser = "${bindir}/fuser.${BPN}" +FILES:fuser-doc = "${mandir}/man1/fuser*" -FILES_killall = "${bindir}/killall.${BPN}" -FILES_killall-doc = "${mandir}/man1/killall*" +FILES:killall = "${bindir}/killall.${BPN}" +FILES:killall-doc = "${mandir}/man1/killall*" -FILES_pstree = "${bindir}/pstree" -FILES_pstree-doc = "${mandir}/man1/pstree*" +FILES:pstree = "${bindir}/pstree" +FILES:pstree-doc = "${mandir}/man1/pstree*" -FILES_psmisc-extras = "${bindir}" -FILES_psmisc-extras-doc = "${mandir}" +FILES:psmisc-extras = "${bindir}" +FILES:psmisc-extras-doc = "${mandir}" inherit update-alternatives ALTERNATIVE_PRIORITY = "90" -ALTERNATIVE_killall = "killall" +ALTERNATIVE:killall = "killall" -ALTERNATIVE_fuser = "fuser" +ALTERNATIVE:fuser = "fuser" + +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 @@ -From 115fcf1daff18aa2f2e130d63704f04031878db0 Mon Sep 17 00:00:00 2001 +From 338d2d46d1c20ebadf317938af98d0532a62f8d4 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 24 Mar 2016 15:46:14 +0000 Subject: [PATCH] Use UINTPTR_MAX instead of __WORDSIZE @@ -13,7 +13,7 @@ Upstream-Status: Pending 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/peekfd.c b/src/peekfd.c -index 5aa990a..7e8e3fc 100644 +index 36dff04..2b4b1dc 100644 --- a/src/peekfd.c +++ b/src/peekfd.c @@ -30,8 +30,11 @@ @@ -28,7 +28,7 @@ index 5aa990a..7e8e3fc 100644 #include <getopt.h> #include <ctype.h> #include <dirent.h> -@@ -266,11 +269,11 @@ int main(int argc, char **argv) +@@ -341,11 +344,11 @@ int main(int argc, char **argv) if (WIFSTOPPED(status)) { #ifdef PPC struct pt_regs regs; diff --git a/meta/recipes-extended/psmisc/psmisc_23.3.bb b/meta/recipes-extended/psmisc/psmisc_23.7.bb index e569f1074b..ea272cd92d 100644 --- a/meta/recipes-extended/psmisc/psmisc_23.3.bb +++ b/meta/recipes-extended/psmisc/psmisc_23.7.bb @@ -1,9 +1,9 @@ require psmisc.inc -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" -SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https \ +SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https;branch=master \ file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \ " -SRCREV = "78bde849041e6c914a2a517ebe1255b86dc98772" +SRCREV = "9091d6dbcce3d8fb87adf9249a2eb346d25a562c" S = "${WORKDIR}/git" |