Patchwork [1/1] matrix-tui: Update to arago toolchain

login
register
mail settings
Submitter Jeff Lance
Date June 22, 2011, 7:02 p.m.
Message ID <1308769321-26192-1-git-send-email-j-lance1@ti.com>
Download mbox | patch
Permalink /patch/6339/
State Superseded
Headers show

Comments

Jeff Lance - June 22, 2011, 7:02 p.m.
* Modify to use arago MACHINE name for platforms
* Add all Sitara platforms
* Update SRCREV to 41

Signed-off-by: Jeff Lance <j-lance1@ti.com>
---
 recipes/ti/matrix-tui.inc    |   12 +++---------
 recipes/ti/matrix-tui_1.1.bb |    4 ++--
 2 files changed, 5 insertions(+), 11 deletions(-)
Koen Kooi - June 22, 2011, 8:48 p.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 22-06-11 21:02, Jeff Lance wrote:
> * Modify to use arago MACHINE name for platforms

This seems to use OE machine names, not arago ones.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFOAlU7MkyGM64RGpERArNMAKCKDhoL6RlXDoer6iTxSqSSS/kz5gCgl7a/
QWX5DbueV0sa410g3jcZ/HU=
=a3L3
-----END PGP SIGNATURE-----
Denys Dmytriyenko - June 22, 2011, 9:08 p.m.
On Wed, Jun 22, 2011 at 10:48:59PM +0200, Koen Kooi wrote:
> On 22-06-11 21:02, Jeff Lance wrote:
> > * Modify to use arago MACHINE name for platforms
> 
> This seems to use OE machine names, not arago ones.

Technically correct. But since Arago is just an OE distro, the machine names 
are the same. It's like arguing that omap3evm is not Angstrom machine... :)
Denys Dmytriyenko - June 22, 2011, 9:11 p.m.
On Wed, Jun 22, 2011 at 02:02:01PM -0500, Jeff Lance wrote:
> * Modify to use arago MACHINE name for platforms
> * Add all Sitara platforms
> * Update SRCREV to 41
> 
> Signed-off-by: Jeff Lance <j-lance1@ti.com>

Jeff,

See my coments below.


