[Buildroot] [PATCH] Repair initramfs dependancies after move to fs

[Buildroot] [PATCH] Repair initramfs dependancies after move to fs

[Will Wagner]

The restructure for building root filesystems changed the target name
for the initramfs file, to build the file the trget is now
initramfs-root but the generated file is rootfs.initramfs

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 fs/initramfs/initramfs.mk         |    6 ++++++
 target/linux/Makefile.in          |    2 +-
 target/linux/Makefile.in.advanced |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/fs/initramfs/initramfs.mk b/fs/initramfs/initramfs.mk
index 4a205d1..9aaf1b0 100644
--- a/fs/initramfs/initramfs.mk
+++ b/fs/initramfs/initramfs.mk
@@ -6,6 +6,12 @@
 #
 #############################################################
 
+ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
+INITRAMFS_TARGET:=initramfs-root
+else
+INITRAMFS_TARGET:= #nothing
+endif
+
 define ROOTFS_INITRAMFS_INIT_SYMLINK
 	rm -f $(TARGET_DIR)/init
 	ln -s sbin/init $(TARGET_DIR)/init
diff --git a/target/linux/Makefile.in b/target/linux/Makefile.in
index f3c7807..41e4821 100644
--- a/target/linux/Makefile.in
+++ b/target/linux/Makefile.in
@@ -153,7 +153,7 @@ endif
 	$(SED) '/CONFIG_INITRAMFS_SOURCE/d' $(LINUX26_DIR)/.config
 	$(SED) '/INITRAMFS_ROOT_.ID/d' $(LINUX26_DIR)/.config
 ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
-	echo "CONFIG_INITRAMFS_SOURCE=\"$(INITRAMFS_TARGET)\"" >> \
+	echo "CONFIG_INITRAMFS_SOURCE=\"$(BINARIES_DIR)/rootfs.initramfs\"" >> \
 		$(LINUX26_DIR)/.config
 	echo "CONFIG_INITRAMFS_ROOT_UID=0" >> $(LINUX26_DIR)/.config
 	echo "CONFIG_INITRAMFS_ROOT_GID=0" >> $(LINUX26_DIR)/.config
diff --git a/target/linux/Makefile.in.advanced b/target/linux/Makefile.in.advanced
index 0eb1b82..99f3f45 100644
--- a/target/linux/Makefile.in.advanced
+++ b/target/linux/Makefile.in.advanced
@@ -354,7 +354,7 @@ endif
 	$(SED) '/CONFIG_INITRAMFS_SOURCE/d' $(LINUX26_DIR)/.config
 	$(SED) '/INITRAMFS_ROOT_.ID/d' $(LINUX26_DIR)/.config
 ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
-	echo "CONFIG_INITRAMFS_SOURCE=\"$(INITRAMFS_TARGET)\"" >> \
+	echo "CONFIG_INITRAMFS_SOURCE=\"$(BINARIES_DIR)/rootfs.initramfs\"" >> \
 		$(LINUX26_DIR)/.config
 	echo "CONFIG_INITRAMFS_ROOT_UID=0" >> $(LINUX26_DIR)/.config
 	echo "CONFIG_INITRAMFS_ROOT_GID=0" >> $(LINUX26_DIR)/.config
-- 
1.7.0

[Buildroot] [PATCH] Repair initramfs dependancies after move to fs

[Thomas Petazzoni]

On Mon, 19 Apr 2010 15:34:49 +0100
Will Wagner <will_wagner@carallon.com> wrote:

> The restructure for building root filesystems changed the target name
> for the initramfs file, to build the file the trget is now
> initramfs-root but the generated file is rootfs.initramfs
> 
> Signed-off-by: Will Wagner <will_wagner@carallon.com>

I'm not a big fan of this "hidden" dependencies, but I believe in the
case of the kernel and its initramfs there isn't a lot of choice.
Therefore:

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH] Repair initramfs dependancies after move to fs

[Peter Korsgaard]

>>>>> "Will" == Will Wagner <will_wagner@carallon.com> writes:

 Will> The restructure for building root filesystems changed the target name
 Will> for the initramfs file, to build the file the trget is now
 Will> initramfs-root but the generated file is rootfs.initramfs

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH] Repair initramfs dependancies after move to fs

[Thomas Petazzoni]

Hello Will,

I'm replying on this old patch that I acked back in April. But I now
have one question. While I still agree on the changes on
target/linux/Makefile* (now linux/linux.mk), I don't understand why the
following change was needed:

> diff --git a/fs/initramfs/initramfs.mk b/fs/initramfs/initramfs.mk
> index 4a205d1..9aaf1b0 100644
> --- a/fs/initramfs/initramfs.mk
> +++ b/fs/initramfs/initramfs.mk
> @@ -6,6 +6,12 @@
>  #
>  #############################################################
>  
> +ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
> +INITRAMFS_TARGET:=initramfs-root
> +else
> +INITRAMFS_TARGET:= #nothing
> +endif

the INITRAMFS_TARGET variable isn't used anywhere in the current git.
Isn't this code useless ? (I think it is, but I'd like to be sure).

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

[Buildroot] [PATCH] Repair initramfs dependancies after move to fs

[William Wagner]

On 04/11/2010 16:16, Thomas Petazzoni wrote:
> Hello Will,
>
> I'm replying on this old patch that I acked back in April. But I now
> have one question. While I still agree on the changes on
> target/linux/Makefile* (now linux/linux.mk), I don't understand why the
> following change was needed:
>
>> diff --git a/fs/initramfs/initramfs.mk b/fs/initramfs/initramfs.mk
>> index 4a205d1..9aaf1b0 100644
>> --- a/fs/initramfs/initramfs.mk
>> +++ b/fs/initramfs/initramfs.mk
>> @@ -6,6 +6,12 @@
>>   #
>>   #############################################################
>>
>> +ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
>> +INITRAMFS_TARGET:=initramfs-root
>> +else
>> +INITRAMFS_TARGET:= #nothing
>> +endif
> the INITRAMFS_TARGET variable isn't used anywhere in the current git.
> Isn't this code useless ? (I think it is, but I'd like to be sure).

Yes I think you are right. It looks like this was only needed with the 
old kernel build sequence, the new linux/linux.mk doesn't need it.

Will

-- 
------------------------------------------------------------------------
Will Wagner                                     will_wagner at carallon.com
Development Manager                      Office Tel: +44 (0)20 7371 2032
Carallon Ltd, Studio G20, Shepherds Building, Rockley Rd, London W14 0DA
------------------------------------------------------------------------