Skip to contentSkip to conversation

TI tools - make EULA unpack work when /opt is writeable

PATCH Superseded Gary Thomas 4 participants 4 messages Aug 27, 2010 – Sep 6, 2010

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 TI tools - make EULA unpack work when /opt is writeable

This patch addresses the problem where the TI tools that need the EULA unpack into the wrong place if the user has write permission in /opt. The current behaviour of relying on the unpacker to fall back to the $HOME environment variable should not be relied on. The patch changes the unpack step to use the --prefix= option which will always work.

Note: only tested with these [recent] packages:
ti-cgt6x-1_6_1_9-r4
ti-cgt6x-1_6_1_14-r4
ti-codecs-omap3530-1_1_01_00-r2
ti-dspbios-5_41_04_18-r1
ti-edma3lld-01_11_00_03-r0
ti-xdctools-3_16_01_27-r2

Signature · 4 lines
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------

From cab9a3f415527559aa33f708c59c1e2b7023eac3 Mon Sep 17 00:00:00 2001
From: Gary Thomas <[email protected]>
Date: Fri, 27 Aug 2010 09:01:20 -0600
Subject: [PATCH] Make EULA unpacking work when /opt is writeable

---
 meta-ti/packages/ti/ti-codecs-omap3530_1.00.01.bb |    1 +
 meta-ti/packages/ti/ti-codecs-omap3530_1.01.00.bb |    1 +
 meta-ti/packages/ti/ti-dspbios.inc                |    1 +
 meta-ti/packages/ti/ti-edma3lld.inc               |    1 +
 meta-ti/packages/ti/ti-eula-unpack.inc            |    5 ++++-
 meta-ti/packages/ti/ti-xdctools.inc               |    1 +
 6 files changed, 9 insertions(+), 1 deletions(-)
meta-ti/packages/ti/ti-codecs-omap3530_1.00.01.bb +1 -0
index d6d871b..37d2679 100644
@@ -26,6 +26,7 @@ SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/dv
 
 BINFILE = "cs1omap3530_setuplinux_1_00_01-44.bin"
 TI_BIN_UNPK_CMDS = "Y:Y: qY:workdir"
+TI_BIN_UNPK_WDEXT="/dvsdk/dvsdk_3_00_02_44"
 
 DEPENDS = "ti-cgt6x ti-xdctools ti-dspbios ti-codec-engine ti-linuxutils"
 
meta-ti/packages/ti/ti-codecs-omap3530_1.01.00.bb +1 -0
index 57bc7c4..e113883 100644
@@ -26,6 +26,7 @@ SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_tii/dvsdk/dvsdk_3_0
 
 BINFILE = "cs1omap3530_setupLinux_1_01_00-prebuilt-dvsdk3.01.00.10.bin"
 TI_BIN_UNPK_CMDS = "Y:Y: qY:workdir"
+TI_BIN_UNPK_WDEXT="/dvsdk/dvsdk_3_01_00_10"
 
 DEPENDS = "ti-cgt6x ti-xdctools ti-dspbios ti-codec-engine ti-linuxutils"
 
meta-ti/packages/ti/ti-dspbios.inc +1 -0
index bd7bcc4..df71da1 100644
@@ -15,6 +15,7 @@ SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/bi
 
 BINFILE="bios_setuplinux_${PV}.bin"
 TI_BIN_UNPK_CMDS="Y: qY:workdir:Y"
