Skip to contentSkip to conversation

matrix-tui: Update to arago toolchain

PATCH Superseded Jeff Lance 4 participants 8 messages Jun 22, 2011 – Jun 23, 2011

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Jeff Lance

author
#0 lore raw

PATCH 1/1 matrix-tui: Update to arago toolchain

* Modify to use arago MACHINE name for platforms
* Add all Sitara platforms
* Update SRCREV to 41

---
 recipes/ti/matrix-tui.inc    |   12 +++---------
 recipes/ti/matrix-tui_1.1.bb |    4 ++--
 2 files changed, 5 insertions(+), 11 deletions(-)
recipes/ti/matrix-tui.inc +3 -9
index 1ad8aa8..a3793d3 100644
@@ -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
recipes/ti/matrix-tui_1.1.bb +2 -2
index 9814d5f..7e95d62 100644
@@ -1,4 +1,4 @@
 require matrix-tui.inc
 
-SRCREV = "37"
-PR = "${INC_PR}.4"
+SRCREV = "41"
+PR = "${INC_PR}.5"
Signature · 1 line
1.7.0.4
#1 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 1 line · Jeff Lance

* 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-----

#2 lore raw
Quoted 4 lines · Koen Kooi
Quoted 1 line · Jeff Lance

* 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... :)

Signature · 1 line
Denys
#3 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 8 lines · Denys Dmytriyenko
Quoted 4 lines · Koen Kooi
Quoted 1 line · Jeff Lance

* 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-----

author
#4 lore raw
In reply to Koen Kooi

Denys, Koen,

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

Quoted 21 lines · Koen Kooi

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 1 line · Jeff Lance

* 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
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

#5 lore raw
In reply to Jeff Lance
Quoted 5 lines · Jeff Lance

* Modify to use arago MACHINE name for platforms
* Add all Sitara platforms
* Update SRCREV to 41

Jeff,

See my coments below.

Quoted 24 lines
---
 recipes/ti/matrix-tui.inc    |   12 +++---------
 recipes/ti/matrix-tui_1.1.bb |    4 ++--
 2 files changed, 5 insertions(+), 11 deletions(-)
recipes/ti/matrix-tui.inc +0 -7
index 1ad8aa8..a3793d3 100644
@@ -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 \
 "

recipes/ti/matrix-tui.inc S = "${WORKDIR}/trunk" · line 24

Quoted 5 lines
recipes/ti/matrix-tui.inc +1 -1
@@ -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...

Quoted 36 lines
recipes/ti/matrix-tui.inc +2 -1
 	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
recipes/ti/matrix-tui_1.1.bb +2 -2
index 9814d5f..7e95d62 100644
@@ -1,4 +1,4 @@
 require matrix-tui.inc
 
-SRCREV = "37"
-PR = "${INC_PR}.4"
+SRCREV = "41"
+PR = "${INC_PR}.5"
Signature · 7 lines
1.7.0.4


_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
#6 lore raw
Quoted 57 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Denys Dmytriyenko
Sent: Wednesday, June 22, 2011 4:11 PM
To: [email protected]
Cc: Lance, Jeff
Subject: Re: [oe] [PATCH 1/1] matrix-tui: Update to arago toolchain

Quoted 5 lines · Jeff Lance

* Modify to use arago MACHINE name for platforms
* Add all Sitara platforms
* Update SRCREV to 41

Jeff,

See my coments below.

Quoted 11 lines
---
 recipes/ti/matrix-tui.inc    |   12 +++---------
 recipes/ti/matrix-tui_1.1.bb |    4 ++--
 2 files changed, 5 insertions(+), 11 deletions(-)
recipes/ti/matrix-tui.inc +0 -0
index 1ad8aa8..a3793d3 100644
@@ -9,13 +9,6 @@ INC_PR = "r7"
 

recipes/ti/matrix-tui.inc INC_PR = "r7" · line 12

Quoted 10 lines
recipes/ti/matrix-tui.inc +0 -7
 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='' \

recipes/ti/matrix-tui.inc S = "${WORKDIR}/trunk" · line 31

Quoted 7 lines
recipes/ti/matrix-tui.inc +0 -1
 	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

recipes/ti/matrix-tui.inc S = "${WORKDIR}/trunk" · line 24

Quoted 1 line
recipes/ti/matrix-tui.inc +1 -0
+	sed -i -e 's:PATH=${LINUX_DEVKIT_PATH}/arm-arago-linux-

gnueabi:PATH ?= ${LINUX_DEVKIT_PATH}/arm-arago-linux-gnueabi:' makefile.init

Quoted 5 lines

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?

Quoted 46 lines
Quoted 9 lines
recipes/ti/matrix-tui.inc +0 -0
 	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}

recipes/ti/matrix-tui.inc do_compile() { · line 43

Quoted 10 lines
recipes/ti/matrix-tui.inc +2 -1
+	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

recipes/ti/matrix-

Quoted 1 line
recipes/ti/matrix- renamed from recipes/ti/matrix-tui_1.1.bb +0 -0

tui_1.1.bb

Quoted 14 lines

index 9814d5f..7e95d62 100644

recipes/ti/matrix-tui_1.1.bb +2 -3
@@ -1,4 +1,4 @@
 require matrix-tui.inc
 
-SRCREV = "37"
-PR = "${INC_PR}.4"
+SRCREV = "41"
+PR = "${INC_PR}.5"
--

1.7.0.4

Quoted 4 lines

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-

devel

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

#7 lore raw
Quoted 17 lines · Chase
Quoted 11 lines

recipes/ti/matrix-tui.inc S = "${WORKDIR}/trunk" · line 31

Quoted 5 lines
recipes/ti/matrix-tui.inc +0 -1
@@ -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

Review S = "${WORKDIR}/trunk" · line 24

Quoted 1 line
(quoted diff) +1 -0
+	sed -i -e 's:PATH=${LINUX_DEVKIT_PATH}/arm-arago-linux-

gnueabi:PATH ?= ${LINUX_DEVKIT_PATH}/arm-arago-linux-gnueabi:' makefile.init

Quoted 5 lines

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...

Quoted 7 lines

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!

Quoted 1 line
Quoted 1 line

recipes/ti/matrix-tui.inc S = "${WORKDIR}/trunk" · line 25

Quoted 1 line
recipes/ti/matrix-tui.inc +0 -0
 	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.

Signature · 1 line
Denys