Commit Graph

24 Commits

Author SHA1 Message Date
Peter Korsgaard
7353967690 Merge branch 'next'
Quite some conflicts, so here goes ..

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-09-02 16:20:33 +02:00
Jeroen Roovers
da3bb9167c package/procps-ng: Bump to version 3.3.12
Signed-off-by: Jeroen Roovers <jer@airfi.aero>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-08-31 16:29:48 +02:00
Thomas Petazzoni
9bccca26fb procps-ng: fix BR2_STATIC_LIBS=y build
The procps-ng package currently fails to build on BR2_STATIC_LIBS=y
configurations. Indeed, by default NUMA support is enabled, and it
requires dlopen(). As hinted by the configure script, passing
--disable-numa allows to disable NUMA support.

However, once this is done, another issue pops up: dlopen() is also used
by the SELinux support. But even when SELinux support is disabled, the
procps-ng code incorrectly includes <dlfcn.h>. This is addressed by the
addition of a patch.

Fixes:

  http://autobuild.buildroot.net/results/b385bf435085728aece6323a5006ba9fa6631744/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-08-09 15:48:46 +02:00
Thomas Petazzoni
1dbd7b9910 package: move busybox show others dependency to per-package
Having the BR2_PACKAGE_BUSYBOX_SHOW_OTHERS dependencies in
package/Config.in is not very practical: it makes this file not very
readable, and puts the dependency away from the package itself, which
can sometimes be confusing. Therefore, this commit moves the dependency
in each package Config.in file.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-07-04 16:12:38 +02:00
Romain Naour
0e07a5edeb package/procps-ng: install libprocps.pc in staging/usr/lib/pkgconfig/
Since 834893a965, pkg-config --libs libprocps
doesn't work anymore because libprocps.pc is installed in
STAGING_DIR/lib/pkgconfig/ instead of STAGING_DIR/usr/lib/pkgconfig/.

Add --libdir=/usr/lib in PROCPS_NG_CONF_OPTS to fixes the issue.
Note that libprocps.so is now installed in /usr/lib/ instead of /lib/.

Fixes:
http://autobuild.buildroot.net/results/2e5/2e5100ccf1ed336c26b83930e7149941c97fc4d2/

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-03-26 18:53:55 +01:00
Bernd Kuhls
834893a965 package/procps-ng: Fix install, procps-ng does not use /usr/bin anymore
We do not need to move binaries around anymore since this commit:
430b559ba2

Removing PROCPS_NG_CONF_OPTS completely leads to binaries being
installed to /usr/bin, we still have to define a custom --exec-prefix
to get binaries in /bin:

libtool: install: /usr/bin/install -c free /home/bernd/buildroot/output/target/bin/free
libtool: install: /usr/bin/install -c pgrep /home/bernd/buildroot/output/target/bin/pgrep
libtool: install: /usr/bin/install -c pkill /home/bernd/buildroot/output/target/bin/pkill
libtool: install: /usr/bin/install -c pmap /home/bernd/buildroot/output/target/bin/pmap
libtool: install: /usr/bin/install -c pwdx /home/bernd/buildroot/output/target/bin/pwdx
libtool: install: /usr/bin/install -c tload /home/bernd/buildroot/output/target/bin/tload
libtool: install: /usr/bin/install -c uptime /home/bernd/buildroot/output/target/bin/uptime
libtool: install: /usr/bin/install -c vmstat /home/bernd/buildroot/output/target/bin/vmstat
libtool: install: /usr/bin/install -c w /home/bernd/buildroot/output/target/bin/w
libtool: install: /usr/bin/install -c pidof /home/bernd/buildroot/output/target/bin/pidof
libtool: install: /usr/bin/install -c kill /home/bernd/buildroot/output/target/bin/kill
libtool: install: /usr/bin/install -c slabtop /home/bernd/buildroot/output/target/bin/slabtop
libtool: install: /usr/bin/install -c watch /home/bernd/buildroot/output/target/bin/watch
libtool: install: /usr/bin/install -c top/top /home/bernd/buildroot/output/target/bin/top

