summaryrefslogtreecommitdiff
path: root/package/module-init-tools
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2006-07-09 04:54:00 +0000
committerEric Andersen <andersen@codepoet.org>2006-07-09 04:54:00 +0000
commite33a0c1400d1d5bda65b6053e3fecbd3d79b3192 (patch)
tree91cfb56170bec09f6f855dd1cc11417f4834fc85 /package/module-init-tools
parent0e6da182fd318fe868176f737d931734f037cb15 (diff)
prevent up circular deps by preventing both from being enabled concurrently
Diffstat (limited to 'package/module-init-tools')
-rw-r--r--package/module-init-tools/Config.in1
-rw-r--r--package/module-init-tools/module-init-tools.mk6
2 files changed, 4 insertions, 3 deletions
diff --git a/package/module-init-tools/Config.in b/package/module-init-tools/Config.in
index 7631b783d..6773d0690 100644
--- a/package/module-init-tools/Config.in
+++ b/package/module-init-tools/Config.in
@@ -1,6 +1,7 @@
config BR2_PACKAGE_MODULE_INIT_TOOLS
bool "module-init-tools"
default n
+ depends on !BR2_PACKAGE_MODUTILS
help
The module-init-tools package contains a set of programs for
loading, inserting, and removing kernel modules for Linux
diff --git a/package/module-init-tools/module-init-tools.mk b/package/module-init-tools/module-init-tools.mk
index a49feef00..fdc686954 100644
--- a/package/module-init-tools/module-init-tools.mk
+++ b/package/module-init-tools/module-init-tools.mk
@@ -14,13 +14,13 @@ STRIPPROG=$(STRIP)
$(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE):
$(WGET) -P $(DL_DIR) $(MODULE_INIT_TOOLS_SITE)/$(MODULE_INIT_TOOLS_SOURCE)
-$(MODULE_INIT_TOOLS_DIR)/.source: $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE)
+$(MODULE_INIT_TOOLS_DIR)/.unpacked: $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE)
bzcat $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE) | tar -C $(BUILD_DIR) -xvf -
toolchain/patch-kernel.sh $(MODULE_INIT_TOOLS_DIR) \
package/module-init-tools \*.patch
- touch $(MODULE_INIT_TOOLS_DIR)/.source
+ touch $(MODULE_INIT_TOOLS_DIR)/.unpacked
-$(MODULE_INIT_TOOLS_DIR)/.configured: $(MODULE_INIT_TOOLS_DIR)/.source
+$(MODULE_INIT_TOOLS_DIR)/.configured: $(MODULE_INIT_TOOLS_DIR)/.unpacked
(cd $(MODULE_INIT_TOOLS_DIR); \
$(TARGET_CONFIGURE_OPTS) \
INSTALL=$(MODULE_INIT_TOOLS_DIR)/install-sh \