procps: Upgrade to 3.3.10 (procps-ng version)

deleted file mode 100644
index 71dc3f0..0000000
@@ -1,29 +0,0 @@
-From 6f2fd55ef7621fd7ab7897aee2c2651b6faf9e6a Mon Sep 17 00:00:00 2001
-From: Paul Barker <[email protected]>
-Date: Wed, 20 Aug 2014 11:56:11 +0200
-Subject: [PATCH] Fix musl build failure
-
-Include <limits.h> for PATH_MAX.
-
-Signed-off-by: Paul Barker <[email protected]>
-
-Upstream-status: Pending
----
- proc/readproc.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/proc/readproc.c b/proc/readproc.c
-index 4fad11d..c5b1869 100644
---- a/proc/readproc.c
-+++ b/proc/readproc.c
-@@ -26,6 +26,7 @@
- #include <sys/dir.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <limits.h>
- 
- // sometimes it's easier to do this manually, w/o gcc helping
- #ifdef PROF
--- 
-1.9.1
-

54 lines not on this page · raw message

deleted file mode 100644
index 1523c3d..0000000
@@ -1,26 +0,0 @@
-Do not try to detect 64bit/32bit system
-we already feed that information via compiler
-defaults
-
-Signed-off-by: Khem Raj <[email protected]>
-Upstream-Status: Inappropriate [OE specific]
-Index: procps-3.2.8/Makefile
-===================================================================
---- procps-3.2.8.orig/Makefile	2014-05-03 01:00:01.707387583 -0700
-+++ procps-3.2.8/Makefile	2014-05-03 08:53:08.087175369 -0700
-@@ -118,15 +118,6 @@
- # until you go looking for a 64-bit curses library.
- check_gcc = $(shell if $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) dummy.c $(ALL_LDFLAGS) $(1) -o /dev/null $(CURSES) > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;)
- 
--# Be 64-bit if at all possible. In a cross-compiling situation, one may
--# do "make m64=-m32 lib64=lib" to produce 32-bit executables. DO NOT
--# attempt to use a 32-bit executable on a 64-bit kernel. Packagers MUST
--# produce separate executables for ppc and ppc64, s390 and s390x,
--# i386 and x86-64, mips and mips64, sparc and sparc64, and so on.
--# Failure to do so will cause data corruption.
--m64 := $(call check_gcc,-m64,$(call check_gcc,-mabi=64,))
--ALL_CFLAGS += $(m64)
--
- ALL_CFLAGS += $(call check_gcc,-Wdeclaration-after-statement,)
- ALL_CFLAGS += $(call check_gcc,-Wpadded,)
- ALL_CFLAGS += $(call check_gcc,-Wstrict-aliasing,)

44 lines not on this page · raw message

deleted file mode 100644
index 2a59a5f..0000000
@@ -1,39 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-diff -ruN procps-3.2.8-orig//Makefile procps-3.2.8/Makefile
---- procps-3.2.8-orig//Makefile	2011-08-23 22:06:46.471163999 +0800
-+++ procps-3.2.8/Makefile	2011-08-23 22:15:01.091163999 +0800
-@@ -29,9 +29,6 @@
- ln_sf    := ln -sf
- install  := install -D --owner 0 --group 0
- 
--# Lame x86-64 /lib64 and /usr/lib64 abomination:
--lib64    := lib$(shell [ -d /lib64 ] && echo 64)
--
- usr/bin                  := $(DESTDIR)/usr/bin/
- bin                      := $(DESTDIR)/bin/
- sbin                     := $(DESTDIR)/sbin/
-@@ -39,8 +36,8 @@
- man1                     := $(DESTDIR)/usr/share/man/man1/
- man5                     := $(DESTDIR)/usr/share/man/man5/
- man8                     := $(DESTDIR)/usr/share/man/man8/
--lib                      := $(DESTDIR)/$(lib64)/
--usr/lib                  := $(DESTDIR)/usr/$(lib64)/
-+lib                      := $(DESTDIR)/$(base_libdir)/
-+usr/lib                  := $(DESTDIR)/$(libdir)/
- usr/include              := $(DESTDIR)/usr/include/
- 
- #SKIP     := $(bin)kill $(man1)kill.1
-@@ -222,10 +219,10 @@
- ###### install
- 
- $(BINFILES) : all
--	$(install) --mode a=rx $(notdir $@) $@
-+	$(install) -m 555 $(notdir $@) $@
- 
- $(MANFILES) : all
--	$(install) --mode a=r $(notdir $@) $@
-+	$(install) -m 444 $(notdir $@) $@
- 
- install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL))
- 	cd $(usr/bin) && $(ln_f) skill snice

