summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-06-26 00:02:27 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2010-06-26 07:43:20 +0200
commit93e801470981010d8760db372f511e04481182d0 (patch)
tree16a4dc2960294b1e6f8382ff6470a46c7c62bd21
parentc59d700786641403e10f33249b37a9f8f5a4712b (diff)
initramfs: only show the option when a Linux kernel is being built
Closes #2119 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES1
-rw-r--r--fs/initramfs/Config.in3
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 27582cb2f..ea399df6c 100644
--- 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:
diff --git a/fs/initramfs/Config.in b/fs/initramfs/Config.in
index d53982cb9..c76b2de12 100644
--- a/fs/initramfs/Config.in
+++ b/fs/initramfs/Config.in
@@ -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