Commit 9868d241 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

psmisc: do not install pstree.x11 symbolic link 



The psmisc-no-__progname.patch removes the usage of __progname, which
removes any difference between pstree and pstree.x11. Therefore, we
make sure to not create the pstree.x11 symbolic link in the target.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent f066ed70

package/psmisc/psmisc-no-__progname.patch

+20 −3
Original line number Diff line number Diff line
@@ -5,10 +5,12 @@ stuff isn't that critical, so just disable it. 


Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>



diff -Nura psmisc-22.13.orig/src/pstree.c psmisc-22.13/src/pstree.c

--- psmisc-22.13.orig/src/pstree.c	2010-07-12 08:10:03.000000000 -0300

+++ psmisc-22.13/src/pstree.c	2011-01-07 15:02:41.902741728 -0300

Index: psmisc-22.13/src/pstree.c

===================================================================

--- psmisc-22.13.orig/src/pstree.c	2010-07-12 13:10:03.000000000 +0200

+++ psmisc-22.13/src/pstree.c	2011-05-21 16:33:37.456530775 +0200

@@ -49,8 +49,6 @@

 #include <selinux/selinux.h>

 #endif                                /*WITH_SELINUX */
@@ -28,3 +30,18 @@ diff -Nura psmisc-22.13.orig/src/pstree.c psmisc-22.13/src/pstree.c 
     /*

      * Attempt to figure out a good default symbol set.  Will be overriden by

      * command-line options, if given.

Index: psmisc-22.13/src/Makefile.in

===================================================================

--- psmisc-22.13.orig/src/Makefile.in	2011-05-21 16:33:42.748530777 +0200

+++ psmisc-22.13/src/Makefile.in	2011-05-21 16:33:47.360530782 +0200

@@ -557,10 +557,6 @@

 		grep '^{ 1,"HUP" },$$' signames.h >/dev/null || \

 		  { rm -f signames.h; exit 1; }

 

-install-exec-hook:

-		cd $(DESTDIR)$(bindir) && \

-			( [ -h pstree.x11 ]  || $(LN_S) pstree pstree.x11)

-

 # Tell versions [3.59,3.63) of GNU make to not export all variables.

 # Otherwise a system limit (for SysV at least) may be exceeded.

 .NOEXPORT: