diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2014-08-14 13:40:29 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2014-10-06 13:49:06 +0200 |
commit | f3ebb77ea8fcaa4ef9b98874a4bbd2f0fe647d90 (patch) | |
tree | 411b2ff8852bc94112c0355886d9294ea8833ca9 | |
parent | e82bf145514747c1469ca885089385e4f5a2c715 (diff) |
nvsamples: address build race condition
On a fast server nvsamples rarly failed due to missing references.
Don't use parallel make and use a symlink instead of a copy
operation to move the related lib to its deployment place.
-rw-r--r-- | recipes/trdx-nv-binaries/nvsamples.bb | 64 |
1 files changed, 33 insertions, 31 deletions
diff --git a/recipes/trdx-nv-binaries/nvsamples.bb b/recipes/trdx-nv-binaries/nvsamples.bb index 6a088a6..3609355 100644 --- a/recipes/trdx-nv-binaries/nvsamples.bb +++ b/recipes/trdx-nv-binaries/nvsamples.bb @@ -6,10 +6,12 @@ RDEPENDS_{PN} = "trdx-nv-binaries" PR = "r1" +PARALLEL_MAKE = "" + SRC_URI = "http://developer.toradex.com/files/toradex-dev/uploads/media/Colibri/Linux/Samples/nvsamples.tar.bz2 \ - file://nvsamples-oe.patch \ - file://nvsamples-no-binary-shaders.patch \ - file://nvsamples-hardfp.patch \ + file://nvsamples-oe.patch \ + file://nvsamples-no-binary-shaders.patch \ + file://nvsamples-hardfp.patch \ " S = "${WORKDIR}/nvsamples" @@ -21,37 +23,37 @@ SRC_URI[sha256sum] = "2638beea80fd85fdc5f9443e6959c210e275e627f662266cd404ce7c68 INSANE_SKIP_${PN} = "dev-so ldflags" FILES_${PN} += " \ - /home/root/textures/* \ - /home/root/shaders/* \ + /home/root/textures/* \ + /home/root/shaders/* \ " do_compile () { - cd ${S}/samples/tools/nvtexfont2 - oe_runmake clean - oe_runmake WORKDIR=${WORKDIR} - mv -f libnvtexfont2.a ${S}/lib-target/ - - cd ${S}/samples/tools/nvgl2demo_common - oe_runmake clean - oe_runmake WORKDIR=${WORKDIR} - mv -f libnvgl2demo_common.a ${S}/lib-target/ - - cd ${S}/samples/opengles2 - oe_runmake clean - oe_runmake WORKDIR=${WORKDIR} + cd ${S}/samples/tools/nvtexfont2 + oe_runmake clean + oe_runmake WORKDIR=${WORKDIR} + ln -sf ../samples/tools/nvtexfont2/libnvtexfont2.a ${S}/lib-target/ + + cd ${S}/samples/tools/nvgl2demo_common + oe_runmake clean + oe_runmake WORKDIR=${WORKDIR} + ln -sf ../samples/tools/nvgl2demo_common/libnvgl2demo_common.a ${S}/lib-target/ + + cd ${S}/samples/opengles2 + oe_runmake clean + oe_runmake WORKDIR=${WORKDIR} } do_install () { -# install the sample code - install -d ${D}${bindir} - install -d ${D}/home/root/textures - install -d ${D}/home/root/shaders - install -m 0755 ${S}/samples/opengles2/ctree/ctree ${D}${bindir} - install -m 0644 ${S}/samples/opengles2/ctree/textures/* ${D}/home/root/textures - install -m 0644 ${S}/samples/opengles2/ctree/*.glsl? ${D}/home/root/shaders - install -m 0755 ${S}/samples/opengles2/bubble/bubble ${D}${bindir} - install -m 0644 ${S}/samples/opengles2/bubble/textures/* ${D}/home/root/textures - install -m 0644 ${S}/samples/opengles2/bubble/*.glsl? ${D}/home/root/shaders - install -m 0755 ${S}/samples/opengles2/gears/gears ${D}${bindir} - install -m 0644 ${S}/samples/opengles2/gears/*.glsl? ${D}/home/root/shaders -}
\ No newline at end of file + # install the sample code + install -d ${D}${bindir} + install -d ${D}/home/root/textures + install -d ${D}/home/root/shaders + install -m 0755 ${S}/samples/opengles2/ctree/ctree ${D}${bindir} + install -m 0644 ${S}/samples/opengles2/ctree/textures/* ${D}/home/root/textures + install -m 0644 ${S}/samples/opengles2/ctree/*.glsl? ${D}/home/root/shaders + install -m 0755 ${S}/samples/opengles2/bubble/bubble ${D}${bindir} + install -m 0644 ${S}/samples/opengles2/bubble/textures/* ${D}/home/root/textures + install -m 0644 ${S}/samples/opengles2/bubble/*.glsl? ${D}/home/root/shaders + install -m 0755 ${S}/samples/opengles2/gears/gears ${D}${bindir} + install -m 0644 ${S}/samples/opengles2/gears/*.glsl? ${D}/home/root/shaders +} |