From 035bbfbf39745ecc447a6e5a4e85abbfcc2d7803 Mon Sep 17 00:00:00 2001 From: Robert Schwebel Date: Tue, 12 May 2009 07:53:22 +0000 Subject: * module-init-tools: version bump -> 3.8 * module-init-tools: fix paths according to what the packet wants to install. git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10486 33e552b5-05e3-0310-8538-816dae2090ed --- rules/module-init-tools.make | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'rules/module-init-tools.make') diff --git a/rules/module-init-tools.make b/rules/module-init-tools.make index 44fb38d4a..6f804373e 100644 --- a/rules/module-init-tools.make +++ b/rules/module-init-tools.make @@ -3,7 +3,7 @@ # # Copyright (C) 2005 Ladislav Michl # 2006, 2008, 2009 by Marc Kleine-Budde -# +# # See CREDITS for details about who has contributed to this project. # # For further information about the PTXdist project and license conditions @@ -18,7 +18,7 @@ PACKAGES-$(PTXCONF_MODULE_INIT_TOOLS) += module-init-tools # # Paths and names # -MODULE_INIT_TOOLS_VERSION := 3.5 +MODULE_INIT_TOOLS_VERSION := 3.8 MODULE_INIT_TOOLS := module-init-tools-$(MODULE_INIT_TOOLS_VERSION) MODULE_INIT_TOOLS_SUFFIX := tar.bz2 MODULE_INIT_TOOLS_URL := http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/$(MODULE_INIT_TOOLS).$(MODULE_INIT_TOOLS_SUFFIX) @@ -58,27 +58,29 @@ $(STATEDIR)/module-init-tools.targetinstall: @$(call install_fixup, module-init-tools,PRIORITY,optional) @$(call install_fixup, module-init-tools,VERSION,$(MODULE_INIT_TOOLS_VERSION)) @$(call install_fixup, module-init-tools,SECTION,base) - @$(call install_fixup, module-init-tools,AUTHOR,"Robert Schwebel ") + @$(call install_fixup, module-init-tools,AUTHOR,"Robert Schwebel ") @$(call install_fixup, module-init-tools,DEPENDS,) @$(call install_fixup, module-init-tools,DESCRIPTION,missing) ifdef PTXCONF_MODULE_INIT_TOOLS_INSMOD - @$(call install_copy, module-init-tools, 0, 0, 0755, $(MODULE_INIT_TOOLS_DIR)/insmod, /sbin/insmod) + @$(call install_copy, module-init-tools, 0, 0, 0755, -, /usr/sbin/insmod) + #@$(call install_copy, module-init-tools, 0, 0, 0755, -, /usr/sbin/insmod.static) endif ifdef PTXCONF_MODULE_INIT_TOOLS_RMMOD - @$(call install_copy, module-init-tools, 0, 0, 0755, $(MODULE_INIT_TOOLS_DIR)/rmmod, /sbin/rmmod) + @$(call install_copy, module-init-tools, 0, 0, 0755, -, /usr/sbin/rmmod) endif ifdef PTXCONF_MODULE_INIT_TOOLS_LSMOD - @$(call install_copy, module-init-tools, 0, 0, 0755, $(MODULE_INIT_TOOLS_DIR)/lsmod, /bin/lsmod) + @$(call install_copy, module-init-tools, 0, 0, 0755, -, /usr/bin/lsmod) endif ifdef PTXCONF_MODULE_INIT_TOOLS_MODINFO - @$(call install_copy, module-init-tools, 0, 0, 0755, $(MODULE_INIT_TOOLS_DIR)/modinfo, /sbin/modinfo) + @$(call install_copy, module-init-tools, 0, 0, 0755, -, /usr/sbin/modinfo) endif ifdef PTXCONF_MODULE_INIT_TOOLS_MODPROBE - @$(call install_copy, module-init-tools, 0, 0, 0755, $(MODULE_INIT_TOOLS_DIR)/modprobe, /sbin/modprobe) + @$(call install_copy, module-init-tools, 0, 0, 0755, -, /usr/sbin/modprobe) + @$(call install_copy, module-init-tools, 0, 0, 0644, -, /usr/sbin/generate-modprobe.conf) endif ifdef PTXCONF_MODULE_INIT_TOOLS_DEPMOD - @$(call install_copy, module-init-tools, 0, 0, 0755, $(MODULE_INIT_TOOLS_DIR)/depmod, /sbin/depmod) + @$(call install_copy, module-init-tools, 0, 0, 0755, -, /usr/sbin/depmod) endif @$(call install_finish, module-init-tools) -- cgit v1.2.3