From: Arne Fitzenreiter <Arne.Fitzenreiter@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] procps: update to version 3.3.10 (openvmtools need it)
Date: Tue, 16 Feb 2016 09:55:16 +0100 [thread overview]
Message-ID: <023c25195bfc8557e3ba08bc02d3bd37@mail01.ipfire.org> (raw)
In-Reply-To: <1455605081-7490-1-git-send-email-lorenz.marcel@web.de>
[-- Attachment #1: Type: text/plain, Size: 4851 bytes --]
pgrep is needed for some scripts e.g the nightly buildscripts so don't
comment it out!
Arne
On 2016-02-16 07:44, Marcel Lorenz wrote:
> ---
> config/rootfiles/common/procps | 41
> +++++++++++++++++++++++++++++++++--------
> lfs/procps | 29 ++++++++++++++---------------
> 2 files changed, 47 insertions(+), 23 deletions(-)
>
> diff --git a/config/rootfiles/common/procps
> b/config/rootfiles/common/procps
> index 2863167..e72b184 100644
> --- a/config/rootfiles/common/procps
> +++ b/config/rootfiles/common/procps
> @@ -1,36 +1,61 @@
> -bin/kill
> bin/ps
> -lib/libproc-3.2.6.so
> sbin/sysctl
> usr/bin/free
> -usr/bin/pgrep
> +#usr/bin/pgrep
> +usr/bin/pidof
> #usr/bin/pkill
> #usr/bin/pmap
> #usr/bin/pwdx
> -#usr/bin/skill
> #usr/bin/slabtop
> -#usr/bin/snice
> #usr/bin/tload
> usr/bin/top
> usr/bin/uptime
> usr/bin/vmstat
> usr/bin/w
> usr/bin/watch
> +#usr/include/proc
> +#usr/include/proc/alloc.h
> +#usr/include/proc/devname.h
> +#usr/include/proc/escape.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/lib/libprocps.la
> +usr/lib/libprocps.so
> +usr/lib/libprocps.so.4
> +usr/lib/libprocps.so.4.0.0
> +#usr/lib/pkgconfig/libprocps.pc
> +#usr/share/doc/procps-ng-3.3.10
> +#usr/share/doc/procps-ng-3.3.10/BUGS
> +#usr/share/doc/procps-ng-3.3.10/FAQ
> +#usr/share/doc/procps-ng-3.3.10/README.top
> +#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/uk/LC_MESSAGES/procps-ng.mo
> +#usr/share/locale/vi/LC_MESSAGES/procps-ng.mo
> #usr/share/man/man1/free.1
> -#usr/share/man/man1/kill.1
> #usr/share/man/man1/pgrep.1
> +#usr/share/man/man1/pidof.1
> #usr/share/man/man1/pkill.1
> #usr/share/man/man1/pmap.1
> #usr/share/man/man1/ps.1
> #usr/share/man/man1/pwdx.1
> -#usr/share/man/man1/skill.1
> #usr/share/man/man1/slabtop.1
> -#usr/share/man/man1/snice.1
> #usr/share/man/man1/tload.1
> #usr/share/man/man1/top.1
> #usr/share/man/man1/uptime.1
> #usr/share/man/man1/w.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/man8/sysctl.8
> #usr/share/man/man8/vmstat.8
> diff --git a/lfs/procps b/lfs/procps
> index ae30f2f..ff44111 100644
> --- a/lfs/procps
> +++ b/lfs/procps
> @@ -24,31 +24,30 @@
>
> include Config
>
> -VER = 3.2.6
> +VER = 3.3.10
>
> -THISAPP = procps-$(VER)
> -DL_FILE = $(THISAPP).tar.gz
> +THISAPP = procps-ng-$(VER)
> +DL_FILE = $(THISAPP).tar.xz
> DL_FROM = $(URL_IPFIRE)
> DIR_APP = $(DIR_SRC)/$(THISAPP)
> TARGET = $(DIR_INFO)/$(THISAPP)
> +PROG = procps-ng
> +PAK_VER = 1
> +DEPS = ""
>
>
> ###############################################################################
> # Top-level Rules
>
> ###############################################################################
>
> objects = $(DL_FILE)
> -
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> -
> -$(DL_FILE)_MD5 = 7ce39ea27d7b3da0e8ad74dd41d06783
> -
> +$(DL_FILE)_MD5 = 1fb7f3f6bf92ce6c5c9ed9949ae858fe
> install : $(TARGET)
> -
> check : $(patsubst %,$(DIR_CHK)/%,$(objects))
> -
> download :$(patsubst %,$(DIR_DL)/%,$(objects))
> -
> md5 : $(subst %,%_MD5,$(objects))
> +dist:
> + @$(PAK)
>
>
> ###############################################################################
> # Downloading, checking, md5sum
> @@ -56,10 +55,8 @@ md5 : $(subst %,%_MD5,$(objects))
>
> $(patsubst %,$(DIR_CHK)/%,$(objects)) :
> @$(CHECK)
> -
> $(patsubst %,$(DIR_DL)/%,$(objects)) :
> @$(LOAD)
> -
> $(subst %,%_MD5,$(objects)) :
> @$(MD5)
>
> @@ -69,9 +66,11 @@ $(subst %,%_MD5,$(objects)) :
>
> $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> @$(PREBUILD)
> - @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) && make $(MAKETUNING) LIBPROC=proc/libproc-$(VER).so
> + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
> + cd $(DIR_APP) && ./configure --prefix=/usr --exec-prefix=
> --libdir=/usr/lib \
> + --docdir=/usr/share/doc/procps-ng-3.3.10 \
> + --disable-static \
> + --disable-kill
> cd $(DIR_APP) && make install
> install -m 0644 $(DIR_SRC)/config/etc/sysctl.conf /etc
> @rm -rf $(DIR_APP)
prev parent reply other threads:[~2016-02-16 8:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-16 6:44 Marcel Lorenz
2016-02-16 8:55 ` Arne Fitzenreiter [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=023c25195bfc8557e3ba08bc02d3bd37@mail01.ipfire.org \
--to=arne.fitzenreiter@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox