Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 2/2] [skeleton] option to define path to custom rootfs skeleton
@ 2010-06-10 19:58 Dmytro Milinevskyy
  2010-06-15  7:21 ` Thomas Petazzoni
  0 siblings, 1 reply; 4+ messages in thread
From: Dmytro Milinevskyy @ 2010-06-10 19:58 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Dmytro Milinevskyy <milinevskyy@gmail.com>
---
 Makefile     |    4 ++++
 fs/Config.in |   24 ++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/Makefile b/Makefile
index 1b5cdd4..67110f1 100644
--- a/Makefile
+++ b/Makefile
@@ -378,6 +378,10 @@ endif
 	@mkdir -p $(STAGING_DIR)/usr/include
 	@mkdir -p $(STAGING_DIR)/usr/bin
 
+ifeq ($(BR2_ROOTFS_SKELETON_CUSTOM),y)
+TARGET_SKELETON=$(BR2_ROOTFS_SKELETON_CUSTOM_PATH)
+endif
+
 $(BUILD_DIR)/.root:
 	mkdir -p $(TARGET_DIR)
 	if ! [ -d "$(TARGET_DIR)/bin" ]; then \
diff --git a/fs/Config.in b/fs/Config.in
index 6865eea..2163890 100644
--- a/fs/Config.in
+++ b/fs/Config.in
@@ -23,6 +23,30 @@ config BR2_ROOTFS_DEVICE_TABLE
          to the makedevs utility to create all the special device
          files in the target filesystem.
 
+choice
+	prompt "Root FS skeleton"
+
+	config BR2_ROOTFS_SKELETON_DEFAULT
+		bool "default target skeleton"
+        help
+          Use default target skeleton
+
+	config BR2_ROOTFS_SKELETON_CUSTOM
+		bool "custom target skeleton"
+		help
+	  	 Use custom target skeleton.
+
+endchoice
+
+if BR2_ROOTFS_SKELETON_CUSTOM
+	config BR2_ROOTFS_SKELETON_CUSTOM_PATH
+		string "custom target skeleton path"
+        default "fs/skeleton"
+		help
+	  	 Path custom target skeleton.
+endif
+
+
 source "fs/cramfs/Config.in"
 source "fs/cloop/Config.in"
 source "fs/ext2/Config.in"
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [Buildroot] [PATCH 2/2] [skeleton] option to define path to custom rootfs skeleton
  2010-06-10 19:58 Dmytro Milinevskyy
@ 2010-06-15  7:21 ` Thomas Petazzoni
  2010-06-15  8:14   ` Dmytro Milinevskyy
  0 siblings, 1 reply; 4+ messages in thread
From: Thomas Petazzoni @ 2010-06-15  7:21 UTC (permalink / raw)
  To: buildroot

Hello,

On Thu, 10 Jun 2010 22:58:40 +0300
Dmytro Milinevskyy <milinevskyy@gmail.com> wrote:

> index 6865eea..2163890 100644
> --- a/fs/Config.in
> +++ b/fs/Config.in
> @@ -23,6 +23,30 @@ config BR2_ROOTFS_DEVICE_TABLE
>           to the makedevs utility to create all the special device
>           files in the target filesystem.
>  
> +choice
> +	prompt "Root FS skeleton"
> +
> +	config BR2_ROOTFS_SKELETON_DEFAULT
> +		bool "default target skeleton"
> +        help
> +          Use default target skeleton
> +
> +	config BR2_ROOTFS_SKELETON_CUSTOM
> +		bool "custom target skeleton"
> +		help
> +	  	 Use custom target skeleton.
> +
> +endchoice
> +
> +if BR2_ROOTFS_SKELETON_CUSTOM
> +	config BR2_ROOTFS_SKELETON_CUSTOM_PATH
> +		string "custom target skeleton path"
> +        default "fs/skeleton"
> +		help
> +	  	 Path custom target skeleton.
> +endif
> +
> +

You have indentation issues here. It should be:

choice
	prompt "Root FS skeleton"

config BR2_ROOTFS_SKELETON_DEFAULT
	bool "default target skeleton"
	help
	  Use default target skeleton

config BR2_ROOTFS_SKELETON_CUSTOM
	bool "custom target skeleton"
	help
	  Use custom target skeleton

endchoice

if BR2_ROOTFS_SKELETON_CUSTOM

config BR2_ROOTFS_SKELETON_CUSTOM_PATH
	string "custom target skeleton path"
	default "fs/skeleton"
	help
	  Path to the custom target skeleton

endif

So :

 * config statements at the beginning of the line
 * one tab before "bool" and "help"
 * tab + 2 spaces before each line of the help message

Otherwise, looks good to me, thanks!

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [Buildroot] [PATCH 2/2] [skeleton] option to define path to custom rootfs skeleton
  2010-06-15  7:21 ` Thomas Petazzoni
