summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2010-09-22 11:58:22 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2010-10-27 11:49:49 +0200
commitde482b90e16b7bb42fe97156e24f611685351ace (patch)
treed1b8d9fb9c259ff90c2ed0b81bb96cf73894d495
parent62e25d47f0ea3c097b039eadb93f316a8e4bed21 (diff)
downloadptxdist-de482b90e16b7bb42fe97156e24f611685351ace.tar.gz
ptxdist-de482b90e16b7bb42fe97156e24f611685351ace.tar.xz
[kernel] move "make modules_install" to kernel.install
Since 4bbbb7ec5cc848232201126c2b23ace92473cf2f the dependencies between kernel and external modules were broken. As a result the external modules were not part of the kernel-modules ipkg. This is fixed by this patch. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> (cherry picked from commit 76e73ab090656d83463af7000f32628b43292d6b) Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/kernel.make12
1 files changed, 6 insertions, 6 deletions
diff --git a/rules/kernel.make b/rules/kernel.make
index 9a7c4d037..841bdac4d 100644
--- a/rules/kernel.make
+++ b/rules/kernel.make
@@ -183,6 +183,12 @@ $(STATEDIR)/kernel.install:
$(KERNEL_HEADERS_INCLUDE_DIR); \
fi
+ifdef PTXCONF_KERNEL_MODULES_INSTALL
+ @rm -rf $(KERNEL_PKGDIR)
+ @cd $(KERNEL_DIR) && $(KERNEL_PATH) $(KERNEL_ENV) $(MAKE) \
+ $(KERNEL_MAKEVARS) modules_install
+endif
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -215,12 +221,6 @@ endif
@$(call install_finish, kernel)
endif
-ifdef PTXCONF_KERNEL_MODULES_INSTALL
- @rm -rf $(KERNEL_PKGDIR)
- @cd $(KERNEL_DIR) && $(KERNEL_PATH) $(KERNEL_ENV) $(MAKE) \
- $(KERNEL_MAKEVARS) modules_install
-endif
-
@$(call touch)