* [Buildroot] [PATCH 0/3] Replace module-init-tools by kmod
@ 2013-08-20 11:05 Thomas Petazzoni
2013-08-20 11:05 ` [Buildroot] [PATCH 1/3] kmod: allow to build a host variant Thomas Petazzoni
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2013-08-20 11:05 UTC (permalink / raw)
To: buildroot
Hello,
Here is a set of three patches that replace module-init-tools by kmod,
since module-init-tools has been deprecated upstream.
kmod is already packaged, but we had a host variant (in patch 1) so
that the Linux kernel build logic can use it (patch 2), and finally we
remove the module-init-tools package and add the corresponding
Config.in.legacy entries (patch 3).
This is intended for 2013.11.
Thomas
Thomas Petazzoni (3):
kmod: allow to build a host variant
linux: use kmod instead of module-init-tools
module-init-tools: remove package
Config.in.legacy | 11 +++++
linux/linux.mk | 2 +-
package/Config.in | 3 --
package/kmod/kmod.mk | 9 +++++
package/module-init-tools/Config.in | 9 -----
...nit-tools-3.15-add-manpages-config-option.patch | 47 ----------------------
package/module-init-tools/module-init-tools.mk | 28 -------------
7 files changed, 21 insertions(+), 88 deletions(-)
delete mode 100644 package/module-init-tools/Config.in
delete mode 100644 package/module-init-tools/module-init-tools-3.15-add-manpages-config-option.patch
delete mode 100644 package/module-init-tools/module-init-tools.mk
--
1.8.1.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/3] kmod: allow to build a host variant
2013-08-20 11:05 [Buildroot] [PATCH 0/3] Replace module-init-tools by kmod Thomas Petazzoni
@ 2013-08-20 11:05 ` Thomas Petazzoni
2013-08-21 20:07 ` Arnout Vandecappelle
2013-08-20 11:05 ` [Buildroot] [PATCH 2/3] linux: use kmod instead of module-init-tools Thomas Petazzoni
2013-08-20 11:05 ` [Buildroot] [PATCH 3/3] module-init-tools: remove package Thomas Petazzoni
2 siblings, 1 reply; 6+ messages in thread
From: Thomas Petazzoni @ 2013-08-20 11:05 UTC (permalink / raw)
To: buildroot
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.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/kmod/kmod.mk | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index 72a24af..8951a56 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -53,4 +53,13 @@ else
KMOD_CONF_OPT += --disable-tools
endif
+define HOST_KMOD_INSTALL_TOOLS
+ mkdir -p $(HOST_DIR)/sbin/
+ for i in depmod insmod lsmod modinfo modprobe rmmod; \
+ do ln -sf ../usr/bin/kmod $(HOST_DIR)/sbin/$$i; done
+endef
+
+HOST_KMOD_POST_INSTALL_HOOKS += HOST_KMOD_INSTALL_TOOLS
+
$(eval $(autotools-package))
+$(eval $(host-autotools-package))
--
1.8.1.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/3] linux: use kmod instead of module-init-tools
2013-08-20 11:05 [Buildroot] [PATCH 0/3] Replace module-init-tools by kmod Thomas Petazzoni
2013-08-20 11:05 ` [Buildroot] [PATCH 1/3] kmod: allow to build a host variant Thomas Petazzoni
@ 2013-08-20 11:05 ` Thomas Petazzoni
2013-08-20 11:05 ` [Buildroot] [PATCH 3/3] module-init-tools: remove package Thomas Petazzoni
2 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2013-08-20 11:05 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
linux/linux.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linux/linux.mk b/linux/linux.mk
index 578d535..025fd51 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -35,7 +35,7 @@ endif
LINUX_PATCHES = $(call qstrip,$(BR2_LINUX_KERNEL_PATCH))
LINUX_INSTALL_IMAGES = YES
-LINUX_DEPENDENCIES += host-module-init-tools host-lzop
+LINUX_DEPENDENCIES += host-kmod host-lzop
ifeq ($(BR2_LINUX_KERNEL_UBOOT_IMAGE),y)
LINUX_DEPENDENCIES += host-uboot-tools
--
1.8.1.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 3/3] module-init-tools: remove package
2013-08-20 11:05 [Buildroot] [PATCH 0/3] Replace module-init-tools by kmod Thomas Petazzoni
2013-08-20 11:05 ` [Buildroot] [PATCH 1/3] kmod: allow to build a host variant Thomas Petazzoni
2013-08-20 11:05 ` [Buildroot] [PATCH 2/3] linux: use kmod instead of module-init-tools Thomas Petazzoni
@ 2013-08-20 11:05 ` Thomas Petazzoni
2013-08-21 20:51 ` Arnout Vandecappelle
2 siblings, 1 reply; 6+ messages in thread
From: Thomas Petazzoni @ 2013-08-20 11:05 UTC (permalink / raw)
To: buildroot
This commit removes the module-init-tools package and adds the
relevant Config.in.legacy entries to ease the migration for users.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Config.in.legacy | 11 +++++
package/Config.in | 3 --
package/module-init-tools/Config.in | 9 -----
...nit-tools-3.15-add-manpages-config-option.patch | 47 ----------------------
package/module-init-tools/module-init-tools.mk | 28 -------------
5 files changed, 11 insertions(+), 87 deletions(-)
delete mode 100644 package/module-init-tools/Config.in
delete mode 100644 package/module-init-tools/module-init-tools-3.15-add-manpages-config-option.patch
delete mode 100644 package/module-init-tools/module-init-tools.mk
diff --git a/Config.in.legacy b/Config.in.legacy
index 763f16c..ac6f088 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -45,6 +45,17 @@ comment "build, or run, in unpredictable ways. "
endif
###############################################################################
+comment "Legacy options removed in 2013.11"
+
+config BR2_PACKAGE_MODULE_INIT_TOOLS
+ bool "module-init-tools replaced by kmod"
+ select BR2_PACKAGE_KMOD
+ select BR2_PACKAGE_KMOD_TOOLS
+ help
+ The 'module-init-tools' package has been removed, since it
+ has been depracated upstream and replaced by 'kmod'.
+
+###############################################################################
comment "Legacy options removed in 2013.08"
config BR2_ARM_OABI
diff --git a/package/Config.in b/package/Config.in
index 7069d77..4ef8430 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -896,9 +896,6 @@ source "package/cpuload/Config.in"
source "package/htop/Config.in"
source "package/keyutils/Config.in"
source "package/kmod/Config.in"
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-source "package/module-init-tools/Config.in"
-endif
source "package/monit/Config.in"
source "package/ncdu/Config.in"
source "package/numactl/Config.in"
diff --git a/package/module-init-tools/Config.in b/package/module-init-tools/Config.in
deleted file mode 100644
index 77e3bce..0000000
--- a/package/module-init-tools/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config BR2_PACKAGE_MODULE_INIT_TOOLS
- bool "module-init-tools"
- help
- The module-init-tools package contains a set of programs for
- loading, inserting, and removing kernel modules for Linux
- (versions 2.5.48 and above). It serves the same function that
- the "modutils" package serves for Linux 2.4.
-
- http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/
diff --git a/package/module-init-tools/module-init-tools-3.15-add-manpages-config-option.patch b/package/module-init-tools/module-init-tools-3.15-add-manpages-config-option.patch
deleted file mode 100644
index 28f51de..0000000
--- a/package/module-init-tools/module-init-tools-3.15-add-manpages-config-option.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Disable manual pages generation when docbook2man is not available.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- Makefile.am | 7 ++++++-
- configure.ac | 7 +++----
- 2 files changed, 9 insertions(+), 5 deletions(-)
-
-Index: module-init-tools-3.11/Makefile.am
-===================================================================
---- module-init-tools-3.11.orig/Makefile.am
-+++ module-init-tools-3.11/Makefile.am
-@@ -39,7 +39,12 @@
- MAN5 = modprobe.conf.5 modules.dep.5 depmod.conf.5 modprobe.d.5
- MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8
- SGML = $(addprefix doc/, $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml))
--dist_man_MANS = $(MAN5) $(MAN8)
-+
-+if HAVE_DOCBOOKTOMAN
-+MANPAGES = $(MAN5) $(MAN8)
-+endif
-+dist_man_MANS = $(MANPAGES)
-+
- # If they haven't overridden mandir, fix it (never /man!)
- mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi)
-
-Index: module-init-tools-3.11/configure.ac
-===================================================================
---- module-init-tools-3.11.orig/configure.ac
-+++ module-init-tools-3.11/configure.ac
-@@ -29,13 +29,12 @@
- AC_PROG_CC
- AC_PROG_RANLIB
-
--AC_CHECK_PROGS(DOCBOOKTOMAN, docbook-to-man docbook2man, [no],)
--if test x"$DOCBOOKTOMAN" = xno
-+AC_CHECK_PROGS(DOCBOOKTOMAN, docbook-to-man docbook2man)
-+if test x"$DOCBOOKTOMAN" = x
- then
- AC_MSG_WARN([docbook2man not found])
-- # fail with a meaningfull error if $DOCBOOKTOMAN called by the makefile
-- DOCBOOKTOMAN=docbook2man
- fi
-+AM_CONDITIONAL([HAVE_DOCBOOKTOMAN], [test "x$DOCBOOKTOMAN" != "x"])
-
- # Delay adding the zlib_flags until after AC_PROG_CC, so we can distinguish
- # between a broken cc and a working cc but missing libz.a.
diff --git a/package/module-init-tools/module-init-tools.mk b/package/module-init-tools/module-init-tools.mk
deleted file mode 100644
index 88abec4..0000000
--- a/package/module-init-tools/module-init-tools.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-################################################################################
-#
-# module-init-tools
-#
-################################################################################
-
-MODULE_INIT_TOOLS_VERSION = 3.15
-MODULE_INIT_TOOLS_SOURCE = module-init-tools-$(MODULE_INIT_TOOLS_VERSION).tar.bz2
-MODULE_INIT_TOOLS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/module-init-tools/
-MODULE_INIT_TOOLS_LICENSE = GPLv2+
-MODULE_INIT_TOOLS_LICENSE_FILES = COPYING
-
-MODULE_INIT_TOOLS_CONF_ENV = ac_cv_prog_DOCBOOKTOMAN=''
-MODULE_INIT_TOOLS_CONF_OPT = \
- --disable-static-utils \
- --disable-builddir \
- --program-transform-name=''
-
-# module-init-tools-3.15-add-manpages-config-option.patch is modifying
-# configure.ac and Makefile.am
-MODULE_INIT_TOOLS_AUTORECONF = YES
-HOST_MODULE_INIT_TOOLS_AUTORECONF = YES
-HOST_MODULE_INIT_TOOLS_CONF_ENV = ac_cv_prog_DOCBOOKTOMAN=''
-HOST_MODULE_INIT_TOOLS_CONF_OPT = --disable-static-utils
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
-
--
1.8.1.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/3] kmod: allow to build a host variant
2013-08-20 11:05 ` [Buildroot] [PATCH 1/3] kmod: allow to build a host variant Thomas Petazzoni
@ 2013-08-21 20:07 ` Arnout Vandecappelle
0 siblings, 0 replies; 6+ messages in thread
From: Arnout Vandecappelle @ 2013-08-21 20:07 UTC (permalink / raw)
To: buildroot
On 20/08/13 13:05, Thomas Petazzoni wrote:
> 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.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
> package/kmod/kmod.mk | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
> index 72a24af..8951a56 100644
> --- a/package/kmod/kmod.mk
> +++ b/package/kmod/kmod.mk
> @@ -53,4 +53,13 @@ else
> KMOD_CONF_OPT += --disable-tools
> endif
>
> +define HOST_KMOD_INSTALL_TOOLS
> + mkdir -p $(HOST_DIR)/sbin/
> + for i in depmod insmod lsmod modinfo modprobe rmmod; \
> + do ln -sf ../usr/bin/kmod $(HOST_DIR)/sbin/$$i; done
Even though this is cut&paste of the above, I would indent it properly
here (and maybe also above).
Maybe for the host tools, only include depmod. The others _really_
shouldn't be used.
Regards,
Arnout
> +endef
> +
> +HOST_KMOD_POST_INSTALL_HOOKS += HOST_KMOD_INSTALL_TOOLS
> +
> $(eval $(autotools-package))
> +$(eval $(host-autotools-package))
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 3/3] module-init-tools: remove package
2013-08-20 11:05 ` [Buildroot] [PATCH 3/3] module-init-tools: remove package Thomas Petazzoni
@ 2013-08-21 20:51 ` Arnout Vandecappelle
0 siblings, 0 replies; 6+ messages in thread
From: Arnout Vandecappelle @ 2013-08-21 20:51 UTC (permalink / raw)
To: buildroot
On 20/08/13 13:05, Thomas Petazzoni wrote:
> This commit removes the module-init-tools package and adds the
> relevant Config.in.legacy entries to ease the migration for users.
>
> Signed-off-by: Thomas Petazzoni<thomas.petazzoni@free-electrons.com>
> ---
> Config.in.legacy | 11 +++++
> package/Config.in | 3 --
> package/module-init-tools/Config.in | 9 -----
> ...nit-tools-3.15-add-manpages-config-option.patch | 47 ----------------------
> package/module-init-tools/module-init-tools.mk | 28 -------------
> 5 files changed, 11 insertions(+), 87 deletions(-)
> delete mode 100644 package/module-init-tools/Config.in
> delete mode 100644 package/module-init-tools/module-init-tools-3.15-add-manpages-config-option.patch
> delete mode 100644 package/module-init-tools/module-init-tools.mk
>
> diff --git a/Config.in.legacy b/Config.in.legacy
> index 763f16c..ac6f088 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -45,6 +45,17 @@ comment "build, or run, in unpredictable ways. "
> endif
>
> ###############################################################################
> +comment "Legacy options removed in 2013.11"
> +
> +config BR2_PACKAGE_MODULE_INIT_TOOLS
> + bool "module-init-tools replaced by kmod"
> + select BR2_PACKAGE_KMOD
> + select BR2_PACKAGE_KMOD_TOOLS
Up to now, we've always selected BR2_LEGACY even if it is just a symbol
rename.
> + help
> + The 'module-init-tools' package has been removed, since it
> + has been depracated upstream and replaced by 'kmod'.
deprecated
Regards,
Arnout
> +
> +###############################################################################
> comment "Legacy options removed in 2013.08"
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-08-21 20:51 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-20 11:05 [Buildroot] [PATCH 0/3] Replace module-init-tools by kmod Thomas Petazzoni
2013-08-20 11:05 ` [Buildroot] [PATCH 1/3] kmod: allow to build a host variant Thomas Petazzoni
2013-08-21 20:07 ` Arnout Vandecappelle
2013-08-20 11:05 ` [Buildroot] [PATCH 2/3] linux: use kmod instead of module-init-tools Thomas Petazzoni
2013-08-20 11:05 ` [Buildroot] [PATCH 3/3] module-init-tools: remove package Thomas Petazzoni
2013-08-21 20:51 ` Arnout Vandecappelle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox