From 9497c0fee20ff66b7f128d3246bcee09244207cb Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 5 Jun 2010 17:33:44 +0200 Subject: module-init-tools: remove support for cross-depmod The new infrastructure to build the Linux kernel doesn't use a cross-depmod. This isn't needed with modern module-init-tools that most distros include perfectly handle this. Signed-off-by: Thomas Petazzoni --- package/module-init-tools/module-init-tools.mk | 44 -------------------------- 1 file changed, 44 deletions(-) (limited to 'package/module-init-tools/module-init-tools.mk') diff --git a/package/module-init-tools/module-init-tools.mk b/package/module-init-tools/module-init-tools.mk index 129770e655..8adb684b81 100644 --- a/package/module-init-tools/module-init-tools.mk +++ b/package/module-init-tools/module-init-tools.mk @@ -70,50 +70,6 @@ module-init-tools-dirclean: rm -rf $(MODULE_INIT_TOOLS_DIR) ############################################################# - - -$(MODULE_INIT_TOOLS_DIR2)/.source: $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE) - $(MODULE_INIT_TOOLS_CAT) $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE) | tar -C $(TOOLCHAIN_DIR) -xvf - - toolchain/patch-kernel.sh $(MODULE_INIT_TOOLS_DIR2) package/module-init-tools \*.patch - $(CONFIG_UPDATE) $(MODULE_INIT_TOOLS_DIR2) - touch $(MODULE_INIT_TOOLS_DIR2)/.source - -$(MODULE_INIT_TOOLS_DIR2)/.configured: $(MODULE_INIT_TOOLS_DIR2)/.source - (cd $(MODULE_INIT_TOOLS_DIR2); \ - CC="$(HOSTCC)" \ - ./configure $(QUIET) \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_HOST_NAME) \ - --build=$(GNU_HOST_NAME) \ - --sysconfdir=/etc \ - --program-transform-name='' \ - ) - touch $(MODULE_INIT_TOOLS_DIR2)/.configured - -$(MODULE_INIT_TOOLS_DIR2)/$(MODULE_INIT_TOOLS_BINARY): $(MODULE_INIT_TOOLS_DIR2)/.configured - $(MAKE) -C $(MODULE_INIT_TOOLS_DIR2) - touch -c $(MODULE_INIT_TOOLS_DIR2)/$(MODULE_INIT_TOOLS_BINARY) - - -$(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod26: $(MODULE_INIT_TOOLS_DIR2)/$(MODULE_INIT_TOOLS_BINARY) - $(INSTALL) -D $(MODULE_INIT_TOOLS_DIR2)/$(MODULE_INIT_TOOLS_BINARY) $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod26 - -cross-depmod26: $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod26 - -module-init-tools-source cross-depmod26-source: $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE) - -cross-depmod26-clean: - rm -f $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod26 - -$(MAKE) -C $(MODULE_INIT_TOOLS_DIR2) clean - -cross-depmod26-dirclean: - rm -rf $(MODULE_INIT_TOOLS_DIR2) - -ifeq ($(BR2_PACKAGE_LINUX),y) -HOST_SOURCE+=module-init-tools-source -endif - -############################################################# # ## Toplevel Makefile options # -- cgit v1.2.1 From dcc08e84a5e94e7ffaf52ec4374821e56bb20a34 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 5 Jun 2010 17:39:05 +0200 Subject: module-init-tools: bump version + convert to autotools The "remove-index" patch is no longer needed, the newer version of module-init-tools correctly uses strchr(). The "module-init-tools" patch, whose main purpose was to disable the generation of man pages (it requires docbook2man), is replaced by a simpler implementation, module-init-tools-3.11-add-manpages-config-option.patch. Signed-off-by: Thomas Petazzoni --- package/module-init-tools/module-init-tools.mk | 80 ++++---------------------- 1 file changed, 10 insertions(+), 70 deletions(-) (limited to 'package/module-init-tools/module-init-tools.mk') diff --git a/package/module-init-tools/module-init-tools.mk b/package/module-init-tools/module-init-tools.mk index 8adb684b81..3e8b06bde2 100644 --- a/package/module-init-tools/module-init-tools.mk +++ b/package/module-init-tools/module-init-tools.mk @@ -3,77 +3,17 @@ # module-init-tools # ############################################################# -MODULE_INIT_TOOLS_VERSION=3.2.2 +MODULE_INIT_TOOLS_VERSION=3.11 MODULE_INIT_TOOLS_SOURCE=module-init-tools-$(MODULE_INIT_TOOLS_VERSION).tar.bz2 -MODULE_INIT_TOOLS_CAT:=$(BZCAT) MODULE_INIT_TOOLS_SITE=$(BR2_KERNEL_MIRROR)/linux/utils/kernel/module-init-tools/ -MODULE_INIT_TOOLS_DIR=$(BUILD_DIR)/module-init-tools-$(MODULE_INIT_TOOLS_VERSION) -MODULE_INIT_TOOLS_DIR2=$(TOOLCHAIN_DIR)/module-init-tools-$(MODULE_INIT_TOOLS_VERSION) -MODULE_INIT_TOOLS_BINARY=depmod -MODULE_INIT_TOOLS_TARGET_BINARY=$(TARGET_DIR)/sbin/$(MODULE_INIT_TOOLS_BINARY) +MODULE_INIT_TOOLS_CONF_OPT = \ + --disable-static-utils \ + --disable-builddir \ + --program-transform-name='' -STRIPPROG=$(STRIPCMD) +# module-init-tools-3.11-add-manpages-config-option.patch is modifying +# configure.ac and Makefile.am +MODULE_INIT_TOOLS_AUTORECONF=YES +HOST_MODULE_INIT_TOOLS_AUTORECONF=YES -$(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE): - $(call DOWNLOAD,$(MODULE_INIT_TOOLS_SITE),$(MODULE_INIT_TOOLS_SOURCE)) - -$(MODULE_INIT_TOOLS_DIR)/.unpacked: $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE) - $(MODULE_INIT_TOOLS_CAT) $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE) | tar -C $(BUILD_DIR) -xvf - - toolchain/patch-kernel.sh $(MODULE_INIT_TOOLS_DIR) package/module-init-tools \*.patch - $(CONFIG_UPDATE) $(MODULE_INIT_TOOLS_DIR) - touch $(MODULE_INIT_TOOLS_DIR)/.unpacked - -$(MODULE_INIT_TOOLS_DIR)/.configured: $(MODULE_INIT_TOOLS_DIR)/.unpacked - (cd $(MODULE_INIT_TOOLS_DIR); rm -f config.cache; \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - INSTALL=$(MODULE_INIT_TOOLS_DIR)/install-sh \ - ./configure $(QUIET) \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/ \ - --sysconfdir=/etc \ - --program-transform-name='' \ - ) - touch $(MODULE_INIT_TOOLS_DIR)/.configured - -$(MODULE_INIT_TOOLS_DIR)/$(MODULE_INIT_TOOLS_BINARY): $(MODULE_INIT_TOOLS_DIR)/.configured - $(MAKE) CC=$(TARGET_CC) -C $(MODULE_INIT_TOOLS_DIR) - touch -c $(MODULE_INIT_TOOLS_DIR)/$(MODULE_INIT_TOOLS_BINARY) - -ifeq ($(BR2_PACKAGE_MODUTILS),y) -$(MODULE_INIT_TOOLS_TARGET_BINARY): \ - $(MODULE_INIT_TOOLS_DIR)/$(MODULE_INIT_TOOLS_BINARY) \ - modutils -else -$(MODULE_INIT_TOOLS_TARGET_BINARY): \ - $(MODULE_INIT_TOOLS_DIR)/$(MODULE_INIT_TOOLS_BINARY) -endif -ifeq ($(BR2_PACKAGE_MODUTILS),y) - $(MAKE) prefix=$(TARGET_DIR) -C $(MODULE_INIT_TOOLS_DIR) moveold -endif - STRIPPROG='$(STRIPPROG)' \ - $(MAKE) prefix=$(TARGET_DIR) -C $(MODULE_INIT_TOOLS_DIR) install-exec - rm -Rf $(TARGET_DIR)/usr/man - rm -f $(TARGET_DIR)/sbin/generate-modprobe.conf - rm -f $(TARGET_DIR)/sbin/insmod.static - touch -c $(MODULE_INIT_TOOLS_TARGET_BINARY) - -module-init-tools: $(MODULE_INIT_TOOLS_TARGET_BINARY) - -module-init-tools-clean: - $(MAKE) prefix=$(TARGET_DIR)/usr -C $(MODULE_INIT_TOOLS_DIR) uninstall - -$(MAKE) -C $(MODULE_INIT_TOOLS_DIR) clean - -module-init-tools-dirclean: - rm -rf $(MODULE_INIT_TOOLS_DIR) - -############################################################# -# -## Toplevel Makefile options -# -############################################################## -ifeq ($(BR2_PACKAGE_MODULE_INIT_TOOLS),y) -TARGETS+=module-init-tools -endif +$(eval $(call AUTOTARGETS,package,module-init-tools)) -- cgit v1.2.1 From dc4d5647a528b366d88d4c6f94405c12a1aa0ebf Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 5 Jun 2010 21:26:18 +0200 Subject: linux: Add dependency on host-module-init-tools In order to not depend on module init tools being installed on the development environment of the Buildroot user, let's build module init tools for the host. Signed-off-by: Thomas Petazzoni --- package/module-init-tools/module-init-tools.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package/module-init-tools/module-init-tools.mk') diff --git a/package/module-init-tools/module-init-tools.mk b/package/module-init-tools/module-init-tools.mk index 3e8b06bde2..ea7c014dcc 100644 --- a/package/module-init-tools/module-init-tools.mk +++ b/package/module-init-tools/module-init-tools.mk @@ -17,3 +17,5 @@ MODULE_INIT_TOOLS_AUTORECONF=YES HOST_MODULE_INIT_TOOLS_AUTORECONF=YES $(eval $(call AUTOTARGETS,package,module-init-tools)) +$(eval $(call AUTOTARGETS,package,module-init-tools,host)) + -- cgit v1.2.1