procps: Update to 3.3.16

- update from 3.2.8 to 3.3.16
	This is also an update from procps to procps-ng
	The previous version was no longer being maintained.
- Added autogen.sh into lfs as ity is needed to create the config script.
- Added libdir=/lib line into configure command as default is /usr/lib
- Added mv commands for kill, ps & sysctl to place them into the same locations
	as the previous version of procps
- Moved lfsmake2 procps line to after pkg-config in make.sh
	The autogen line requires autoconf, libtool, gettext and pkg-config
	to be available so procps moved to after them.
- procps-3.2.8-fix_unknown_HZ_value.patch no longer required with new
	version so removed.
- rootfile updated.
- libprocps library being maintained by the same people now maitaining this
	version of procps.
- information on the releases from 3.3.13 to 3.3.16 available on
	https://gitlab.com/procps-ng/procps/-/releases

Signed-off-by: Adolf Belka <ahb.ipfire@gmail.com>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Adolf Belka
2020-12-26 17:40:32 +01:00
committed by Michael Tremer
parent 986a116beb
commit 50992c7321
4 changed files with 51 additions and 47 deletions

View File

@@ -1,36 +1,67 @@
bin/kill bin/kill
bin/ps bin/ps
lib/libproc-3.2.8.so #lib/libprocps.a
#lib/libprocps.la
#lib/libprocps.so
lib/libprocps.so.8
lib/libprocps.so.8.0.2
#lib/pkgconfig
#lib/pkgconfig/libprocps.pc
sbin/sysctl sbin/sysctl
usr/bin/free usr/bin/free
usr/bin/pgrep usr/bin/pgrep
usr/bin/pidof
#usr/bin/pkill #usr/bin/pkill
#usr/bin/pmap #usr/bin/pmap
#usr/bin/pwdx #usr/bin/pwdx
#usr/bin/skill
#usr/bin/slabtop #usr/bin/slabtop
#usr/bin/snice
#usr/bin/tload #usr/bin/tload
usr/bin/top usr/bin/top
usr/bin/uptime
usr/bin/vmstat usr/bin/vmstat
usr/bin/w usr/bin/w
usr/bin/watch usr/bin/watch
#usr/include/proc
#usr/include/proc/alloc.h
#usr/include/proc/devname.h
#usr/include/proc/escape.h
#usr/include/proc/numa.h
#usr/include/proc/procps.h
#usr/include/proc/pwcache.h
#usr/include/proc/readproc.h
#usr/include/proc/sig.h
#usr/include/proc/slab.h
#usr/include/proc/sysinfo.h
#usr/include/proc/version.h
#usr/include/proc/wchan.h
#usr/include/proc/whattime.h
#usr/share/doc/procps-ng
#usr/share/doc/procps-ng/FAQ
#usr/share/doc/procps-ng/bugs.md
#usr/share/locale/de/LC_MESSAGES/procps-ng.mo
#usr/share/locale/fr/LC_MESSAGES/procps-ng.mo
#usr/share/locale/pl/LC_MESSAGES/procps-ng.mo
#usr/share/locale/pt_BR/LC_MESSAGES/procps-ng.mo
#usr/share/locale/sv/LC_MESSAGES/procps-ng.mo
#usr/share/locale/uk/LC_MESSAGES/procps-ng.mo
#usr/share/locale/vi/LC_MESSAGES/procps-ng.mo
#usr/share/locale/zh_CN/LC_MESSAGES/procps-ng.mo
#usr/share/man/man1/free.1 #usr/share/man/man1/free.1
#usr/share/man/man1/kill.1 #usr/share/man/man1/kill.1
#usr/share/man/man1/pgrep.1 #usr/share/man/man1/pgrep.1
#usr/share/man/man1/pidof.1
#usr/share/man/man1/pkill.1 #usr/share/man/man1/pkill.1
#usr/share/man/man1/pmap.1 #usr/share/man/man1/pmap.1
#usr/share/man/man1/procps.1
#usr/share/man/man1/ps.1 #usr/share/man/man1/ps.1
#usr/share/man/man1/pwdx.1 #usr/share/man/man1/pwdx.1
#usr/share/man/man1/skill.1
#usr/share/man/man1/slabtop.1 #usr/share/man/man1/slabtop.1
#usr/share/man/man1/snice.1
#usr/share/man/man1/tload.1 #usr/share/man/man1/tload.1
#usr/share/man/man1/top.1 #usr/share/man/man1/top.1
#usr/share/man/man1/uptime.1
#usr/share/man/man1/w.1 #usr/share/man/man1/w.1
#usr/share/man/man1/watch.1 #usr/share/man/man1/watch.1
#usr/share/man/man3/openproc.3
#usr/share/man/man3/readproc.3
#usr/share/man/man3/readproctab.3
#usr/share/man/man5/sysctl.conf.5 #usr/share/man/man5/sysctl.conf.5
#usr/share/man/man8/sysctl.8 #usr/share/man/man8/sysctl.8
#usr/share/man/man8/vmstat.8 #usr/share/man/man8/vmstat.8

View File

@@ -24,7 +24,7 @@
include Config include Config
VER = 3.2.8 VER = v3.3.16
THISAPP = procps-$(VER) THISAPP = procps-$(VER)
DL_FILE = $(THISAPP).tar.gz DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 9532714b6846013ca9898984ba4cd7e0 $(DL_FILE)_MD5 = 2af440d54f94a3b44020bf0ea1bf9de8
install : $(TARGET) install : $(TARGET)
@@ -70,9 +70,17 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fix_unknown_HZ_value.patch cd $(DIR_APP) && ./autogen.sh
cd $(DIR_APP) && make $(MAKETUNING) LIBPROC=proc/libproc-$(VER).so cd $(DIR_APP) && ./configure \
--prefix=/usr \
--libdir=/lib
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install cd $(DIR_APP) && make install
install -m 0644 $(DIR_SRC)/config/etc/sysctl.conf /etc install -m 0644 $(DIR_SRC)/config/etc/sysctl.conf /etc
# Move some tools to /bin & /sbin
mv -v /usr/bin/{kill,ps} /bin
mv -v /usr/sbin/sysctl /sbin
@rm -rf $(DIR_APP) @rm -rf $(DIR_APP)
@$(POSTBUILD) @$(POSTBUILD)

View File

@@ -1096,7 +1096,6 @@ buildbase() {
lfsmake2 m4 lfsmake2 m4
lfsmake2 bison lfsmake2 bison
lfsmake2 ncurses lfsmake2 ncurses
lfsmake2 procps
lfsmake2 libtool lfsmake2 libtool
lfsmake2 perl lfsmake2 perl
lfsmake2 readline lfsmake2 readline
@@ -1124,6 +1123,7 @@ buildbase() {
lfsmake2 kbd lfsmake2 kbd
lfsmake2 less lfsmake2 less
lfsmake2 pkg-config lfsmake2 pkg-config
lfsmake2 procps
lfsmake2 make lfsmake2 make
lfsmake2 man lfsmake2 man
lfsmake2 net-tools lfsmake2 net-tools

View File

@@ -1,35 +0,0 @@
diff -Naur procps-3.2.6.org/proc/sysinfo.c procps-3.2.6/proc/sysinfo.c
--- procps-3.2.6.org/proc/sysinfo.c 2005-03-14 05:31:27.000000000 +0100
+++ procps-3.2.6/proc/sysinfo.c 2011-10-02 12:51:32.000000000 +0200
@@ -212,6 +212,7 @@
static void init_libproc(void) __attribute__((constructor));
static void init_libproc(void){
have_privs = check_for_privs();
+ init_Linux_version();
// ought to count CPUs in /proc/stat instead of relying
// on glibc, which foolishly tries to parse /proc/cpuinfo
//
diff -Naur procps-3.2.6.org/proc/version.c procps-3.2.6/proc/version.c
--- procps-3.2.6.org/proc/version.c 2003-01-29 02:11:43.000000000 +0100
+++ procps-3.2.6/proc/version.c 2011-10-02 12:52:36.000000000 +0200
@@ -33,8 +33,7 @@
int linux_version_code;
-static void init_Linux_version(void) __attribute__((constructor));
-static void init_Linux_version(void) {
+void init_Linux_version(void) {
static struct utsname uts;
int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */
diff -Naur procps-3.2.6.org/proc/version.h procps-3.2.6/proc/version.h
--- procps-3.2.6.org/proc/version.h 2002-12-15 01:08:32.000000000 +0100
+++ procps-3.2.6/proc/version.h 2011-10-02 12:53:10.000000000 +0200
@@ -14,6 +14,7 @@
EXTERN_C_BEGIN
+extern void init_Linux_version(void);
extern void display_version(void); /* display suite version */
extern const char procps_version[]; /* global buf for suite version */