+TI_BIN_UNPK_WDEXT="/bios_${PV}"
 
 do_install() {
     install -d ${D}${BIOS_INSTALL_DIR_RECIPE}
meta-ti/packages/ti/ti-edma3lld.inc +1 -0
index 94c0cff..344c357 100644
@@ -13,6 +13,7 @@ SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/ed
 
 BINFILE="EDMA3_LLD_setuplinux_${PV}.bin"
 TI_BIN_UNPK_CMDS="Y:workdir"
+TI_BIN_UNPK_WDEXT="/edma3_lld_${PV}"
 
 do_install() {
     install -d ${D}${EDMA3_LLD_INSTALL_DIR_RECIPE}
meta-ti/packages/ti/ti-eula-unpack.inc +4 -1
index a812a85..d215b6c 100644
@@ -30,6 +30,9 @@ python ti_bin_do_unpack() {
     workdir  = bb.data.getVar('WORKDIR', localdata)
     workdir  = bb.data.expand(workdir, localdata)
     os.chdir(workdir)
+    wdext  = bb.data.getVar('TI_BIN_UNPK_WDEXT', localdata)
+    wdext  = bb.data.expand(wdext, localdata)
+    wdext = workdir + '/' + wdext
 
     # Get unpack commands
     cmd_string = bb.data.getVar('TI_BIN_UNPK_CMDS', localdata)
@@ -39,7 +42,7 @@ python ti_bin_do_unpack() {
     os.chmod(binfile, 0755)
 
     # Run the InstallJammer binary and accept the EULA
-    filename = "HOME=%s ./%s --mode console" % (workdir, binfile)
+    filename = "HOME=%s ./%s --mode console --prefix %s" % (workdir, binfile, wdext)
     
     # Test executable by printing installer version or help screen (--version currently broken for some installers) 
     # - this is currently broken in some IJ installers - comment out for now
meta-ti/packages/ti/ti-xdctools.inc +1 -0
index 4b451cf..c078e7c 100644
@@ -15,6 +15,7 @@ SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rt
 
 BINFILE="xdctools_setuplinux_${PV}.bin"
 TI_BIN_UNPK_CMDS="Y: qY:workdir:Y"
+TI_BIN_UNPK_WDEXT="/xdctools_${PV}"
 
 do_install() {
     install -d ${D}${XDC_INSTALL_DIR_RECIPE}
Signature · 1 line
1.6.2.5
#1 lore raw
Quoted 7 lines · Gary Thomas

This patch addresses the problem where the TI tools that need the EULA unpack into the wrong place if the user has write permission in /opt. The current behaviour of relying on the unpacker to fall back to the $HOME environment variable should not be relied on. The patch changes the unpack step to use the --prefix= option which will always work.

Quoted 28 lines

Note: only tested with these [recent] packages:
ti-cgt6x-1_6_1_9-r4
ti-cgt6x-1_6_1_14-r4
ti-codecs-omap3530-1_1_01_00-r2
ti-dspbios-5_41_04_18-r1
ti-edma3lld-01_11_00_03-r0
ti-xdctools-3_16_01_27-r2

Signature · 19 lines
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------

From cab9a3f415527559aa33f708c59c1e2b7023eac3 Mon Sep 17 00:00:00 2001
From: Gary Thomas <[email protected]>
Date: Fri, 27 Aug 2010 09:01:20 -0600
Subject: [PATCH] Make EULA unpacking work when /opt is writeable

Signed-off-by: Gary Thomas <[email protected]>
---
 meta-ti/packages/ti/ti-codecs-omap3530_1.00.01.bb |    1 +
 meta-ti/packages/ti/ti-codecs-omap3530_1.01.00.bb |    1 +
 meta-ti/packages/ti/ti-dspbios.inc                |    1 +
 meta-ti/packages/ti/ti-edma3lld.inc               |    1 +
 meta-ti/packages/ti/ti-eula-unpack.inc            |    5 ++++-
 meta-ti/packages/ti/ti-xdctools.inc               |    1 +
 6 files changed, 9 insertions(+), 1 deletions(-)

Gary,

Can you please redo the patch against the mainline OE development branch, because paths like meta-ti/packages/ti/* are not correct. Thanks.

Signature · 1 line
Denys
Quoted 91 lines
meta-ti/packages/ti/ti-codecs-omap3530_1.00.01.bb +1 -0
index d6d871b..37d2679 100644
@@ -26,6 +26,7 @@ SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/dv
 
 BINFILE = "cs1omap3530_setuplinux_1_00_01-44.bin"
 TI_BIN_UNPK_CMDS = "Y:Y: qY:workdir"
+TI_BIN_UNPK_WDEXT="/dvsdk/dvsdk_3_00_02_44"
 
 DEPENDS = "ti-cgt6x ti-xdctools ti-dspbios ti-codec-engine ti-linuxutils"
 
meta-ti/packages/ti/ti-codecs-omap3530_1.01.00.bb +1 -0
index 57bc7c4..e113883 100644
@@ -26,6 +26,7 @@ SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_tii/dvsdk/dvsdk_3_0
 
 BINFILE = "cs1omap3530_setupLinux_1_01_00-prebuilt-dvsdk3.01.00.10.bin"
 TI_BIN_UNPK_CMDS = "Y:Y: qY:workdir"
+TI_BIN_UNPK_WDEXT="/dvsdk/dvsdk_3_01_00_10"
 
 DEPENDS = "ti-cgt6x ti-xdctools ti-dspbios ti-codec-engine ti-linuxutils"
 
meta-ti/packages/ti/ti-dspbios.inc +1 -0
index bd7bcc4..df71da1 100644
@@ -15,6 +15,7 @@ SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/bi
 
 BINFILE="bios_setuplinux_${PV}.bin"
 TI_BIN_UNPK_CMDS="Y: qY:workdir:Y"
+TI_BIN_UNPK_WDEXT="/bios_${PV}"
 
 do_install() {
     install -d ${D}${BIOS_INSTALL_DIR_RECIPE}
meta-ti/packages/ti/ti-edma3lld.inc +1 -0
index 94c0cff..344c357 100644
@@ -13,6 +13,7 @@ SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/ed
 
 BINFILE="EDMA3_LLD_setuplinux_${PV}.bin"
 TI_BIN_UNPK_CMDS="Y:workdir"
+TI_BIN_UNPK_WDEXT="/edma3_lld_${PV}"
 
 do_install() {
     install -d ${D}${EDMA3_LLD_INSTALL_DIR_RECIPE}
meta-ti/packages/ti/ti-eula-unpack.inc +4 -1
index a812a85..d215b6c 100644
@@ -30,6 +30,9 @@ python ti_bin_do_unpack() {
     workdir  = bb.data.getVar('WORKDIR', localdata)
     workdir  = bb.data.expand(workdir, localdata)
     os.chdir(workdir)
+    wdext  = bb.data.getVar('TI_BIN_UNPK_WDEXT', localdata)
+    wdext  = bb.data.expand(wdext, localdata)
+    wdext = workdir + '/' + wdext
 
     # Get unpack commands
     cmd_string = bb.data.getVar('TI_BIN_UNPK_CMDS', localdata)
@@ -39,7 +42,7 @@ python ti_bin_do_unpack() {
     os.chmod(binfile, 0755)
 
     # Run the InstallJammer binary and accept the EULA
-    filename = "HOME=%s ./%s --mode console" % (workdir, binfile)
+    filename = "HOME=%s ./%s --mode console --prefix %s" % (workdir, binfile, wdext)
 
     # Test executable by printing installer version or help screen (--version currently broken for some installers) 
     # - this is currently broken in some IJ installers - comment out for now
meta-ti/packages/ti/ti-xdctools.inc +1 -0
index 4b451cf..c078e7c 100644
@@ -15,6 +15,7 @@ SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rt
 
 BINFILE="xdctools_setuplinux_${PV}.bin"
 TI_BIN_UNPK_CMDS="Y: qY:workdir:Y"
+TI_BIN_UNPK_WDEXT="/xdctools_${PV}"
 
 do_install() {
     install -d ${D}${XDC_INSTALL_DIR_RECIPE}
Signature · 7 lines
1.6.2.5


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

Am Freitag, den 27.08.2010, 18:22 -0400 schrieb Denys Dmytriyenko:

Quoted 38 lines · Gary Thomas
Quoted 7 lines

This patch addresses the problem where the TI tools that need the EULA unpack into the wrong place if the user has write permission in /opt. The current behaviour of relying on the unpacker to fall back to the $HOME environment variable should not be relied on. The patch changes the unpack step to use the --prefix= option which will always work.

Quoted 28 lines

Note: only tested with these [recent] packages:
ti-cgt6x-1_6_1_9-r4
ti-cgt6x-1_6_1_14-r4
ti-codecs-omap3530-1_1_01_00-r2
ti-dspbios-5_41_04_18-r1
ti-edma3lld-01_11_00_03-r0
ti-xdctools-3_16_01_27-r2

Signature · 19 lines
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------

From cab9a3f415527559aa33f708c59c1e2b7023eac3 Mon Sep 17 00:00:00 2001
From: Gary Thomas <[email protected]>
Date: Fri, 27 Aug 2010 09:01:20 -0600
Subject: [PATCH] Make EULA unpacking work when /opt is writeable

Signed-off-by: Gary Thomas <[email protected]>
---
 meta-ti/packages/ti/ti-codecs-omap3530_1.00.01.bb |    1 +
 meta-ti/packages/ti/ti-codecs-omap3530_1.01.00.bb |    1 +
 meta-ti/packages/ti/ti-dspbios.inc                |    1 +
 meta-ti/packages/ti/ti-edma3lld.inc               |    1 +
 meta-ti/packages/ti/ti-eula-unpack.inc            |    5 ++++-
 meta-ti/packages/ti/ti-xdctools.inc               |    1 +
 6 files changed, 9 insertions(+), 1 deletions(-)
Quoted 4 lines

Gary,

Can you please redo the patch against the mainline OE development branch, because paths like meta-ti/packages/ti/* are not correct. Thanks.

And if you are sending another iteration, please add your text from your message as a commit message. That would be great.

[…]

Thanks,

Paul

#3 lore raw
In reply to Gary Thomas
Quoted 8 lines · Gary Thomas <gary <at> mlbassoc.com> writes:

This patch addresses the problem where the TI tools that need the EULA unpack into the wrong place if the user has write permission in /opt. The current behaviour of relying on the unpacker to fall back to the $HOME environment variable should not be relied on. The patch changes the unpack step to use the --prefix= option which will always work.

Quoted 8 lines

Note: only tested with these [recent] packages:

   ti-cgt6x-1_6_1_9-r4
   ti-cgt6x-1_6_1_14-r4
   ti-codecs-omap3530-1_1_01_00-r2
   ti-dspbios-5_41_04_18-r1
   ti-edma3lld-01_11_00_03-r0
   ti-xdctools-3_16_01_27-r2

I have a similar problem running bitbake on Ubuntu in virtual machine. I am trying to build an image for the Gumstix Overo which uses the above recipes. The xdctools does not unpack the sources to the correct location resulting in the following error. At least I think thats the source of the error. I really need help resolving this and wonder if there is a patch for this as well.

ERROR: function do_install failed
ERROR: log data follows (/home/amir/oe/tmp/work/overo-angstrom-linux-gnueabi/ti- xdctools-3_16_01_27-r2/temp/log.do_install.4456)
| cp: cannot stat `/home/amir/oe/tmp/work/overo-angstrom-linux-gnueabi/ti- xdctools-3_16_01_27-r2/xdctools_3_16_01_27/*': No such file or directory

Thank You.