> ---
>  recipes/ti/matrix-tui.inc    |   12 +++---------
>  recipes/ti/matrix-tui_1.1.bb |    4 ++--
>  2 files changed, 5 insertions(+), 11 deletions(-)
> 
> diff --git a/recipes/ti/matrix-tui.inc b/recipes/ti/matrix-tui.inc
> index 1ad8aa8..a3793d3 100644
> --- a/recipes/ti/matrix-tui.inc
> +++ b/recipes/ti/matrix-tui.inc
> @@ -9,13 +9,6 @@ INC_PR = "r7"
>  
>  COMPATIBLE_MACHINE = "(omapl138|omap3)"
>  
> -PLATFORM_am37x-evm = "am3715"
> -PLATFORM_beagleboard = "am3715"
> -PLATFORM_am3517-evm = "am3517"
> -PLATFORM_am180x-evm = "am180x"
> -PLATFORM_am181x-evm = "am181x"
> -PLATFORM_da850-omapl138-evm = "am180x"
> -
>  SRC_URI = "svn://gforge.ti.com/svn/matrix_tui/;module=trunk;proto=https;user=anonymous;pswd='' \
>  	file://init \
>  "
> @@ -28,7 +21,7 @@ S = "${WORKDIR}/trunk"
>  #INITSCRIPT_PARAMS = "defaults 99"
>  
>  do_configure() {
> -	sed -i -e 's:PATH=${LINUX_DEVKIT_PATH}/arm-none-linux-gnueabi:PATH ?= ${LINUX_DEVKIT_PATH}/arm-none-linux-gnueabi:' makefile.init
> +	sed -i -e 's:PATH=${LINUX_DEVKIT_PATH}/arm-arago-linux-gnueabi:PATH ?= ${LINUX_DEVKIT_PATH}/arm-arago-linux-gnueabi:' makefile.init

I don't think this is needed. The whole point of that sed magic I put in 
there, is to make assignments of TUI_INCLUDE_PATH, XML_INCLUDE_PATH and 
TUI_LIB_PATH conditionally, so they can be overwritten below in the 
do_compile() task...


>  	sed -i -e 's|LIBS :=|LIBS := ${LDFLAGS} |' Release/objects.mk
>  }
>  
> @@ -39,11 +32,12 @@ do_compile() {
>  	export TUI_INCLUDE_PATH=${STAGING_INCDIR}
>  	export XML_INCLUDE_PATH=${STAGING_INCDIR}/libxml2
>  	export TUI_LIB_PATH=${STAGING_LIBDIR}
> +	export PLATFORM=${MACHINE}
>  	make release
>  }
>  
>  do_install() {
> -	export PLATFORM=${PLATFORM}
> +	export PLATFORM=${MACHINE}
>  	make DESTDIR=${D} install
>  	install -d ${D}${sysconfdir}/init.d/
>  	install -c -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/matrix-tui
> diff --git a/recipes/ti/matrix-tui_1.1.bb b/recipes/ti/matrix-tui_1.1.bb
> index 9814d5f..7e95d62 100644
> --- a/recipes/ti/matrix-tui_1.1.bb
> +++ b/recipes/ti/matrix-tui_1.1.bb
> @@ -1,4 +1,4 @@
>  require matrix-tui.inc
>  
> -SRCREV = "37"
> -PR = "${INC_PR}.4"
> +SRCREV = "41"
> +PR = "${INC_PR}.5"
> -- 
> 1.7.0.4
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Koen Kooi - June 22, 2011, 9:58 p.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 22-06-11 23:08, Denys Dmytriyenko wrote:
> On Wed, Jun 22, 2011 at 10:48:59PM +0200, Koen Kooi wrote:
>> On 22-06-11 21:02, Jeff Lance wrote:
>>> * Modify to use arago MACHINE name for platforms
>>
>> This seems to use OE machine names, not arago ones.
> 
> Technically correct. But since Arago is just an OE distro, the machine names 
> are the same. It's like arguing that omap3evm is not Angstrom machine... :)

But since arago is not present in OE we shouldn't make such mistakes in
commit messages, no?

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFOAmV1MkyGM64RGpERAm98AJ9Dr4/KQ+RCKIdCIYapLoNfVeTKggCgmdCl
/PBldHthKj8lIYWqUBfCFp0=
=wdiK
-----END PGP SIGNATURE-----
chase maupin - June 22, 2011, 10:17 p.m.
> -----Original Message-----
> From: openembedded-devel-bounces@lists.openembedded.org
> [mailto:openembedded-devel-bounces@lists.openembedded.org] On Behalf Of
> Denys Dmytriyenko
> Sent: Wednesday, June 22, 2011 4:11 PM
> To: openembedded-devel@lists.openembedded.org
> Cc: Lance, Jeff
> Subject: Re: [oe] [PATCH 1/1] matrix-tui: Update to arago toolchain
> 
> On Wed, Jun 22, 2011 at 02:02:01PM -0500, Jeff Lance wrote:
> > * Modify to use arago MACHINE name for platforms
> > * Add all Sitara platforms
> > * Update SRCREV to 41
> >
> > Signed-off-by: Jeff Lance <j-lance1@ti.com>
> 
> Jeff,
> 
> See my coments below.
> 
> 
> > ---
> >  recipes/ti/matrix-tui.inc    |   12 +++---------
> >  recipes/ti/matrix-tui_1.1.bb |    4 ++--
> >  2 files changed, 5 insertions(+), 11 deletions(-)
> >
> > diff --git a/recipes/ti/matrix-tui.inc b/recipes/ti/matrix-tui.inc
> > index 1ad8aa8..a3793d3 100644
> > --- a/recipes/ti/matrix-tui.inc
> > +++ b/recipes/ti/matrix-tui.inc
> > @@ -9,13 +9,6 @@ INC_PR = "r7"
> >
> >  COMPATIBLE_MACHINE = "(omapl138|omap3)"
> >
> > -PLATFORM_am37x-evm = "am3715"
> > -PLATFORM_beagleboard = "am3715"
> > -PLATFORM_am3517-evm = "am3517"
> > -PLATFORM_am180x-evm = "am180x"
> > -PLATFORM_am181x-evm = "am181x"
> > -PLATFORM_da850-omapl138-evm = "am180x"
> > -
> >  SRC_URI =
> "svn://gforge.ti.com/svn/matrix_tui/;module=trunk;proto=https;user=anon
> ymous;pswd='' \
> >  	file://init \
> >  "
> > @@ -28,7 +21,7 @@ S = "${WORKDIR}/trunk"
> >  #INITSCRIPT_PARAMS = "defaults 99"
> >
> >  do_configure() {
> > -	sed -i -e 's:PATH=${LINUX_DEVKIT_PATH}/arm-none-linux-
> gnueabi:PATH ?= ${LINUX_DEVKIT_PATH}/arm-none-linux-gnueabi:'
> makefile.init
> > +	sed -i -e 's:PATH=${LINUX_DEVKIT_PATH}/arm-arago-linux-
> gnueabi:PATH ?= ${LINUX_DEVKIT_PATH}/arm-arago-linux-gnueabi:'
> makefile.init
> 
> I don't think this is needed. The whole point of that sed magic I put
> in
> there, is to make assignments of TUI_INCLUDE_PATH, XML_INCLUDE_PATH and
> TUI_LIB_PATH conditionally, so they can be overwritten below in the
> do_compile() task...

The makefile defaults have been changed to use arm-arago-linux-gnueabi instead of the arm-none-linux-gnueabi.  If you want these values to still be optionally assigned then you would still need these changes right?

Now perhaps a better way to do this is change the makefile.init to use the ?= optional assignment so that you don't need to do this sed magic.  Would that also work?

> 
> 
> >  	sed -i -e 's|LIBS :=|LIBS := ${LDFLAGS} |' Release/objects.mk
> >  }
> >
> > @@ -39,11 +32,12 @@ do_compile() {
> >  	export TUI_INCLUDE_PATH=${STAGING_INCDIR}
> >  	export XML_INCLUDE_PATH=${STAGING_INCDIR}/libxml2
> >  	export TUI_LIB_PATH=${STAGING_LIBDIR}
> > +	export PLATFORM=${MACHINE}
> >  	make release
> >  }
> >
> >  do_install() {
> > -	export PLATFORM=${PLATFORM}
> > +	export PLATFORM=${MACHINE}
> >  	make DESTDIR=${D} install
> >  	install -d ${D}${sysconfdir}/init.d/
> >  	install -c -m 0755 ${WORKDIR}/init
> ${D}${sysconfdir}/init.d/matrix-tui
> > diff --git a/recipes/ti/matrix-tui_1.1.bb b/recipes/ti/matrix-
> tui_1.1.bb
> > index 9814d5f..7e95d62 100644
> > --- a/recipes/ti/matrix-tui_1.1.bb
> > +++ b/recipes/ti/matrix-tui_1.1.bb
> > @@ -1,4 +1,4 @@
> >  require matrix-tui.inc
> >
> > -SRCREV = "37"
> > -PR = "${INC_PR}.4"
> > +SRCREV = "41"
> > +PR = "${INC_PR}.5"
> > --
> > 1.7.0.4
> >
> >
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-
> devel
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Denys Dmytriyenko - June 23, 2011, 12:30 a.m.
On Wed, Jun 22, 2011 at 05:17:48PM -0500, Maupin, Chase wrote:
> > > @@ -28,7 +21,7 @@ S = "${WORKDIR}/trunk"
> > >  #INITSCRIPT_PARAMS = "defaults 99"
> > >
> > >  do_configure() {
> > > -	sed -i -e 's:PATH=${LINUX_DEVKIT_PATH}/arm-none-linux-
> > gnueabi:PATH ?= ${LINUX_DEVKIT_PATH}/arm-none-linux-gnueabi:'
> > makefile.init
> > > +	sed -i -e 's:PATH=${LINUX_DEVKIT_PATH}/arm-arago-linux-
> > gnueabi:PATH ?= ${LINUX_DEVKIT_PATH}/arm-arago-linux-gnueabi:'
> > makefile.init
> > 
> > I don't think this is needed. The whole point of that sed magic I put
> > in
> > there, is to make assignments of TUI_INCLUDE_PATH, XML_INCLUDE_PATH and
> > TUI_LIB_PATH conditionally, so they can be overwritten below in the
> > do_compile() task...
> 
> The makefile defaults have been changed to use arm-arago-linux-gnueabi 
> instead of the arm-none-linux-gnueabi.  If you want these values to still be 
> optionally assigned then you would still need these changes right?
> 
> Now perhaps a better way to do this is change the makefile.init to use the 
> ?= optional assignment so that you don't need to do this sed magic.  Would 
> that also work?

That would be great, thanks!


> > >  	sed -i -e 's|LIBS :=|LIBS := ${LDFLAGS} |' Release/objects.mk

Maybe you can add this one in the default Makefile too? :) Less hacking in the 
recipe.
Jeff Lance - June 23, 2011, 2:40 p.m.
Denys, Koen,

I will submit a v2 patch which removes the "sed" and changes the commit
comment to "OE MACHINE".

On Wed, Jun 22, 2011 at 3:48 PM, Koen Kooi <koen@dominion.thruhere.net>wrote:

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 22-06-11 21:02, Jeff Lance wrote:
> > * Modify to use arago MACHINE name for platforms
>
> This seems to use OE machine names, not arago ones.
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.5 (Darwin)
>
> iD8DBQFOAlU7MkyGM64RGpERArNMAKCKDhoL6RlXDoer6iTxSqSSS/kz5gCgl7a/
> QWX5DbueV0sa410g3jcZ/HU=
> =a3L3
> -----END PGP SIGNATURE-----
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

Patch

diff --git a/recipes/ti/matrix-tui.inc b/recipes/ti/matrix-tui.inc
index 1ad8aa8..a3793d3 100644
--- a/recipes/ti/matrix-tui.inc
+++ b/recipes/ti/matrix-tui.inc
@@ -9,13 +9,6 @@  INC_PR = "r7"
 
 COMPATIBLE_MACHINE = "(omapl138|omap3)"
 
-PLATFORM_am37x-evm = "am3715"
-PLATFORM_beagleboard = "am3715"
-PLATFORM_am3517-evm = "am3517"
-PLATFORM_am180x-evm = "am180x"
-PLATFORM_am181x-evm = "am181x"
-PLATFORM_da850-omapl138-evm = "am180x"
-
 SRC_URI = "svn://gforge.ti.com/svn/matrix_tui/;module=trunk;proto=https;user=anonymous;pswd='' \
 	file://init \
 "
@@ -28,7 +21,7 @@  S = "${WORKDIR}/trunk"
 #INITSCRIPT_PARAMS = "defaults 99"
 
 do_configure() {
-	sed -i -e 's:PATH=${LINUX_DEVKIT_PATH}/arm-none-linux-gnueabi:PATH ?= ${LINUX_DEVKIT_PATH}/arm-none-linux-gnueabi:' makefile.init
+	sed -i -e 's:PATH=${LINUX_DEVKIT_PATH}/arm-arago-linux-gnueabi:PATH ?= ${LINUX_DEVKIT_PATH}/arm-arago-linux-gnueabi:' makefile.init
 	sed -i -e 's|LIBS :=|LIBS := ${LDFLAGS} |' Release/objects.mk
 }
 
@@ -39,11 +32,12 @@  do_compile() {
 	export TUI_INCLUDE_PATH=${STAGING_INCDIR}
 	export XML_INCLUDE_PATH=${STAGING_INCDIR}/libxml2
 	export TUI_LIB_PATH=${STAGING_LIBDIR}
+	export PLATFORM=${MACHINE}
 	make release
 }
 
 do_install() {
-	export PLATFORM=${PLATFORM}
+	export PLATFORM=${MACHINE}
 	make DESTDIR=${D} install
 	install -d ${D}${sysconfdir}/init.d/
 	install -c -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/matrix-tui
diff --git a/recipes/ti/matrix-tui_1.1.bb b/recipes/ti/matrix-tui_1.1.bb
index 9814d5f..7e95d62 100644
--- a/recipes/ti/matrix-tui_1.1.bb
+++ b/recipes/ti/matrix-tui_1.1.bb
@@ -1,4 +1,4 @@ 
 require matrix-tui.inc
 
-SRCREV = "37"
-PR = "${INC_PR}.4"
+SRCREV = "41"
+PR = "${INC_PR}.5"