deleted file mode 100644
index 2ca9724..0000000
@@ -1,15 +0,0 @@
-Upstream-Status: Pending
-
-diff --git a/pwdx.c b/pwdx.c
-index cb96a52..29ebce2 100644
---- a/pwdx.c
-+++ b/pwdx.c
-@@ -13,7 +13,7 @@
- #include <stdlib.h>
- #include <sys/types.h>
- #include <regex.h>
--#include <limits.h>
-+#include <linux/limits.h>
- #include <unistd.h>
- #include <errno.h>
- 

deleted file mode 100644
index 2a65c35..0000000
@@ -1,38 +0,0 @@
-Upstream-Status: Pending
-
-*** procps-3.2.5/proc/module.mk.orig	Sun Jul 24 11:53:49 2005
---- procps-3.2.5/proc/module.mk	Sun Jul 24 11:54:32 2005
-***************
-*** 96,102 ****
-  #################### install rules ###########################
-  
-  $(lib)$(SOFILE) : proc/$(SONAME)
-! 	$(install) --mode a=rx $< $@
-  
-  ifneq ($(SOLINK),$(SOFILE))
-  .PHONY: $(lib)$(SOLINK)
---- 96,102 ----
-  #################### install rules ###########################
-  
-  $(lib)$(SOFILE) : proc/$(SONAME)
-! 	$(install) -m 555 $< $@
-  
-  ifneq ($(SOLINK),$(SOFILE))
-  .PHONY: $(lib)$(SOLINK)
-***************
-*** 115,121 ****
-  	$(ldconfig)
-  
-  $(usr/lib)$(ANAME) : proc/$(ANAME)
-! 	$(install) --mode a=r $< $@
-  
-  # Junk anyway... supposed to go in /usr/include/$(NAME)
-  #INSTALL += $(addprefix $(include),$(HDRFILES))
---- 115,121 ----
-  	$(ldconfig)
-  
-  $(usr/lib)$(ANAME) : proc/$(ANAME)
-! 	$(install) -m 444 $< $@
-  
-  # Junk anyway... supposed to go in /usr/include/$(NAME)
-  #INSTALL += $(addprefix $(include),$(HDRFILES))

111 lines not on this page · raw message

deleted file mode 100644
index c8cee26..0000000
@@ -1,19 +0,0 @@
-Upstream-Status: Backport
-
-Fix for stricter Makefile parser in Make 3.82 take from Gentoo bugzilla:
-http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-process/procps/files/procps-3.2.8%2Bgmake-3.82.patch?revision=1.1
-
-Index: procps-3.2.8/Makefile
-===================================================================
---- procps-3.2.8.orig/Makefile
-+++ procps-3.2.8/Makefile
-@@ -174,7 +174,8 @@ INSTALL := $(BINFILES) $(MANFILES)
- # want this rule first, use := on ALL, and ALL not filled in yet
- all: do_all
- 
---include */module.mk
-+-include proc/module.mk
-+-include ps/module.mk
- 
- do_all:    $(ALL)
- 

82 lines not on this page · raw message

deleted file mode 100644
index 0775eab..0000000
@@ -1,23 +0,0 @@
-Upstream-Status: Pending
-
-*** procps-3.2.5/ps/module.mk.orig	Sun Jul 24 11:54:40 2005
---- procps-3.2.5/ps/module.mk	Sun Jul 24 11:55:02 2005
-***************
-*** 33,40 ****
-  
-  
-  $(bin)ps: ps/ps
-! 	$(install) --mode a=rx $< $@
-  
-  $(man1)ps.1 : ps/ps.1
-! 	$(install) --mode a=r $< $@
-  	-rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz
---- 33,40 ----
-  
-  
-  $(bin)ps: ps/ps
-! 	$(install) -m 555 $< $@
-  
-  $(man1)ps.1 : ps/ps.1
-! 	$(install) -m 444 $< $@
-  	-rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz

64 lines not on this page · raw message

