When gettext is needed (with locales), libuuid needs to be linked
against -lintl.
In dynamic link, this is solved via the DT_NEEDED ELF tag, but for
static links, it does not get pulled in automatically.
Fix that by adding a Libs.private section to uuid.pc, but only if
it needed.
First part at fixing:
http://autobuild.buildroot.net/results/c46/c467aeec258909bb82eda77123803944f97d8df8/
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
In commit 442aa88f95 ("util-linux: bump
version and revamp options"), Gustavo disabled util-linux libmount and
binaries on microblaze, as it was not building properly.
However, as mentionned in the comment, these options were disabled on
Microblaze due to "libc lacks UTIME_NOW & UTIME_COMMIT for
libmount". This was true specifically for the microblaze external
toolchain that we were using at the time. But we are no longer using
this external toolchain (which proved to be broken in many ways), and
have microblaze support in our internal backend.
I have verified that with our internal toolchain, util-linux with
libmount and the binaries enabled builds fine.
Those options are not selected by anything else in Buildroot, so
there's no other package impacted by this dependency change.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.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>
Even when compiled with --enable-static --disable-shared, util-linux
creates some incorrect libuuid.so, libblkid.so and libmount.so
symbolic links, which confuses the compiler which thinks that a shared
library is available. This causes some build issues such as:
http://autobuild.buildroot.org/results/990/9909d198ce14969d0e9d29a34fcc33f0ef79220d/
This commit fixes that by adding a patch to util-linux that fixes this
issue. The patch has been submitted upstream at
http://article.gmane.org/gmane.linux.utilities.util-linux-ng/9262.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.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>
mkostemp() is missing with older version of uClibc (uClibc <= 0.9.33).
So, we need to check if mkostemp() is available.
If not, we use a wrapper function based on mkstemp() to implement it.
Since util-linux v2.23, mkostemp() is called with O_CLOEXEC flag.
If we use a define to mkstemp() to implement mkostemp(), flags will be
discared.
mkstemp() will pass O_RDWR|O_CREAT|O_EXCL, but not O_CLOEXEC, which
means that the file descriptor will no longer be closed automatically
upon exec().
To avoid to discard the flags, we add a call to fcntl() to set O_CLOEXEC
flag just after mkstemp().
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Removed "support older machines" patch as it has been fixed upstream,
fixed up other patches.
This removes some arch-dependencies in fdiskbsdlabel.h, fixing the
build for the ARC-architecture.
This fixes:
http://autobuild.buildroot.net/results/8863799d856ccab51ee8ffd499378574ef166aee/
Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Anton Kolesov <Anton.Kolesov@synopsys.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
The libblkid library in util-linux uses fork. While it seems
potentially possible to disable the parts of the library that use fork
(the only parts using fork are parts related to LVM and Device Mapper,
which are said to be legacy as they are replaced by sysfs based
scanning, instead of having to fork to run a separate process).
However, since libblkid is used by:
- e2fsprogs, which uses lots of fork all over the place
- udev, which most likely will also need fork
There is not much point in making libblkid fork-less. As a
consequence, this commit makes util-linux/libblkid unavailable on
non-MMU architectures, and propagates the relevant dependency to the
reverse dependencies of libblkid.
This fixes the e2fsprogs build failure seen on Blackfin. The failure
was due to a configure test of e2fsprogs which was trying to link a
small test program against libblkid, which failed because there was an
undefined reference to fork() in the libblkid code.
Fixes:
http://autobuild.buildroot.net/results/ee2c1568d16ac040011dd4d6d8b543ff9e9e2622/
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This reverts commit 2746158497. This
commit is causing build issues when chfn/chsh are selected, due to bad
interactions with PAM. The initial submitter of the patch has agreed
to work on an improved version that fixes those problems, but in the
mean time, we revert this commit to prevent the problem from occuring
in the autobuilders.
Fixes:
http://autobuild.buildroot.org/results/820/8204008da6944923034fa17ecbcfefcf15373ee5/build-end.log
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
[Peter: adjust white space and commit message]
Signed-off-by: Shawn Landden <shawn@churchofgit.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
When busybox isn't installed symlink agetty->getty to make the default
inittab work.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Install PAM configuration files for su (with "su -" variant) and login
when the tools are enabled.
This finally fixes bug #5366 and now we can login with an util-linux
/bin/login.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
The patch has a minor mistake so fix it.
Credit go to Daniel Mentz <daniel@exxm.de> for the detailed bug report.
Closes bug #6428
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This patch fixes the following whitespace problems in Config.in files:
- trailing whitespace
- spaces instead of tabs for indentation
- help text not indented with tab + 2 spaces
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Ncurses not necessary when building host-util-linux, so passing
--without-ncurses avoids from misdetecting an installed host ncurses
on the build machine.
[Thomas: improve commit message]
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This patch lines up the comments in Config.in files that clarify which
toolchain options the package depends on.
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
[Peter: leave change xz tarball format to not end up with circular deps]
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Removed patches that were are now in version 2.23 of util-linux along with
fixed up other patches so they apply cleanly.
Signed-off-by: Ryan Barnett <rjbarnet@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Also add missing select in Config.in.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This fixes the following errors when building util-linux v2.22.2 for
the host in case the PAM headers are missing:
configure: error: login selected, but required PAM header file not available
configure: error: su selected, but required PAM header file not available
Signed-off-by: Christophe Vu-Brugier <cvubrugier@lacie.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Bump to latest 2.22.2 version and revamp available options.
* Remove the assumed enable/disable defaults since these seem to change
quite often, so do what's wise and always enable/disable things.
* Switch from build "X" menu options to just X, add some help and sort.
* Introduce new option to install binaries (or not) to reduce bloat for
packages that just need libblkid and/or libuuid.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
[Thomas Petazzoni: rename patch to not have the package version in the
patch file name, adjust the commit title.]
Signed-off-by: Chris Zankel <chris@zankel.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
As we are going to add an Xtensa related patch that needs to be
applied *after* the AArch64 patch, let's first add a number to each
util-linux patch file name, so that we know they will be applied in
the right order.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
util-linux-2.20.1-sscanf-no-ms-as.patch has a version in its name, and
therefore the other patch, unversioned,
util-linux-uclibc-build-fix.patch, never gets applied.
Fix this by renaming util-linux-2.20.1-sscanf-no-ms-as.patch to
util-linux-sscanf-no-ms-as.patch.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Gustavo Zacarias
Yann E. MORIN
Thomas Petazzoni
Peter Seiderer
Thomas De Schampheleire
Samuel Martin
Paul Cercueil
Romain Naour
Mischa Jonker
Peter Korsgaard
Danomi Manchego
Shawn Landden
Simon Dawson
Olivier Schonken
Ryan Barnett
Jerzy Grzegorek
Arnout Vandecappelle (Essensium/Mind)
Alexandre Belloni
Christophe Vu-Brugier
Chris Zankel