Fixes:

  http://autobuild.buildroot.net/results/ab7/ab7ed83d60823c1b023c7b76fcbe9c20d537ed4c//

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
[Thomas: pass --exec-prefix=/ instead of an empty prefix.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-02-07 21:56:36 +01:00
Bernd Kuhls
8239f45435 package/procps-ng: bump version to 3.3.11 to fix musl build
Rebased 0002-use-pkgconfig-for-ncursesw-cflags.patch

The build error has not yet been found by the autobuilders:

watch.c:564:37: error: request for member ‘chars’ in something not a structure or union
     exit_early = (wchar_t) c != oldc.chars[0];
                                     ^
watch.c:573:5: error: unknown type name ‘cchar_t’
     cchar_t oldc;

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-01-31 13:53:15 +01:00
Vicente Olivert Riera
dab4fcdf7a procps-ng: install binaries in /bin and /sbin
This way the busybox counterparts are overwritten and we will not end up
with procps-ng binaries in /usr/bin and /usr/sbin, and busybox symlinks
for the same tools in /bin and /sbin.

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-01-14 20:52:50 +01:00
Gustavo Zacarias
502565f90a procps-ng: needs gettextize
Fixes:
http://autobuild.buildroot.org/results/904/90401cdb471f9e9582e2ca2ad07fb3db148420d7/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-10 21:53:52 +02:00
Gustavo Zacarias
fb9b9c081a procps-ng: fix/patch wrong ncursesw headers assumption
The configure script/code assumes ncursesw headers live in
/usr/include/ncursesw.
That's a distribution-ism where they want to have both versions for
ABI/API compatibility, but not the case for embedded where that's not a
concern.
Hence kill the hard-coding and use pkg-config to find this out instead
of the half-made effort about it.
Fixes:
http://autobuild.buildroot.net/results/97d/97dc7f238457609c861c24f81b556973f5dec9c1/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Tested-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-08 22:47:34 +02:00
Steven Noonan
ce3feec0fd package/procps-ng: enable UTF-8 support
For an example of why to enable this: https://bugs.archlinux.org/task/38614

Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-04 17:48:48 +02:00
Steven Noonan
c6ce70341a package/procps-ng: use more complete installation prefix
Otherwise we get a /lib/pkgconfig/libprocps.pc for example.

Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-04 17:42:59 +02:00
Steven Noonan
4b70493c07 package/procps-ng: if building with systemd, enable systemd-specific features
[Thomas: add explicit --without-systemd option when systemd is not
available.]

Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-04 17:29:19 +02:00
Thomas Petazzoni
eaa942c404 procps-ng: add dependency on host-pkgconf
procps-ng configure.ac script uses PKG_CHECK_MODULES(), which needs
pkg-config. Until now, it wasn't mandatory since for the ncurses check
it tries PKG_CHECK_MODULES() and then falls back to AC_CHECK_LIB(),
but for the upcoming systemd support, pkg-config is really needed.

Since pkg-config is used both for the ncurses and systemd checks, we
make it a mandatory dependency.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-04 17:27:44 +02:00
Peter Korsgaard
298cd8eaa2 package/*: rename patches according to the new policy
Autogenerated from rename-patch.py (http://patchwork.ozlabs.org/patch/403345)

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-02-03 14:52:56 +01:00
Gustavo Zacarias
d1058c2d2d procps-ng: bump to version 3.3.10
Also add hash file.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-08 19:32:14 +02:00
Thomas De Schampheleire
aaffd209fa packages: rename FOO_CONF_OPT into FOO_CONF_OPTS
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_CONF_OPT.

Sed command used:
   find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g'

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-04 18:54:16 +02:00
Vicente Olivert Riera
8b33a9531c procps-ng: Fix installation and take precedence over busybox
Currently procps-ng binaries are installed under $(TARGET_DIR)/usr/usr
instead of $(TARGET_DIR)/usr, which would be the expected. This is
caused because the default value of the --exec-prefix configure option
is /usr, and Buildroot always adds --prefix=/usr to the configure
option. We fix this by setting --exec-prefix to an empty value.

At the same time we make sure the procps-ng binaries have precedence
over the busybox ones.

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Reviewed-by: Markos.Chandras <Markos.Chandras@imgtec.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-09-13 23:55:51 +02:00
Karoly Kasza
5fd85ab0d1 procps-ng: add INSTALL_STAGING=YES
Procps-ng libraries needed in the staging directory by
the new package openvmtools.

Signed-off-by: Karoly Kasza <kaszak@gmail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-09-05 13:37:49 +02:00
Romain Naour
47128a9b82 package/procps-ng: fix linking with intl
procps-ng doesn't build with (e)glibc toolchain when gettext package is
selected.

With (e)glibc libintl is provided by the libc whereas with uClibc it's provided
by gettext.

Linking with intl is only needed if the toolchain needs gettext and locale is
set.

Fixes:
http://autobuild.buildroot.net/results/3e8/3e8464e0b00ce22fa02a6337159fca250d86425c/build-end.log

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Tested-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-08-25 19:55:20 +02:00
Yuvaraj Patil
96527e6d52 procps-ng: Depends on MMU
This package needs MMU. Hence added dependency on BR2_USE_MMU

Fixes:
http://autobuild.buildroot.net/results/f24/f24aa16857e91fb6b03f9ac7ab0442fedcab8546//

Signed-off-by: Yuvaraj Patil <yuvaraj.patil@wipro.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-08-14 10:05:53 +02:00
Jerzy Grzegorek
07630c4ca6 packages: fix the header package name
According to the documentation:

"Header: The file starts with a header. It contains the module name,
preferably in lowercase, enclosed between separators made of 80 hashes."

This patch makes the appropriate changes.

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-06-24 15:35:47 +02:00
Yann E. MORIN
6a54ade566 package/procps-ng: needs gettext if locales
Fixes:
    http://autobuild.buildroot.net/results/88a/88a2c8907dce0e5abe0d544ce9a2875dfdcc9e7c/

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-06-03 20:57:15 +02:00
Yann E. MORIN
5cd1c4feb5 package/procps: bump version and rename to procps-ng
procps is getting replaced by procps-ng, and there are
new versions available!

procps-ng is now an autotools package, so get rid of our
custom build/install rules.

Remove most patches, except for one that still half-applies,
so update and rename it.

procps is dead, long live procps-ng!

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-06-02 22:32:37 +02:00