initramfs: only show the option when a Linux kernel is being built
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Fri, 25 Jun 2010 22:02:27 +0000 (00:02 +0200)
committerPeter Korsgaard <jacmet@sunsite.dk>
Sat, 26 Jun 2010 05:43:20 +0000 (07:43 +0200)
Closes #2119

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
CHANGES
fs/initramfs/Config.in

diff --git a/CHANGES b/CHANGES
index 27582cb2f6349be47e55e90b579b7b16e4056bab..ea399df6cba6fbcbb3343b1c924ef6cbb9feefb7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -49,6 +49,7 @@
        #2035: ipsec-tools-0.7.2 fails to build with gcc-4.4.x
        #2038: Bump ncurses to 5.7
        #2095: make gconfig: undefined reference to symbol 'dlsym@@GLIBC_2.2.5'
+       #2119: Tries to build kernel, although disabled in config
 
 2010.05, Released May 30th, 2010:
 
index d53982cb9a55921f9db7de4834cc752aab39aafc..c76b2de12f69fdba1d62e103a656ac2fd2128a3b 100644 (file)
@@ -1,5 +1,6 @@
 config BR2_TARGET_ROOTFS_INITRAMFS
        bool "initramfs for initial ramdisk of linux kernel"
+       depends on BR2_LINUX_KERNEL
        help
          Build a file which is usable for the gen_init_cpio tool
          at linux kernel build.
@@ -13,3 +14,5 @@ config BR2_TARGET_ROOTFS_INITRAMFS
          Device Drivers -> Block devices -> Initramfs source file(s).
          The configuration variable is CONFIG_INITRAMFS_SOURCE
 
+comment "initramfs requires a Linux kernel to be built"
+       depends on !BR2_LINUX_KERNEL