[Buildroot] [pull request] Pull request for branch initramfs-dep-fix

[Buildroot] [pull request] Pull request for branch initramfs-dep-fix

[Thomas Petazzoni]

The following changes since commit f4abd4e61215b119d38ccba011a901732ce704e4:
  Peter Huewe (1):
        docs: Fixed spelling error in buildroot.html GETTEXT instead of GNUTTEXT

are available in the git repository at:

  git://git.busybox.net/~tpetazzoni/git/buildroot initramfs-dep-fix

Thomas Petazzoni (2):
      initramfs: only show the option when a Linux kernel is being built
      initramfs: update help text

 fs/initramfs/Config.in |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 deletions(-)

Thanks,
-- 
Thomas Petazzoni

[Buildroot] [PATCH 1/2] initramfs: only show the option when a Linux kernel is being built

[Thomas Petazzoni]

Fixes bug #2119.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 fs/initramfs/Config.in |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/fs/initramfs/Config.in b/fs/initramfs/Config.in
index d53982c..94875b8 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,6 @@ 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
+
-- 
1.7.0.4

[Buildroot] [PATCH 2/2] initramfs: update help text

[Thomas Petazzoni]

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 fs/initramfs/Config.in |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/fs/initramfs/Config.in b/fs/initramfs/Config.in
index 94875b8..b9e93a8 100644
--- a/fs/initramfs/Config.in
+++ b/fs/initramfs/Config.in
@@ -2,17 +2,19 @@ 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.
-	  This file is normally called initramfs_list and can be
-	  generated with gen_initramfs_list.sh script from the root
-	  directory structure.
-	  The file is then used in the kernel build process to generate
-	  the cpio filesystem for the initial ramdisk. Make sure that
-	  you configure this file in kernel build configuration.
-	  The location in the kernel build configuration menu is
-	  Device Drivers -> Block devices -> Initramfs source file(s).
-	  The configuration variable is CONFIG_INITRAMFS_SOURCE
+	  Integrate the root filesystem generated by Buildroot as an
+	  initramfs inside the kernel image. This integration will
+	  take place automatically.
+
+	  The rootfs.initramfs file generated in the images/ directory
+	  is only a text file describing the contents of the initramfs
+	  in a format understood by the CONFIG_INITRAMFS_SOURCE kernel
+	  configuration option.
+
+	  Note that enabling initramfs together with other filesystem
+	  formats doesn't make sense: you would end up having two
+	  identical root filesystems, one embedded inside the kernel
+	  image, and one separatly.
 
 comment "initramfs requires a Linux kernel to be built"
 	depends on !BR2_LINUX_KERNEL
-- 
1.7.0.4

[Buildroot] [pull request] Pull request for branch initramfs-dep-fix

[Peter Korsgaard]

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

 Thomas> The following changes since commit f4abd4e61215b119d38ccba011a901732ce704e4:
 Thomas>   Peter Huewe (1):
 Thomas>         docs: Fixed spelling error in buildroot.html GETTEXT instead of GNUTTEXT

 Thomas> are available in the git repository at:

 Thomas>   git://git.busybox.net/~tpetazzoni/git/buildroot initramfs-dep-fix

Pulled, thanks.

-- 
Bye, Peter Korsgaard