deleted file mode 100644
index da91da2..0000000
@@ -1,31 +0,0 @@
-SUMMARY = "System and process monitoring utilities"
-DESCRIPTION = "Procps contains a set of system utilities that provide system information about processes using \
-the /proc filesystem. The package \ includes the programs ps, top, vmstat, w, kill, and skill."
-HOMEPAGE = "http://procps.sf.net"
-SECTION = "base"
-LICENSE = "GPLv2+ & LGPLv2+"
-LIC_FILES_CHKSUM="file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
-                  file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812 \
-                  file://ps/COPYING;md5=6e29c688d912da12b66b73e32b03d812 \
-                  file://proc/COPYING;md5=6e29c688d912da12b66b73e32b03d812"
-DEPENDS = "ncurses"
-
-SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
-           file://install.patch"
-
-inherit autotools-brokensep update-alternatives
-
-do_install_append() {
-	mv ${D}${bindir}/watch ${D}${bindir}/watch.${BPN}
-}
-
-FILES_${PN} += "${libdir}/*-${PV}.so ${base_libdir}/*-${PV}.so"
-FILES_SOLIBSDEV = ""
-
-ALTERNATIVE_${PN} = "top uptime free pkill pmap kill sysctl ps pgrep pwdx watch"
-ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill"
-ALTERNATIVE_LINK_NAME[sysctl] = "${base_sbindir}/sysctl"
-ALTERNATIVE_LINK_NAME[ps] = "${base_bindir}/ps"
-ALTERNATIVE_LINK_NAME[watch] = "${base_bindir}/watch"
-ALTERNATIVE_TARGET[watch] = "${bindir}/watch.${BPN}"
-ALTERNATIVE_PRIORITY = "110"

new file mode 100644
index 0000000..a4ad1a0
@@ -0,0 +1,13 @@
+Index: procps-ng-3.3.10/configure.ac
+===================================================================
+--- procps-ng-3.3.10.orig/configure.ac
++++ procps-ng-3.3.10/configure.ac
+@@ -70,7 +70,7 @@ AC_FUNC_MMAP
+ AC_FUNC_REALLOC
+ AC_FUNC_STRTOD
+ 
+-usrbin_execdir='${exec_prefix}/usr/bin'
++usrbin_execdir='${exec_prefix}/bin'
+ AC_SUBST([usrbin_execdir])
+ 
+ AM_GNU_GETTEXT_VERSION([0.14.1])

deleted file mode 100644
index fcfde19..0000000
@@ -1,37 +0,0 @@
-require procps.inc
-
-PR = "r12"
-
-SRC_URI += "file://procmodule.patch \
-            file://psmodule.patch \
-            file://linux-limits.patch \
-            file://sysctl.conf \
-            file://procps-3.2.8+gmake-3.82.patch \
-            file://gnu-kbsd-version.patch \
-            file://60_linux_version_init.patch \
-            file://procps-3.2.7-top-remcpu.patch \
-            file://procps-3.2.8-ps-cgroup.patch \
-            file://detect_bitness.patch \
-            file://0001-Fix-musl-build-failure.patch \
-           "
-
-SRC_URI[md5sum] = "9532714b6846013ca9898984ba4cd7e0"
-SRC_URI[sha256sum] = "11ed68d8a4433b91cd833deb714a3aa849c02aea738c42e6b4557982419c1535"
-
-EXTRA_OEMAKE = 'CFLAGS="${CFLAGS} -I${STAGING_INCDIR}" \
-                CPPFLAGS=-I${STAGING_INCDIR} \
-                LDFLAGS="${LDFLAGS}" \
-                CURSES=-lncurses \
-                install="install -D" \
-                ldconfig=echo'
-
-do_install_append () {
-	install -d ${D}${sysconfdir}
-	install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/sysctl.conf
-	if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
-		install -d ${D}${sysconfdir}/sysctl.d
-		ln -sf ../sysctl.conf ${D}${sysconfdir}/sysctl.d/99-sysctl.conf
-	fi
-}
-
-CONFFILES_${PN} = "${sysconfdir}/sysctl.conf"

new file mode 100644
index 0000000..0faae29
@@ -0,0 +1,26 @@
+SUMMARY = "System and process monitoring utilities"
+DESCRIPTION = "Procps contains a set of system utilities that provide system information about processes using \
+the /proc filesystem. The package \ includes the programs ps, top, vmstat, w, kill, and skill."
+HOMEPAGE = "http://procps.sf.net"
+SECTION = "base"
+LICENSE = "GPLv2+ & LGPLv2+"
+LIC_FILES_CHKSUM="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                  file://COPYING.LIB;md5=4cf66a4984120007c9881cc871cf49db \
+                 "
+
+DEPENDS = "ncurses"
+
+inherit autotools-brokensep gettext pkgconfig update-alternatives
+
+SRC_URI = "http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-${PV}.tar.xz \
+           file://fix-configure.patch \
+          "
+
+SRC_URI[md5sum] = "1fb7f3f6bf92ce6c5c9ed9949ae858fe"
+SRC_URI[sha256sum] = "a02e6f98974dfceab79884df902ca3df30b0e9bad6d76aee0fb5dce17f267f04"
+
+S = "${WORKDIR}/procps-ng-${PV}"
+EXTRA_OECONF = "usrbin_execdir='${bindir}'"
+
+ALTERNATIVE_${PN} = "top uptime free pkill pmap kill sysctl ps pgrep pwdx watch"
+ALTERNATIVE_PRIORITY = "110"