Patchwork [v2] Makefile: move fs/common.mk above external.mk

login
register
mail settings
Submitter Thomas De Schampheleire
Date May 5, 2014, 7:52 a.m.
Message ID <d407527a4c853dd989fb.1399276333@argentina>
Download mbox | patch
Permalink /patch/345605/
State Accepted
Commit 00b1ff615634c1d90531cc684a657af71b1465d4
Headers show

Comments

Thomas De Schampheleire - May 5, 2014, 7:52 a.m.
From: Philippe Reynes <tremyfr@yahoo.fr>

The file external.mk was included before fs/common.mk, so it was impossible
to add rootfs targets using the BR2_EXTERNAL mechanism.
This change moves the inclusion of fs/common.mk before external.mk to allow
this.

Signed-off-by: Philippe Reynes <tremyfr@yahoo.fr>
[ThomasDS: rebased, update commit message]
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

---
v2: rebased, update commit message

Makefile |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
Peter Korsgaard - May 18, 2014, 10:36 p.m.
>>>>> "Thomas" == Thomas De Schampheleire <patrickdepinguin@gmail.com> writes:

 > From: Philippe Reynes <tremyfr@yahoo.fr>
 > The file external.mk was included before fs/common.mk, so it was impossible
 > to add rootfs targets using the BR2_EXTERNAL mechanism.
 > This change moves the inclusion of fs/common.mk before external.mk to allow
 > this.

 > Signed-off-by: Philippe Reynes <tremyfr@yahoo.fr>
 > [ThomasDS: rebased, update commit message]
 > Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

 > ---
 > v2: rebased, update commit message

Committed, thanks.

Patch

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -388,6 +388,7 @@  include $(sort $(wildcard package/*/*.mk
 include boot/common.mk
 include linux/linux.mk
 include system/system.mk
+include fs/common.mk
 
 include $(BR2_EXTERNAL)/external.mk
 
@@ -401,8 +402,6 @@  ifeq ($(BR2_ECLIPSE_REGISTER),y)
 TARGETS += toolchain-eclipse-register
 endif
 
-include fs/common.mk
-
 TARGETS_SOURCE := $(patsubst %,%-source,$(TARGETS))
 TARGETS_DIRCLEAN := $(patsubst %,%-dirclean,$(TARGETS))