summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-05-04 05:40:53 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2012-05-05 06:49:02 (GMT)
commitf18c51657f4ab038654297ccc8fb8e00314c8b60 (patch)
tree0645cee8c05cf0f636ff1e3699ec82812ea39a11
parenta90617b6271c86769a03ea8f7cfc5a58451e02c5 (diff)
downloadbuildroot-f18c51657f4ab038654297ccc8fb8e00314c8b60.tar.gz
buildroot-f18c51657f4ab038654297ccc8fb8e00314c8b60.tar.bz2
linux: improve the 'make linux-*' special commands
This patch improves two things: * It makes sure that the linux-menuconfig and al. commands can be executed even if the user hasn't executed 'make' before. Until now, the commands were depending on the .configured stamp, which is not sufficient since the linux package has been converted to the GENTARGETS infrastructure. Instead, depend on the linux-configure phony target. * It makes sure that those commands are not available when the Linux package is not selected, just like we do for Barebox. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--linux/linux.mk8
1 files changed, 5 insertions, 3 deletions
diff --git a/linux/linux.mk b/linux/linux.mk
index 16f9916..34f8623 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -203,17 +203,18 @@ include linux/linux-ext-*.mk
$(eval $(call GENTARGETS))
-linux-menuconfig linux-xconfig linux-gconfig linux-nconfig linux26-menuconfig linux26-xconfig linux26-gconfig linux26-nconfig: dirs $(LINUX_DIR)/.stamp_configured
+ifeq ($(BR2_LINUX_KERNEL),y)
+linux-menuconfig linux-xconfig linux-gconfig linux-nconfig linux26-menuconfig linux26-xconfig linux26-gconfig linux26-nconfig: dirs linux-configure
$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) \
$(subst linux-,,$(subst linux26-,,$@))
rm -f $(LINUX_DIR)/.stamp_{built,target_installed,images_installed}
-linux-savedefconfig linux26-savedefconfig: dirs $(LINUX_DIR)/.stamp_configured
+linux-savedefconfig linux26-savedefconfig: dirs linux-configure
$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) \
$(subst linux-,,$(subst linux26-,,$@))
ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG),y)
-linux-update-config linux26-update-config: $(LINUX_DIR)/.config
+linux-update-config linux26-update-config: linux-configure $(LINUX_DIR)/.config
cp -f $(LINUX_DIR)/.config $(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)
linux-update-defconfig linux26-update-defconfig: linux-savedefconfig
@@ -222,6 +223,7 @@ else
linux-update-config linux26-update-config: ;
linux-update-defconfig linux26-update-defconfig: ;
endif
+endif
# Support for rebuilding the kernel after the cpio archive has
# been generated in $(BINARIES_DIR)/rootfs.cpio.