diff options
| author | Eric Andersen <andersen@codepoet.org> | 2006-07-09 04:54:00 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2006-07-09 04:54:00 +0000 |
| commit | e33a0c1400d1d5bda65b6053e3fecbd3d79b3192 (patch) | |
| tree | 91cfb56170bec09f6f855dd1cc11417f4834fc85 | |
| parent | 0e6da182fd318fe868176f737d931734f037cb15 (diff) | |
prevent up circular deps by preventing both from being enabled concurrently
| -rw-r--r-- | package/module-init-tools/Config.in | 1 | ||||
| -rw-r--r-- | package/module-init-tools/module-init-tools.mk | 6 | ||||
| -rw-r--r-- | package/modutils/Config.in | 1 | ||||
| -rw-r--r-- | package/modutils/modutils.mk | 8 |
4 files changed, 11 insertions, 5 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 \ diff --git a/package/modutils/Config.in b/package/modutils/Config.in index 581242ddc..7e9bdf814 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 dd0219ccf..b3e449259 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 |