Commit Graph

66 Commits

Author SHA1 Message Date
Yann E. MORIN
273f23a452 package/busybox: invert dependency with kmod
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2018-07-08 13:08:05 +02:00
Yann E. MORIN
dac25351e6 package/kmod: fix host install
The host directory no longer uses /usr.

This currently works because we still have the  legacy /usr
symlink, but for correctness it is better that we just fix it.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Yegor Yefremov <yegorslists@googlemail.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Cc: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-04-09 11:18:29 +02:00
Thomas Petazzoni
72c77544ba kmod: add patch to fix build failure with old gcc versions
When building with old gcc versions (such as gcc 4.3), the current
version of kmod fails with:

shared/util.c:52: error: expected identifier or '(' before 'do'
shared/util.c:52: error: expected identifier or '(' before 'while'

This is due to a use of the internal assert_cc() macro outside of a
function, while this macro is defined for old gcc versions in a way that
cannot be used outside functions.

This wasn't noticed by the autobuilders because we don't have such old
target compilers. On the host side, we have some autobuilder instances
with such old gcc versions, but host-kmod is only used by the linux
package, which is never tested by the autobuilders.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-06-07 09:27:11 +02:00
Rahul Bedarkar
30a3e8d108 boot, package: use SPDX short identifier for LGPLv2.1/LGPLv2.1+
We want to use SPDX identifier for license string as much as possible.
SPDX short identifier for LGPLv2.1/LGPLv2.1+ is LGPL-2.1/LGPL-2.1+.

This change is done using following command.
find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/LGPLv2.1(\+)?/LGPL-2.1\1/g'

Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-04-01 15:18:10 +02:00
Rahul Bedarkar
af31c309e7 boot, linux, package: use SPDX short identifier for GPLv2/GPLv2+
We want to use SPDX identifier for license strings as much as possible.
SPDX short identifier for GPLv2/GPLv2+ is GPL-2.0/GPL-2.0+.

This change is done by using following command.
find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/\<GPLv2\>/GPL-2.0/g'

Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-04-01 15:16:38 +02:00
Peter Korsgaard
fd89246426 Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-03-01 17:37:33 +01:00
Rahul Bedarkar
6356562788 kmod: bump to version 24
Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-02-26 21:42:55 +01:00
Waldemar Brodkorb
0d81107f02 kmod: workaround for microblaze ld bug
Add a workaround for a microblaze specific ld bug to avoid
segfault.

Fixes:
  http://autobuild.buildroot.net/results/aef1b915ffd3e5678af8682727c22c5618edfd89

[Peter: force --gc-sections configure check to false instead of patching
 	configure]
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-02-19 22:27:14 +01:00
Rahul Bedarkar
1ab240a14b kmod: annotate licenses with components
library libkmod.so is licensed under LGPLv2.1+ and kmod tools are
licensed under GPLv2+.

Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-10-19 23:28:09 +02:00
Vicente Olivert Riera
15308d6ed3 kmod: bump version to 23
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-07-20 21:24:18 +02:00
Peter Korsgaard
0e6ca919f1 kmod: bump version to 22
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-11-24 22:37:24 +01:00
Chris Lesiak
2aca24c4d1 kmod: Fix tool links when BR2_ROOTFS_MERGED_USR
[Peter: use KMOD_BIN_PATH instead of doubling logic, add comment explaining
	why this is needed]
Signed-off-by: Chris Lesiak <chris.lesiak@licor.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-10-26 17:48:02 +01:00
Thomas De Schampheleire
51bdd8134c kmod: remove unnecessary autoreconf
Commit 047fea1d4f removed a patch on kmod that
was the reason for autoreconfiguring kmod, but autoreconf itself was not
removed.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-07-18 11:11:31 +02:00
Maxime Hadjinlian
76d1c729f0 package: Remove shell completion at finalize stage
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>
2015-07-12 21:55:14 +02:00
Max Filippov
e678b07bad Revert "kmod: disable --gc-sections ld option when building for xtensa"
This reverts commit 55c83179c4.
Now that binutils bug with --gc-section is fixed this workaroud is no
longer needed.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-05-16 18:28:06 +02:00
Gustavo Zacarias
f4716f79a0 packages: remove (non-)lfs dependencies and tweaks
Now that largefile is mandatory removes package dependencies and
conditionals.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-01 22:47:22 +02:00
Fabio Porcedda
6b18583416 kmod: needs largefile
Since version 20 it requires largefile support.

http://git.kernel.org/cgit/utils/kernel/kmod/kmod.git/commit/?id=481ad14550087c77c9df6d117c7a975a38a4ad33
 - Disable --disable-largefile. We already had possible bugs in the
   index implementation if this were passed. It's now fixed, but it's
   never tested. Disable it.

Fix build failure:
configure: error: --disable-largefile is not supported by kmod
package/pkg-generic.mk:172: recipe for target 'output/build/kmod-20/.stamp_configured' failed

