summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2011-07-07 21:40:09 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2011-07-07 21:40:09 (GMT)
commitce03b89881571e9dd3a5c83430f1d32a6a6307c3 (patch)
tree67bde4c281fa11f89fec6a918244f1ccb4b77df4
parenteff25f4cca89d816665de469b7164267aaf52d4b (diff)
downloadbuildroot-ce03b89881571e9dd3a5c83430f1d32a6a6307c3.tar.gz
buildroot-ce03b89881571e9dd3a5c83430f1d32a6a6307c3.tar.bz2
linux: simplify modules check
No need to mix make and shell code. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--linux/linux.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/linux.mk b/linux/linux.mk
index a5b9b8e..f9fe454 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -149,7 +149,7 @@ endif
$(LINUX26_DIR)/.stamp_compiled: $(LINUX26_DIR)/.stamp_configured $(LINUX26_DIR)/.config
@$(call MESSAGE,"Compiling kernel")
$(TARGET_MAKE_ENV) $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) $(LINUX26_IMAGE_NAME)
- @if [ $(shell grep -c "CONFIG_MODULES=y" $(LINUX26_DIR)/.config) != 0 ] ; then \
+ @if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \
$(TARGET_MAKE_ENV) $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) modules ; \
fi
$(Q)touch $@
@@ -163,7 +163,7 @@ endif
cp $(LINUX26_IMAGE_PATH) $(BINARIES_DIR)
# Install modules and remove symbolic links pointing to build
# directories, not relevant on the target
- @if [ $(shell grep -c "CONFIG_MODULES=y" $(LINUX26_DIR)/.config) != 0 ] ; then \
+ @if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \
$(TARGET_MAKE_ENV) $(MAKE1) $(LINUX26_MAKE_FLAGS) -C $(@D) \
DEPMOD="$(HOST_DIR)/usr/sbin/depmod" modules_install ; \
rm -f $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION_PROBED)/build ; \