aboutsummaryrefslogtreecommitdiff
path: root/package/modutils
diff options
context:
space:
mode:
authorGravatar Eric Andersen <andersen@codepoet.org>2006-07-09 04:54:00 +0000
committerGravatar Eric Andersen <andersen@codepoet.org>2006-07-09 04:54:00 +0000
commite33a0c1400d1d5bda65b6053e3fecbd3d79b3192 (patch)
tree91cfb56170bec09f6f855dd1cc11417f4834fc85 /package/modutils
parent0e6da182fd318fe868176f737d931734f037cb15 (diff)
downloadbuildroot-e33a0c1400d1d5bda65b6053e3fecbd3d79b3192.tar.gz
buildroot-e33a0c1400d1d5bda65b6053e3fecbd3d79b3192.tar.bz2
prevent up circular deps by preventing both from being enabled concurrently
Diffstat (limited to 'package/modutils')
-rw-r--r--package/modutils/Config.in1
-rw-r--r--package/modutils/modutils.mk8
2 files changed, 7 insertions, 2 deletions
diff --git a/package/modutils/Config.in b/package/modutils/Config.in
index 581242ddca..7e9bdf814a 100644
--- a/package/modutils/Config.in
+++ b/package/modutils/Config.in
@@ -1,6 +1,7 @@
config BR2_PACKAGE_MODUTILS
bool "modutils"
default n
+ depends on !BR2_PACKAGE_MODULE_INIT_TOOLS
help
The modutils packages includes the kerneld program for automatic
loading and unloading of modules, as well as other module
diff --git a/package/modutils/modutils.mk b/package/modutils/modutils.mk
index dd0219ccf1..b3e4492594 100644
--- a/package/modutils/modutils.mk
+++ b/package/modutils/modutils.mk
@@ -40,12 +40,14 @@ $(MODUTILS_DIR1)/.configured: $(MODUTILS_DIR1)/.source
touch $(MODUTILS_DIR1)/.configured;
$(MODUTILS_DIR1)/$(MODUTILS_BINARY): $(MODUTILS_DIR1)/.configured
- $(MAKE) CC=$(TARGET_CC) -C $(MODUTILS_DIR1)
+ $(MAKE1) CC=$(TARGET_CC) -C $(MODUTILS_DIR1)
+ touch -c $(MODUTILS_DIR1)/$(MODUTILS_BINARY)
$(TARGET_DIR)/$(MODUTILS_TARGET_BINARY): $(MODUTILS_DIR1)/$(MODUTILS_BINARY)
STRIPPROG='$(STRIPPROG)' \
$(MAKE) prefix=$(TARGET_DIR) -C $(MODUTILS_DIR1) install-bin
rm -Rf $(TARGET_DIR)/usr/man
+ touch -c $(TARGET_DIR)/$(MODUTILS_TARGET_BINARY)
modutils: uclibc $(TARGET_DIR)/$(MODUTILS_TARGET_BINARY)
@@ -89,10 +91,12 @@ $(MODUTILS_DIR2)/.configured: $(MODUTILS_DIR2)/.source
touch $(MODUTILS_DIR2)/.configured;
$(MODUTILS_DIR2)/$(MODUTILS_BINARY): $(MODUTILS_DIR2)/.configured
- $(MAKE) -C $(MODUTILS_DIR2)
+ $(MAKE1) -C $(MODUTILS_DIR2)
+ touch -c $(MODUTILS_DIR2)/$(MODUTILS_BINARY)
$(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-depmod: $(MODUTILS_DIR2)/$(MODUTILS_BINARY)
cp $(MODUTILS_DIR2)/$(MODUTILS_BINARY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-depmod
+ touch -c $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-depmod
cross-depmod: uclibc $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-depmod