Fixes:
http://autobuild.buildroot.net/results/f662d9230e4bc2da7dc56a2ffd493cc37254d377//
http://autobuild.buildroot.net/results/233ec8ee346e15d41658cffc6bbb4a6c9dd46746//

[Thomas:
 - use two separate 'depends on' conditions for BR2_STATIC_LIBS and
   BR2_LARGEFILE, like we do in most packages.
 - take this opportunity to also indicate the dependency on dynamic
   library in the comment, which was missing until now.]

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Cc: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-03-04 19:29:54 +01:00
Vicente Olivert Riera
ca079a1fc2 kmod: bump version to 20
- Bump version to 20
- Update the hash file

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-03-02 23:46:52 +01:00
Maxim Mikityanskiy
10e6284b70 package: install bash-completion files only with bash
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>
2015-01-26 22:47:51 +01:00
Thomas Petazzoni
665e13c85e Rename BR2_PREFER_STATIC_LIB to BR2_STATIC_LIBS
Since a while, the semantic of BR2_PREFER_STATIC_LIB has been changed
from "prefer static libraries when possible" to "use only static
libraries". The former semantic didn't make much sense, since the user
had absolutely no control/idea of which package would use static
libraries, and which packages would not. Therefore, for quite some
time, we have been starting to enforce that BR2_PREFER_STATIC_LIB
should really build everything with static libraries.

As a consequence, this patch renames BR2_PREFER_STATIC_LIB to
BR2_STATIC_LIBS, and adjust the Config.in option accordingly.

This also helps preparing the addition of other options to select
shared, shared+static or just static.

Note that we have verified that this commit can be reproduced by
simply doing a global rename of BR2_PREFER_STATIC_LIB to
BR2_STATIC_LIBS plus adding BR2_PREFER_STATIC_LIB to Config.in.legacy.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
2014-12-11 22:48:13 +01:00
Vicente Olivert Riera
047fea1d4f kmod: bump to version 19
- Bump to version 19
- Rename 0001 patch to follow the new name convention
- Adapt the 0001 patch to the new version
- Remove the already-upstreamed 0002 patch
- Update the hash value

[Thomas: adapt comment in the updated 0001 patch.]

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-11-18 14:18:34 +01:00
Gustavo Zacarias
480b8c7f67 kmod: add hash file
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-16 07:10:41 +02:00
Gustavo Zacarias
3d6392e37e kmod: needs to autoreconf
Fixes:
http://autobuild.buildroot.net/results/7a7/7a70b179f17070d0a0883f71c60030dd7d8a9102/
Didn't see widespread failure because it autoreconfed on its own just
fine if autotools infra was already present.
And didn't work before the automake patch with AUTORECONF=YES because of
an older gtk-doc.m4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Tested-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-12 11:03:12 +02:00
Thomas De Schampheleire
cc7da4743e kmod: add patches to support build on RHEL 5
kmod uses certain features not available on older RHEL 5 machines (RedHat
Enterprise Linux). This commit adds two patches to fix that.

Both patches have been proposed upstream, the second one being accepted, the
first rejected with the suggestion to add the patch in Buildroot instead.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 16:24:59 +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
Jerzy Grzegorek
c7f4b96471 package: remove the trailing slash sign from <PKG>_SITE variable
Since the trailing slash is stripped from $($(PKG)_SITE) by pkg-generic.mk:

$(call DOWNLOAD,$($(PKG)_SITE:/=)/$($(PKG)_SOURCE))

so it is redundant.
This patch removes it from $(PKG)_SITE variable for BR consistency.

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-07-31 23:17:46 +02:00
Peter Korsgaard
c85db1ed49 kmod: bump version
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-06-19 17:50:39 +02:00
Peter Korsgaard
9f049a8a87 kmod: python support works with python 3.x as well
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-04-12 00:58:01 +02:00
Peter Korsgaard
e4a021d63c kmod: bump version
And add optional support for the python bindings.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-04-11 20:57:27 +02:00
Max Filippov
55c83179c4 kmod: disable --gc-sections ld option when building for xtensa
This is a workaround for the following ld issue exhibited by --gc-sections
option, until a proper fix for binutils is ready:

ld: BFD (GNU Binutils) 2.22 internal error, aborting at elf32-xtensa.c line 3374 in elf_xtensa_finish_dynamic_sections

Fixes:

  http://autobuild.buildroot.org/results/97d/97d4c96d6f6cdc1ed4007456f4ab70be9dfa41b5/

Suggested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-03-04 23:18:21 +01:00
Peter Korsgaard
674fd4f834 kmod: really pass --disable-manpages
The line below overwrites KMOD_CONF_OPT, so move the --disable-manpages
options below.

Fixes http://autobuild.buildroot.net/results/842/842131307c171e1bc5a1e918996d53b00ddb1be3/

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-09 09:35:54 +01:00
Thomas De Schampheleire
7164a32632 packages: remove support for documentation on target
This patch removes deprecated symbol BR2_HAVE_DOCUMENTATION and all its
usage. Additionally, it removes the now unused BR2_DEPRECATED_SINCE_2012_11.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-08 23:31:21 +01:00
Thomas De Schampheleire
35eaed8d07 Config.in files: use if/endif instead of 'depends on' for main symbol
In the Config.in file of package foo, it often happens that there are other
symbols besides BR2_PACKAGE_FOO. Typically, these symbols only make sense
when foo itself is enabled. There are two ways to express this: with
    depends on BR2_PACKAGE_FOO