@ 2010-06-15  8:14   ` Dmytro Milinevskyy
  0 siblings, 0 replies; 4+ messages in thread
From: Dmytro Milinevskyy @ 2010-06-15  8:14 UTC (permalink / raw)
  To: buildroot

Ok. I will redo the patch and resend everything from scratch.

-- Dima

On Tue, Jun 15, 2010 at 10:21 AM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Hello,
>
> On Thu, 10 Jun 2010 22:58:40 +0300
> Dmytro Milinevskyy <milinevskyy@gmail.com> wrote:
>
>> index 6865eea..2163890 100644
>> --- a/fs/Config.in
>> +++ b/fs/Config.in
>> @@ -23,6 +23,30 @@ config BR2_ROOTFS_DEVICE_TABLE
>> ? ? ? ? ? to the makedevs utility to create all the special device
>> ? ? ? ? ? files in the target filesystem.
>>
>> +choice
>> + ? ? prompt "Root FS skeleton"
>> +
>> + ? ? config BR2_ROOTFS_SKELETON_DEFAULT
>> + ? ? ? ? ? ? bool "default target skeleton"
>> + ? ? ? ?help
>> + ? ? ? ? ?Use default target skeleton
>> +
>> + ? ? config BR2_ROOTFS_SKELETON_CUSTOM
>> + ? ? ? ? ? ? bool "custom target skeleton"
>> + ? ? ? ? ? ? help
>> + ? ? ? ? ? ? ?Use custom target skeleton.
>> +
>> +endchoice
>> +
>> +if BR2_ROOTFS_SKELETON_CUSTOM
>> + ? ? config BR2_ROOTFS_SKELETON_CUSTOM_PATH
>> + ? ? ? ? ? ? string "custom target skeleton path"
>> + ? ? ? ?default "fs/skeleton"
>> + ? ? ? ? ? ? help
>> + ? ? ? ? ? ? ?Path custom target skeleton.
>> +endif
>> +
>> +
>
> You have indentation issues here. It should be:
>
> choice
> ? ? ? ?prompt "Root FS skeleton"
>
> config BR2_ROOTFS_SKELETON_DEFAULT
> ? ? ? ?bool "default target skeleton"
> ? ? ? ?help
> ? ? ? ? ?Use default target skeleton
>
> config BR2_ROOTFS_SKELETON_CUSTOM
> ? ? ? ?bool "custom target skeleton"
> ? ? ? ?help
> ? ? ? ? ?Use custom target skeleton
>
> endchoice
>
> if BR2_ROOTFS_SKELETON_CUSTOM
>
> config BR2_ROOTFS_SKELETON_CUSTOM_PATH
> ? ? ? ?string "custom target skeleton path"
> ? ? ? ?default "fs/skeleton"
> ? ? ? ?help
> ? ? ? ? ?Path to the custom target skeleton
>
> endif
>
> So :
>
> ?* config statements at the beginning of the line
> ?* one tab before "bool" and "help"
> ?* tab + 2 spaces before each line of the help message
>
> Otherwise, looks good to me, thanks!
>
> Thomas
> --
> Thomas Petazzoni, Free Electrons
> Kernel, drivers, real-time and embedded Linux
> development, consulting, training and support.
> http://free-electrons.com
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [Buildroot] [PATCH 2/2] [skeleton] option to define path to custom rootfs skeleton
@ 2010-06-16 20:25 Dmytro Milinevskyy
  0 siblings, 0 replies; 4+ messages in thread
From: Dmytro Milinevskyy @ 2010-06-16 20:25 UTC (permalink / raw)
  To: buildroot


Signed-off-by: Dmytro Milinevskyy <milinevskyy@gmail.com>
---
 Makefile     |    4 ++++
 fs/Config.in |   23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/Makefile b/Makefile
index e0fac17..58a7a72 100644
--- a/Makefile
+++ b/Makefile
@@ -368,6 +368,10 @@ $(STAGING_DIR):
 	@mkdir -p $(STAGING_DIR)/usr/include
 	@mkdir -p $(STAGING_DIR)/usr/bin
 
+ifeq ($(BR2_ROOTFS_SKELETON_CUSTOM),y)
+TARGET_SKELETON=$(BR2_ROOTFS_SKELETON_CUSTOM_PATH)
+endif
+
 $(BUILD_DIR)/.root:
 	mkdir -p $(TARGET_DIR)
 	if ! [ -d "$(TARGET_DIR)/bin" ]; then \
diff --git a/fs/Config.in b/fs/Config.in
index 6865eea..188e815 100644
--- a/fs/Config.in
+++ b/fs/Config.in
@@ -23,6 +23,29 @@ config BR2_ROOTFS_DEVICE_TABLE
          to the makedevs utility to create all the special device
          files in the target filesystem.
 
+choice
+	prompt "Root FS skeleton"
+
+config BR2_ROOTFS_SKELETON_DEFAULT
+	bool "default target skeleton"
+	help
+	  Use default target skeleton
+
+config BR2_ROOTFS_SKELETON_CUSTOM
+	bool "custom target skeleton"
+	help
+	  Use custom target skeleton.
+
+endchoice
+
+if BR2_ROOTFS_SKELETON_CUSTOM
+config BR2_ROOTFS_SKELETON_CUSTOM_PATH
+	string "custom target skeleton path"
+	default "fs/skeleton"
+	help
+	  Path custom target skeleton.
+endif
+
 source "fs/cramfs/Config.in"
 source "fs/cloop/Config.in"
 source "fs/ext2/Config.in"
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2010-06-16 20:25 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-16 20:25 [Buildroot] [PATCH 2/2] [skeleton] option to define path to custom rootfs skeleton Dmytro Milinevskyy
  -- strict thread matches above, loose matches on Subject: below --
2010-06-10 19:58 Dmytro Milinevskyy
2010-06-15  7:21 ` Thomas Petazzoni
2010-06-15  8:14   ` Dmytro Milinevskyy

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox