diff options
| author | Franklin S. Cooper Jr <fcooper@ti.com> | 2012-09-01 12:45:03 -0500 |
|---|---|---|
| committer | Denys Dmytriyenko <denys@ti.com> | 2012-10-10 16:00:04 -0400 |
| commit | 2a3c7305fb81967d1358e731fb564182480b0338 (patch) | |
| tree | e24e172ef679c89e782a6ed3cce84c3ef7acfb61 /recipes-graphics | |
| parent | 80ebdb06c319c5fa9881923e4a158eb048487b66 (diff) | |
| download | meta-ti-2a3c7305fb81967d1358e731fb564182480b0338.tar.gz | |
recipes: Fix ti-eula-unpack issue. Tweak sgx modules and libgles recipes.
* Commit d8fc4a686262c50fd0053afa7240020909ec430b addressed an issue where
too many newlines characters were being sent since print by default already
sends a newline character. This commit however resulted in bin files being
installed in the WORKDIR and broke other recipes which commit
a94f765b9867abefd5f0bd262b5dddb8782b3187 addressed. This lead to a very
cluttered WORKDIR.
* This patch updates ti-eula-unpack.inc to switch from using a print to a write.
Since write doesn't automatically send newlines it is a bit more obvious when
newlines are sent.
* Part of the reason that bin files were being installed in the WORKDIR was
due to TI_BIN_UNPK_WDEXT being blank for some recipes. For instance in the
libgles-omap3 recipes, when the workdir command is set in TI_BIN_UNPK_CMDS the
directory that the Graphics SDK will be installed into is
workdir+TI_BIN_UNPK_WDEXT. A blank TI_BIN_UNPK_WDEXT means the SDK will be
installed in WORKDIR. By setting TI_BIN_UNPK_WDEXT to a proper value the
recipes can be sure it is installed in the proper directory.
* Determine which file to download based on the defined BINFILE and not a
hardcoded value. This idea was taken from arago.
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
Acked-by: Chase Maupin <chase.maupin@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'recipes-graphics')
| -rw-r--r-- | recipes-graphics/libgles/libgles-omap3.inc | 4 | ||||
| -rw-r--r-- | recipes-graphics/libgles/libgles-omap3_4.03.00.02.bb | 6 | ||||
| -rw-r--r-- | recipes-graphics/libgles/libgles-omap3_4.05.00.03.bb | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/recipes-graphics/libgles/libgles-omap3.inc b/recipes-graphics/libgles/libgles-omap3.inc index b6aa3829..db0d1cb1 100644 --- a/recipes-graphics/libgles/libgles-omap3.inc +++ b/recipes-graphics/libgles/libgles-omap3.inc | |||
| @@ -3,7 +3,7 @@ LICENSE = "proprietary-binary" | |||
| 3 | # 'TSPA.txt' might not be the best file to md5sum | 3 | # 'TSPA.txt' might not be the best file to md5sum |
| 4 | LIC_FILES_CHKSUM = "file://TSPA.txt;md5=c0d5d9c1e38b41677144c4e24d6ddee1" | 4 | LIC_FILES_CHKSUM = "file://TSPA.txt;md5=c0d5d9c1e38b41677144c4e24d6ddee1" |
| 5 | 5 | ||
| 6 | PR = "r32" | 6 | PR = "r33" |
| 7 | 7 | ||
| 8 | COMPATIBLE_MACHINE = "(omap3|ti814x|ti816x|ti33x)" | 8 | COMPATIBLE_MACHINE = "(omap3|ti814x|ti816x|ti33x)" |
| 9 | 9 | ||
| @@ -15,7 +15,7 @@ RREPLACES_${PN} = "libegl libgles1 libgles2" | |||
| 15 | RREPLACES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev" | 15 | RREPLACES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev" |
| 16 | RREPLACES_${PN}-dbg = "libegl-dbg" | 16 | RREPLACES_${PN}-dbg = "libegl-dbg" |
| 17 | 17 | ||
| 18 | SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/OMAP35x_Graphics_SDK_setuplinux_${SGXPV}.bin \ | 18 | SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/${BINFILE} \ |
| 19 | file://cputype \ | 19 | file://cputype \ |
| 20 | file://rc.pvr \ | 20 | file://rc.pvr \ |
| 21 | file://sample.desktop \ | 21 | file://sample.desktop \ |
diff --git a/recipes-graphics/libgles/libgles-omap3_4.03.00.02.bb b/recipes-graphics/libgles/libgles-omap3_4.03.00.02.bb index 97a22fea..e98fe025 100644 --- a/recipes-graphics/libgles/libgles-omap3_4.03.00.02.bb +++ b/recipes-graphics/libgles/libgles-omap3_4.03.00.02.bb | |||
| @@ -15,8 +15,9 @@ require libgles-omap3.inc | |||
| 15 | SGXPV = "4_03_00_02" | 15 | SGXPV = "4_03_00_02" |
| 16 | IMGPV = "1.6.16.3977" | 16 | IMGPV = "1.6.16.3977" |
| 17 | BINFILE := "Graphics_SDK_setuplinux_${SGXPV}.bin" | 17 | BINFILE := "Graphics_SDK_setuplinux_${SGXPV}.bin" |
| 18 | TI_BIN_UNPK_WDEXT := "/Graphics_SDK_${SGXPV}" | ||
| 18 | 19 | ||
| 19 | SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/Graphics_SDK_setuplinux_${SGXPV}.bin \ | 20 | SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/${BINFILE} \ |
| 20 | file://cputype \ | 21 | file://cputype \ |
| 21 | file://rc.pvr \ | 22 | file://rc.pvr \ |
| 22 | file://sample.desktop \ | 23 | file://sample.desktop \ |
| @@ -26,5 +27,4 @@ SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gf | |||
| 26 | SRC_URI[md5sum] = "ff8c1f2b8e4cb42f4ced6a613b081ada" | 27 | SRC_URI[md5sum] = "ff8c1f2b8e4cb42f4ced6a613b081ada" |
| 27 | SRC_URI[sha256sum] = "cdb0bd3964e107733d632aa8224e0537b05c1ffac34befc036423458c8d75255" | 28 | SRC_URI[sha256sum] = "cdb0bd3964e107733d632aa8224e0537b05c1ffac34befc036423458c8d75255" |
| 28 | 29 | ||
| 29 | S = "${WORKDIR}" | 30 | S = "${WORKDIR}/Graphics_SDK_${SGXPV}" |
| 30 | |||
diff --git a/recipes-graphics/libgles/libgles-omap3_4.05.00.03.bb b/recipes-graphics/libgles/libgles-omap3_4.05.00.03.bb index d55dd05d..7795e2e0 100644 --- a/recipes-graphics/libgles/libgles-omap3_4.05.00.03.bb +++ b/recipes-graphics/libgles/libgles-omap3_4.05.00.03.bb | |||
| @@ -12,8 +12,9 @@ require libgles-omap3.inc | |||
| 12 | SGXPV = "4_05_00_03" | 12 | SGXPV = "4_05_00_03" |
| 13 | IMGPV = "1.6.16.4117" | 13 | IMGPV = "1.6.16.4117" |
| 14 | BINFILE := "Graphics_SDK_setuplinux_${SGXPV}.bin" | 14 | BINFILE := "Graphics_SDK_setuplinux_${SGXPV}.bin" |
| 15 | TI_BIN_UNPK_WDEXT := "/Graphics_SDK_${SGXPV}" | ||
| 15 | 16 | ||
| 16 | SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/Graphics_SDK_setuplinux_${SGXPV}.bin \ | 17 | SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/${BINFILE} \ |
| 17 | file://cputype \ | 18 | file://cputype \ |
| 18 | file://rc.pvr \ | 19 | file://rc.pvr \ |
| 19 | file://sample.desktop \ | 20 | file://sample.desktop \ |
| @@ -23,5 +24,4 @@ SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gf | |||
| 23 | SRC_URI[md5sum] = "0e651eaa92bb91760f0b40a17697a7dc" | 24 | SRC_URI[md5sum] = "0e651eaa92bb91760f0b40a17697a7dc" |
| 24 | SRC_URI[sha256sum] = "bfe764a8959556195545d6fff76f63a489642f345c105bbbc309a3f243c2dd0e" | 25 | SRC_URI[sha256sum] = "bfe764a8959556195545d6fff76f63a489642f345c105bbbc309a3f243c2dd0e" |
| 25 | 26 | ||
| 26 | S = "${WORKDIR}" | 27 | S = "${WORKDIR}/Graphics_SDK_${SGXPV}" |
| 27 | |||
