Since commit 006a328ad6 ("util-linux: fix
build with ncurses"), we have a build failure that occurs with musl
toolchains when wide-char support is not enabled in ncurses.
The problem comes from the fact that musl provides wchar support (so it
defines wchar_t). But when ncursesw is not available, we currently pass
--disable-widechar which tells util-linux that wchar support is not
available at all (not only in ncurses). When this gets passed to
util-linux configure script, then it defines its own wchar_t, which
conflicts with the musl definition.
So, we should not pass --disable-widechar when BR2_USE_WCHAR=y, which is
what this commit does: it moves the BR2_USE_WCHAR logic outside of the
ncurses logic, and passes --enable-widechar/--disable-widechar as
appropriate.
However, there's a gotcha: util-linux really wants the ncursesw variant
of ncurses when the system has wchar support enabled. We take this into
account by:
- Enabling ncursesw when BR2_PACKAGE_NCURSES_WCHAR=y. In this case, we
have ncurses and we have BR2_USE_WCHAR=y, so everything is fine.
- Otherwise, enabling ncurses when BR2_PACKAGE_NCURSES=y but
BR2_USE_WCHAR is disabled.
To make sure that the existing util-linux programs that need ncurses
support still build fine, we adjust the Config.in to select
BR2_PACKAGE_NCURSES_WCHAR on BR2_USE_WCHAR=y configurations.
Fixes:
http://autobuild.buildroot.net/results/19de2a0b12380ddc86dbba0dae3a3877b25f83ff/
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
util-linux version 2.29 changed ncurses handling a lot. pkg-config
support to detect ncurses is removed from configure.ac and
ncurses-config is used to detect it. But it even didn't allow to
change config file for cross compilation. However, it is fixed in
upstream later and pkg-config support is added back.
This commit adds two patches from upstream that adds pkg-config support
and allows specifying ncurses-config file as well. However preference is
first given to pkg-config and later ncurses-config file. It also first checks
for version 6 and later 5.
Config option that changed are, ncursesw is enabled by default and ncurses
is disabled by default. So we need to explicilty specify with/without wide
char support now. This new version also allows disabling widechar support.
But it can't be enabled if ncurses without widechar support is enabled.
While building ncurses package, we explicitly enable pkg-config support,
so we don't need to specify ncurses-config file, but it is specified for
completeness.
Fixes:
http://autobuild.buildroot.net/results/4a2/4a25fb0d4546391d5dbbaa6cde17c45aeddb3549
Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
Cc: Carlos Santos <casantos@datacom.ind.br>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
lib/colors.c uses HAVE_LIBTINFO to decide whether term.h and ncurses.h
should be included. However, the configure.ac check is bogus: it
checks for tinfo using pkg-config, and then if it fails, checks with
AC_CHECK_LIB(). So, if you have tinfo installed, but not the
corresponding development package, the pkg-config test will fail, but
the AC_CHECK_LIB test will succeed, even though the headers are not
available.
To address this, we explicitly tell host-util-linux that tinfo is not
available, like we're already doing for ncurses.
Fixes:
http://autobuild.buildroot.net/results/3c447e601a7b728860e78cabf2191ab206e6480d/
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
When even a single extra util-linux utility is enabled, the default
build and install will install many more programs, including many that
overlap with those offered by busybox.
Fix by reworking the install-utilies menu to take advantage of the new
--disable-all-programs config option. This option make it possible to
disable the basic set of apps, and then enable only the desired apps.
Original patch by Danomi Manchego, visible at
http://patchwork.ozlabs.org/patch/494866/
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
[Thomas/Arnout: remove the choice between all/custom/no, and simply have
a list of options with the basic set of tools, and then one option for
each tool. This gives the same flexibility, but avoids the choice, which
is never nice to have.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
- Add option to control installation of libfdisk
- Add libfdisk license to the comment in util-linux.mk
- List all utilities provided by the basic set and document that
linux32, linux64, uname26, i386 and x86_64 are symlinks to setarch
- Add options to install cal, ipcrm, ipcs, logger, lslogin and pg
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
[Thomas: add missing dependency of the new lslogins option on
libsmartcols, and therefore !MMU.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
It's a necessary dependency to build the new host-libglib2.
libblkd is an indirect dependency for libmount.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
When linking statically with -lreadline we also need to specify
-lcurses. We were already passing LIBS=-intl to fix gettext related
issues, so we refactor how LIBS is passed so that several values can be
passed.
It is worth mentioning that:
1. Passing LIBS= at configure time is not sufficient, because the
configure script does LIBS="" at its end. So in order for the LIBS
value to also be effective during the build, it needs to be passed
in MAKE_OPTS as well.
2. LIBS=-lintl was only passed at build time (it was not needed for any
of the configure tests). However, LIBS=-lncurses is needed both at
configure time (for configure tests) and at build time. Therefore,
the new variable UTIL_LINUX_LIBS gets passed as the LIBS value at
both configure time and build time.
Fixes:
http://autobuild.buildroot.net/results/70e0a273e699c73c6b2ab2a19c8f7ebb1ddee6cdehttp://autobuild.buildroot.net/results/6a7faf8adbffd9437c0117b9f0e89684c24dad23
Signed-off-by: Chris Packham <judge.packham@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
login and hwclock can be built with audit support. This patch adds
optional dependency on audit package if it is already selected.
Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
fdisk and sfdisk tools can be built with readline support. This patch
adds optional dependency on readline if it is already selected.
Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
--enable-findfs and --enable-lsblk configure options don't exist
anymore. Now, findfs and lsblk are always built by default unless you
pass --disable-all-programs to the configure script.
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Upstream has this patch a while and other projects are using
it already. So better switch to this.
Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Instead of installing login.pam (/etc/pam.d/login) from util-linux
conditionally do so unconditionally from linux-pam.
If busybox login is pam-enabled (linux-pam package enabled) it will be
required, otherwise it will lead to a system where login won't work, and
if util-linux is enabled it will supercede busybox login and will be
necesarry regardless.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit adds an option to the util-linux package that allows to
build the lsblk utility.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Fixes (works around) #8421
Util-linux has optional systemd support, but we cannot enable it as systemd
depends on util-linux, so that would create a circular dependency.
The systemd unit directory location detection also fails as pkg-config
0.9.12+ prefixes all directory variables with the sysroot, and the configure
script expects to see the target location, so disable that as well for good
measure.
The systemd support doesn't seem to add much, so it isn't a big loss.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Instead of doing a removal of the completion file package per package,
do it all at the finalize stage so it's done once and for all.
Note: This fixes an issue with systemd where passing a --bashcompletiondir
or --zshcompletiondir would be evaluated to '.' by the autotools macro.
This would create a 'target./' directory.
Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Add more options to Config.in to allow optionally select or deselect
util-linux tools.
Also fix s/BR2_PACKAGE_WDCTL/BR2_PACKAGE_UTIL_LINUX_WDCTL/
Signed-off-by: Maxim Mikityanskiy <maxtram95@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
package/systemd, package/kmod, package/util-linux: don't install
bash-completion files if bash is not selected to be installed.
Otherwise, install bash-completion files.
package/systemd: don't install zsh-completion files is zsh is not
selected to be installed. Otherwise, install zsh-completion files.
package/util-linux: don't install empty
/usr/share/bash-completion/completions directory if bash is not going to
be installed, and install bash-completion files if bash is selected to
be installed.
Signed-off-by: Maxim Mikityanskiy <maxtram95@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
nsenter is a tool to enter the namespace of another process.
[Thomas: add dependency to 3.0 kernel headers, since the setns()
system call was added in Linux 3.0.]
Signed-off-by: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Use --disable-all-programs configure option instead of sed base
patching of Makefile.am in case no util-linux binaries are selected.
Suggested by Thomas Petazzoni ([1]).
With this patch applied the following libs are no longer build by default:
util-linux-2.25.1/.libs/libfdisk.a
util-linux-2.25.1/.libs/libsmartcols.a
util-linux-2.25.1/.libs/libsmartcols.so.1.1.0
[1] http://lists.busybox.net/pipermail/buildroot/2014-October/109818.html
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
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>
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_INSTALL_STAGING_OPT.
Sed command used:
find * -type f | xargs sed -i 's#_INSTALL_STAGING_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>
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_INSTALL_TARGET_OPT.
Sed command used:
find * -type f | xargs sed -i 's#_INSTALL_TARGET_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>
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_INSTALL_OPT.
Sed command used:
find * -type f | xargs sed -i 's#_INSTALL_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>
While the autotools infrastructure was using FOO_MAKE_OPT, generic packages
were typically using FOO_MAKE_OPTS. This inconsistency becomes a problem
when a new infrastructure is introduced that wants to make use of
FOO_MAKE_OPT(S), and can live alongside either generic-package or
autotools-package. The new infrastructure will have to choose between either
OPT or OPTS, and thus rule out transparent usage by respectively generic
packages or generic packages. An example of such an infrastructure is
kconfig-package, which provides kconfig-related make targets.
The OPTS variant is more logical, as there are typically multiple options.
This patch renames all occurrences of FOO_MAKE_OPT in FOO_MAKE_OPTS.
Sed command used:
find * -type f | xargs sed -i 's#_MAKE_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>
Disable all programs for host build using '--disable-all-programs'
as suggested by Thomas Petazzoni ([1]).
Build libs before patch:
build/host-util-linux-2.25.1/.libs/libsmartcols.so
build/host-util-linux-2.25.1/.libs/libuuid.so
build/host-util-linux-2.25.1/.libs/libfdisk.a
build/host-util-linux-2.25.1/.libs/libcommon.a
Build libs after patch:
build/host-util-linux-2.25.1/.libs/libuuid.so
build/host-util-linux-2.25.1/.libs/libcommon.a
[1] http://lists.busybox.net/pipermail/buildroot/2014-September/106933.html
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Fixes the following compile error (in case neither curses or ncurses
development files are installed on the build host):
text-utils/more.c: In function ‘screen’:
text-utils/more.c:692:4: warning: implicit declaration of function ‘my_putstring’ [-Wimplicit-function-declaration]
text-utils/more.c:692:4: warning: nested extern declaration of ‘my_putstring’ [-Wnested-externs]
text-utils/more.c: In function ‘initterm’:
text-utils/more.c:1798:3: warning: implicit declaration of function ‘my_setupterm’ [-Wimplicit-function-declaration]
text-utils/more.c:1798:3: warning: nested extern declaration of ‘my_setupterm’ [-Wnested-externs]
text-utils/more.c:1806:5: warning: implicit declaration of function ‘my_tgetnum’ [-Wimplicit-function-declaration]
text-utils/more.c:1806:5: warning: nested extern declaration of ‘my_tgetnum’ [-Wnested-externs]
text-utils/more.c:1806:22: error: ‘TERM_LINES’ undeclared (first use in this function)
text-utils/more.c:1806:22: note: each undeclared identifier is reported only once for each function it appears in
text-utils/more.c:1807:23: error: ‘TERM_COLS’ undeclared (first use in this function)
text-utils/more.c:1816:4: warning: implicit declaration of function ‘my_tgetflag’ [-Wimplicit-function-declaration]
text-utils/more.c:1816:4: warning: nested extern declaration of ‘my_tgetflag’ [-Wnested-externs]
text-utils/more.c:1816:34: error: ‘TERM_HARD_COPY’ undeclared (first use in this function)
text-utils/more.c:1821:20: error: ‘TERM_EAT_NEW_LINE’ undeclared (first use in this function)
text-utils/more.c:1827:23: error: ‘TERM_AUTO_RIGHT_MARGIN’ undeclared (first use in this function)
text-utils/more.c:1828:25: error: ‘TERM_CEOL’ undeclared (first use in this function)
text-utils/more.c:1829:4: warning: implicit declaration of function ‘my_tgetstr’ [-Wimplicit-function-declaration]
text-utils/more.c:1829:4: warning: nested extern declaration of ‘my_tgetstr’ [-Wnested-externs]
text-utils/more.c:1829:25: error: ‘TERM_CLEAR_TO_LINE_END’ undeclared (first use in this function)
text-utils/more.c:1830:23: error: ‘TERM_CLEAR’ undeclared (first use in this function)
text-utils/more.c:1831:24: error: ‘TERM_STANDARD_MODE’ undeclared (first use in this function)
text-utils/more.c:1832:23: error: ‘TERM_EXIT_STANDARD_MODE’ undeclared (first use in this function)
text-utils/more.c:1833:31: error: ‘TERM_STD_MODE_GLITCH’ undeclared (first use in this function)
text-utils/more.c:1842:20: error: ‘TERM_UNDERLINE’ undeclared (first use in this function)
text-utils/more.c:1843:23: error: ‘TERM_OVER_STRIKE’ undeclared (first use in this function)
text-utils/more.c:1845:27: error: ‘TERM_UNDERLINE_CHAR’ undeclared (first use in this function)
text-utils/more.c:1848:21: error: ‘TERM_ENTER_UNDERLINE’ undeclared (first use in this function)
text-utils/more.c:1850:17: error: ‘TERM_EXIT_UNDERLINE’ undeclared (first use in this function)
text-utils/more.c:1862:29: error: ‘TERM_PAD_CHAR’ undeclared (first use in this function)
text-utils/more.c:1864:22: error: ‘TERM_HOME’ undeclared (first use in this function)
text-utils/more.c:1867:21: error: ‘TERM_CURSOR_ADDRESS’ undeclared (first use in this function)
text-utils/more.c:1869:10: warning: implicit declaration of function ‘my_tgoto’ [-Wimplicit-function-declaration]
text-utils/more.c:1869:10: warning: nested extern declaration of ‘my_tgoto’ [-Wnested-externs]
text-utils/more.c:1869:10: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
text-utils/more.c:1876:24: error: ‘TERM_CLEAR_TO_SCREEN_END’ undeclared (first use in this function)
text-utils/more.c:1877:27: error: ‘TERM_LINE_DOWN’ undeclared (first use in this function)
text-utils/more.c: In function ‘reset_tty’:
text-utils/more.c:2142:3: warning: implicit declaration of function ‘tputs’ [-Wimplicit-function-declaration]
text-utils/more.c:2142:3: warning: nested extern declaration of ‘tputs’ [-Wnested-externs]
make[4]: *** [text-utils/more-more.o] Error 1
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
In most embedded systems, there is not much point in installing bash
completion files, especially since bash may not necessarily be present
on the target.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
