[meta-fsl-arm][PATCH 1/2] barebox: Rework do_configure_prepend to do_pre_configure

[meta-fsl-arm][PATCH 1/2] barebox: Rework do_configure_prepend to do_pre_configure

[Alexandre Belloni]

Defining a new task instead of using configure_prepend allows inheriting
recipes to override the pre_configure task.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 recipes-bsp/barebox/barebox.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes-bsp/barebox/barebox.inc b/recipes-bsp/barebox/barebox.inc
index 5902f15..e52b463 100644
--- a/recipes-bsp/barebox/barebox.inc
+++ b/recipes-bsp/barebox/barebox.inc
@@ -20,10 +20,11 @@ BAREBOXENV_SYMLINK ?= "bareboxenv-${MACHINE}.bin"
 
 INSANE_SKIP_${PN} = "True"
 
-do_configure_prepend() {
+do_pre_configure() {
 	   cp ${WORKDIR}/defconfig ${S}/.config
 	   oe_runmake oldconfig
 }
+addtask pre_configure before do_configure after do_patch
 
 do_compile () {
 	if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then
-- 
1.8.1.2

[meta-fsl-arm][PATCH 2/2] barebox: move environment deployment to its own task

[Alexandre Belloni]

Introduce a new task ito deploy the environment to allow inheriting
recipes to override it.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 recipes-bsp/barebox/barebox.inc | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/recipes-bsp/barebox/barebox.inc b/recipes-bsp/barebox/barebox.inc
index e52b463..00595cc 100644
--- a/recipes-bsp/barebox/barebox.inc
+++ b/recipes-bsp/barebox/barebox.inc
@@ -39,13 +39,10 @@ do_compile () {
 do_deploy () {
 	install -d ${DEPLOY_DIR_IMAGE}
 	install ${S}/${BAREBOX_BINARY} ${DEPLOY_DIR_IMAGE}/${BAREBOX_IMAGE}
-	install ${S}/barebox_default_env ${DEPLOY_DIR_IMAGE}/${BAREBOXENV_BIN}
 
 	cd ${DEPLOY_DIR_IMAGE}
 	rm -f ${BAREBOX_SYMLINK}
-	rm -f ${BAREBOXENV_SYMLINK}
 	ln -sf ${BAREBOX_IMAGE} ${BAREBOX_SYMLINK}
-	ln -sf ${BAREBOXENV_BIN} ${BAREBOXENV_SYMLINK}
 
 	install -d ${STAGING_BINDIR_NATIVE}
 	cd ${S}
@@ -55,3 +52,12 @@ do_deploy () {
 
 do_deploy[dirs] = "${S}"
 addtask deploy before do_build after do_compile
+
+do_env_deploy() {
+	install ${S}/barebox_default_env ${DEPLOY_DIR_IMAGE}/${BAREBOXENV_BIN}
+
+	cd ${DEPLOY_DIR_IMAGE}
+	rm -f ${BAREBOXENV_SYMLINK}
+	ln -sf ${BAREBOXENV_BIN} ${BAREBOXENV_SYMLINK}
+}
+addtask env_deploy before do_build after do_deploy
-- 
1.8.1.2

Re: [meta-fsl-arm][PATCH 1/2] barebox: Rework do_configure_prepend to do_pre_configure

[Otavio Salvador]

Hello  Alexandre,

On Wed, Aug 7, 2013 at 7:40 AM, Alexandre Belloni
<alexandre.belloni@free-electrons.com> wrote:
> Defining a new task instead of using configure_prepend allows inheriting
> recipes to override the pre_configure task.
>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

I applied both batches to master branch. Thanks for those.

I'd like to know if you'd be willing to prepare a patchset to move
barebox to OE-Core as it should be put there, not in meta-fsl-arm?

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-fsl-arm][PATCH 1/2] barebox: Rework do_configure_prepend to do_pre_configure

[Alexandre Belloni]

Hello,

On 07/08/2013 15:35, Otavio Salvador wrote:
> Hello  Alexandre,
>
> On Wed, Aug 7, 2013 at 7:40 AM, Alexandre Belloni
> <alexandre.belloni@free-electrons.com> wrote:
>> Defining a new task instead of using configure_prepend allows inheriting
>> recipes to override the pre_configure task.
>>
>> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> I applied both batches to master branch. Thanks for those.
>
> I'd like to know if you'd be willing to prepare a patchset to move
> barebox to OE-Core as it should be put there, not in meta-fsl-arm?
>

The actual current goal is to get support for the i.mx28 based cfa-100xx
boards in meta-fsl-arm-extra. As the boards are supported by the
mainline barebox and they have a defconfig there, I had to get the
flexibility to do:

do_pre_configure() {
    oe_runmake cfa10036_defconfig
}

in my recipe.

Also, barebox_default_env is now generated in common/ and I want to had
support for custom default environment.

What features do you think would be missing before submitting that to
oe-core ?

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Re: [meta-fsl-arm][PATCH 1/2] barebox: Rework do_configure_prepend to do_pre_configure

[Eric Bénard]

Hi Alexandre,

Le Wed, 07 Aug 2013 16:46:49 +0200,
Alexandre Belloni <alexandre.belloni@free-electrons.com> a écrit :
> On 07/08/2013 15:35, Otavio Salvador wrote:
> > I'd like to know if you'd be willing to prepare a patchset to move
> > barebox to OE-Core as it should be put there, not in meta-fsl-arm?
> >
> What features do you think would be missing before submitting that to
> oe-core ?
> 
Last time I asked on oe-core's mailing list concerning the criteria to
get barebox accepted, I didn't get any answer, maybe you will have more
luck.

Eric

Re: [meta-fsl-arm][PATCH 1/2] barebox: Rework do_configure_prepend to do_pre_configure

[Otavio Salvador]

On Wed, Aug 7, 2013 at 11:46 AM, Alexandre Belloni
<alexandre.belloni@free-electrons.com> wrote:
> Hello,
>
> On 07/08/2013 15:35, Otavio Salvador wrote:
>> Hello  Alexandre,
>>
>> On Wed, Aug 7, 2013 at 7:40 AM, Alexandre Belloni
>> <alexandre.belloni@free-electrons.com> wrote:
>>> Defining a new task instead of using configure_prepend allows inheriting
>>> recipes to override the pre_configure task.
>>>
>>> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
>> I applied both batches to master branch. Thanks for those.
>>
>> I'd like to know if you'd be willing to prepare a patchset to move
>> barebox to OE-Core as it should be put there, not in meta-fsl-arm?
>>
>
> The actual current goal is to get support for the i.mx28 based cfa-100xx
> boards in meta-fsl-arm-extra. As the boards are supported by the
> mainline barebox and they have a defconfig there, I had to get the
> flexibility to do:
>
> do_pre_configure() {
>     oe_runmake cfa10036_defconfig
> }
>
> in my recipe.
>
> Also, barebox_default_env is now generated in common/ and I want to had
> support for custom default environment.
>
> What features do you think would be missing before submitting that to
> oe-core ?

I think a small cleanup and test it on qemu.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

[meta-fsl-arm][PATCH 1/2] barebox: Rework do_configure_prepend to do_pre_configure

[Alexandre Belloni]

Defining a new task instead of using configure_prepend allows inheriting
recipes to override the pre_configure task.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 recipes-bsp/barebox/barebox.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes-bsp/barebox/barebox.inc b/recipes-bsp/barebox/barebox.inc
index 5902f15..e52b463 100644
--- a/recipes-bsp/barebox/barebox.inc
+++ b/recipes-bsp/barebox/barebox.inc
@@ -20,10 +20,11 @@ BAREBOXENV_SYMLINK ?= "bareboxenv-${MACHINE}.bin"
 
 INSANE_SKIP_${PN} = "True"
 
-do_configure_prepend() {
+do_pre_configure() {
 	   cp ${WORKDIR}/defconfig ${S}/.config
 	   oe_runmake oldconfig
 }
+addtask pre_configure before do_configure after do_patch
 
 do_compile () {
 	if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then
-- 
1.8.1.2