[Buildroot] [pull request] Pull request for branch for-2012.05/fix-linux-menuconfig

[Buildroot] [pull request] Pull request for branch for-2012.05/fix-linux-menuconfig

[Thomas Petazzoni]

The following changes since commit aa96b4ea99b362decc524a8632c7a2c1a7586e83:

  CHANGES: GDB 4.7.1, not GCC (2012-05-03 23:29:08 +0200)

are available in the git repository at:

  git://git.free-electrons.com/users/thomas-petazzoni/buildroot.git for-2012.05/fix-linux-menuconfig

for you to fetch changes up to a96a992b96d72989cddf72ce8420d6acf28302c3:

  linux: improve the 'make linux-*' special commands (2012-05-04 17:39:10 +0200)

----------------------------------------------------------------
Thomas Petazzoni (1):
      linux: improve the 'make linux-*' special commands

 linux/linux.mk |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Thanks,
-- 
Thomas Petazzoni

[Buildroot] [PATCH 1/1] linux: improve the 'make linux-*' special commands

[Thomas Petazzoni]

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>
---
 linux/linux.mk |    8 +++++---
 1 file 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.
-- 
1.7.9.5

[Buildroot] [PATCH 1/1] linux: improve the 'make linux-*' special commands

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> This patch improves two things:
 Thomas>  * It makes sure that the linux-menuconfig and al. commands can be
 Thomas>    executed even if the user hasn't executed 'make' before. Until now,
 Thomas>    the commands were depending on the .configured stamp, which is not
 Thomas>    sufficient since the linux package has been converted to the
 Thomas>    GENTARGETS infrastructure. Instead, depend on the linux-configure
 Thomas>    phony target.

 Thomas>  * It makes sure that those commands are not available when the Linux
 Thomas>    package is not selected, just like we do for Barebox.

Committed, thanks.

-- 
Bye, Peter Korsgaard