in each extra symbol, or with
    if BR2_PACKAGE_FOO
        ...
    endif
around the entire set of extra symbols.

The if/endif approach avoids the repetition of 'depends on' statements on
multiple symbols, so this is clearly preferred. But even when there is only
one extra symbol, if/endif is a more logical choice:
- it is future-proof for when extra symbols are added
- it allows to have just one strategy instead of two (less confusion)

This patch modifies the Config.in files accordingly.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-12-25 12:21:39 +01:00
Axel Lin
a5ade62999 kmod: bump to version 16
kmod-0001-Add-configure-check-for-_Static_assert.patch is already merged in
upstream.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-12-25 10:11:15 +01:00
Peter Korsgaard
1d341b76c1 package: drop unneeded HOST_<pkg>_AUTORECONF = YES
Since 97c687000 (pkg-autotools.mk: default host AUTORECONF{,_OPT} to the
target values) we automatically enable autoreconf for host builds if it
is enabled for the target, so these can go.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-04 14:57:38 +02:00
Peter Korsgaard
24058f10a7 kmod: disable manpages for host-kmod
The manpages are not installed to HOST_DIR anyway, and it errors out if
xsltproc isn't available on the host.
2013-09-04 12:36:09 +02:00
Peter Korsgaard
fac638d2ff kmod: explicitly define host-kmod dependencies
So we don't end up pulling in host-busybox (which doesn't exist) if
KMOD_TOOLS is enabled.

Reported-by: Sagaert Johan <sagaert.johan@skynet.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-04 10:54:20 +02:00
Thomas Petazzoni
b7c0041c31 kmod: does not support static builds
Since kmod 14, the support for building a static library has been
removed completely from kmod. Therefore, we mark kmod as
!BR2_PREFER_STATIC_LIB, as well as all its reverse dependencies, which
includes the option to use the "udev" /dev management method.

[Peter: show comment for udev when BR2_PREFER_STATIC_LIB is enabled]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-02 23:22:14 +02:00
Peter Korsgaard
4ce8af8632 Remove references to module-init-tools
Now that it is replaced by kmod.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-02 23:01:34 +02:00
Thomas Petazzoni
00deac473c kmod: allow to build a host variant
Since module-init-tools is deprecated, we now want to use kmod instead
for the installation of modules during the kernel build process. In
order to do this, we need to be able to build a host variant of kmod,
which is want this patch allows to do.

Note that only the depmod tool is installed on the host, since that's
the only one likely to be used on the host in a cross-compilation
context.

[Peter: needs AUTORECONF for the host as well. Fix comment while we're at it]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-02 22:59:00 +02:00
Thomas Petazzoni
528d15721b kmod: indent properly the KMOD_INSTALL_TOOLS macro
The KMOD_INSTALL_TOOLS macro uses a non-conventional indentation. This
commit fixes this.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-02 22:45:06 +02:00
Thomas Petazzoni
58f6d0a285 kmod: bump to version 15
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-02 22:16:47 +02:00
Thomas Petazzoni
10f1903f4f kmod: fix build failure on gcc < 4.6 caused by _Static_assert()
This commit introduces a patch to kmod that ensures _Static_assert()
is only used if available. The patch has been submitted upstream.

Fixes:

  http://autobuild.buildroot.net/results/9daf0f46642020591731e20d3bf9041ff6259846/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-28 23:59:26 +02:00
Peter Korsgaard
3c3211ccde kmod: bump version
syscall patch is now upstream and static linking is no longer supported.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-07-03 21:40:53 +02:00
Alexandre Belloni
8dfd59d114 Normalize separator size to 80
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-06 22:30:24 +02:00
Danomi Manchego
a13afc1145 kmod: adjust license info based on kmod tools selection
The libkmod is licensed as LGPL, while the kmod tools are GPL.
We always install libkmod, but conditionally install the tools.
This patch adjusts the license variables accordingly.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-05 10:42:04 +02:00
Jeremy Rosen
46da491ecd kmod : protect against architectures without __NR_finit_module
This bug caused udev to fail to load any module, crashing with Illegal
instruction.

The patch was taken from upstream and should be integrated in the next
version of kmod (version 14)

Signed-off-by: Jérémy Rosen <jeremy.rosen@openwide.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-05-29 21:29:04 +02:00
Simon Dawson
28a7f942ae kmod: add license information
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-04-15 23:48:14 +02:00
Peter Korsgaard
bbf9ed5bf1 kmod: bump version
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-04-12 12:18:27 +02:00
Peter Korsgaard
c27d252f35 kmod: bump version
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-12-15 22:19:49 +01:00