All of lore.kernel.org
 help / color / mirror / Atom feed
From: Otavio Salvador <otavio@ossystems.com.br>
To: "Eric Bénard" <eric@eukrea.com>
Cc: "meta-freescale@yoctoproject.org" <meta-freescale@yoctoproject.org>
Subject: Re: [meta-fsl-arm][PATCH v3 2/3] amd-gpu-x11-bin-mx51: factorize the recipes
Date: Wed, 29 May 2013 14:50:15 -0300	[thread overview]
Message-ID: <CAP9ODKqRBx3+x7sS+6ZtJ_4kD+mqohyo=dTABhHGJHWDR==aJA@mail.gmail.com> (raw)
In-Reply-To: <1369849759-16232-2-git-send-email-eric@eukrea.com>

[-- Attachment #1: Type: text/plain, Size: 9544 bytes --]

On Wed, May 29, 2013 at 2:49 PM, Eric Bénard <eric@eukrea.com> wrote:

> this will allow easier addition of non x11 package
>
> Signed-off-by: Eric Bénard <eric@eukrea.com>
>
> Conflicts:
>         recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb


This shouldn't be in commit log ;-)


>
> ---
>  recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc  |   82
> ++++++++++++++++++++
>  .../amd-gpu-x11-bin-mx51_11.09.01.bb               |   74
> +-----------------
>  .../fix-linux-build-check.patch                    |    0
>  3 files changed, 83 insertions(+), 73 deletions(-)
>  create mode 100644 recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc
>  rename recipes-graphics/amd-gpu-x11-bin/{amd-gpu-x11-bin-mx51 =>
> files}/fix-linux-build-check.patch (100%)
>
> diff --git a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc
> b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc
> new file mode 100644
> index 0000000..b081695
> --- /dev/null
> +++ b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc
> @@ -0,0 +1,82 @@
> +# Copyright (C) 2011, 2012 Freescale
> +# Released under the MIT license (see COPYING.MIT for the terms)
> +
> +LICENSE = "Proprietary"
> +SECTION = "libs"
> +
> +# FIXME: Replace for correct AMD license
> +LIC_FILES_CHKSUM =
> "file://usr/include/VG/openvg.h;endline=30;md5=b0109611dd76961057d4c45ae6519802"
> +
> +PROVIDES = "virtual/egl virtual/libgles1 virtual/libgles2"
> +
> +SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \
> +           file://fix-linux-build-check.patch"
> +
> +inherit fsl-eula-unpack
> +
> +# FIXME: All binaries lack GNU_HASH in elf binary but as we don't have
> +# the source we cannot fix it. Disable the insane check for now.
> +python populate_packages_prepend() {
> +    for p in d.getVar('PACKAGES', True).split():
> +        d.setVar("INSANE_SKIP_%s" % p, "ldflags")
> +}
> +
> +do_install () {
> +    install -d ${D}${libdir}
> +    install -d ${D}${bindir}
> +    install -d ${D}${includedir}
> +
> +    cp -axr ${S}/usr/bin/* ${D}${bindir}
> +    cp -axf ${S}/usr/lib/* ${D}${libdir}
> +    cp -axr ${S}/usr/include/* ${D}${includedir}
> +
> +    find ${D}${bindir} -type f -exec chmod 755 {} \;
> +    find ${D}${libdir} -type f -exec chmod 644 {} \;
> +    find ${D}${includedir} -type f -exec chmod 644 {} \;
> +
> +    # FIXME: Fix sonames of broken libraries
> +    mv ${D}${libdir}/lib2dz160.so ${D}${libdir}/lib2dz160.so.0
> +    mv ${D}${libdir}/lib2dz430.so ${D}${libdir}/lib2dz430.so.0
> +
> +    # FIXME: Remove unkown files
> +    rm -r ${D}${libdir}/libcsi.a \
> +          ${D}${libdir}/libres.a
> +}
> +
> +PACKAGES =+ "libgsl-fsl-mx51 libgsl-fsl-mx51-dev libgsl-fsl-mx51-dbg \
> +             libegl-mx51 libegl-mx51-dev libegl-mx51-dbg \
> +             libgles-mx51 libgles-mx51-dev libgles-mx51-dbg \
> +             libgles2-mx51 libgles2-mx51-dev libgles2-mx51-dbg \
> +             libopenvg-mx51 libopenvg-mx51-dev libopenvg-mx51-dbg \
> +             lib2dz160-mx51 lib2dz160-mx51-dbg \
> +             lib2dz430-mx51 lib2dz430-mx51-dbg"
> +
> +FILES_${PN}-dbg = "${bindir}/.debug/*"
> +
> +FILES_libgsl-fsl-mx51 = "${libdir}/libgsl-fsl${SOLIBS}"
> +FILES_libgsl-fsl-mx51-dev = "${libdir}/libgsl-fsl${SOLIBSDEV}"
> +FILES_libgsl-fsl-mx51-dbg = "${libdir}/.debug/libgsl-fsl${SOLIBS}"
> +
> +FILES_libegl-mx51 = "${libdir}/libEGL${SOLIBS}"
> +FILES_libegl-mx51-dev = "${includedir}/EGL ${includedir}/KHR
> ${libdir}/libEGL${SOLIBSDEV}"
> +FILES_libegl-mx51-dbg = "${libdir}/.debug/libEGL${SOLIBS}"
> +
> +FILES_libgles-mx51 = "${libdir}/libGLESv1*${SOLIBS}"
> +FILES_libgles-mx51-dev = "${includedir}/GLES
> ${libdir}/libGLESv1*${SOLIBSDEV}"
> +FILES_libgles-mx51-dbg = "${libdir}/.debug/libGLESv1*${SOLIBS}"
> +
> +FILES_libgles2-mx51 = "${libdir}/libGLESv2${SOLIBS}"
> +FILES_libgles2-mx51-dev = "${includedir}/GLES2
> ${libdir}/libGLESv2${SOLIBSDEV}"
> +FILES_libgles2-mx51-dbg = "${libdir}/.debug/libGLESv2${SOLIBS}"
> +
> +FILES_libopenvg-mx51 = "${libdir}/libOpenVG${SOLIBS}"
> +FILES_libopenvg-mx51-dev = "${includedir}/VG
> ${libdir}/libOpenVG${SOLIBSDEV}"
> +FILES_libopenvg-mx51-dbg = "${libdir}/.debug/libOpenVG${SOLIBS}"
> +
> +FILES_lib2dz160-mx51 = "${libdir}/lib2dz160${SOLIBS}"
> +FILES_lib2dz160-mx51-dbg = "${libdir}/.debug/lib2dz160${SOLIBS}"
> +
> +FILES_lib2dz430-mx51 = "${libdir}/lib2dz430${SOLIBS}"
> +FILES_lib2dz430-mx51-dbg = "${libdir}/.debug/lib2dz430${SOLIBS}"
> +
> +PACKAGE_ARCH = "${MACHINE_ARCH}"
> diff --git a/recipes-graphics/amd-gpu-x11-bin/
> amd-gpu-x11-bin-mx51_11.09.01.bb b/recipes-graphics/amd-gpu-x11-bin/
> amd-gpu-x11-bin-mx51_11.09.01.bb
> index 60fcafc..f33f114 100644
> --- a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb
> +++ b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb
> @@ -2,87 +2,15 @@
>  # Released under the MIT license (see COPYING.MIT for the terms)
>
>  DESCRIPTION = "GPU driver and apps for x11 on mx51"
> -LICENSE = "Proprietary"
> -SECTION = "libs"
>  PR = "r12"
>
>  # FIXME: Replace for correct AMD license
>  LIC_FILES_CHKSUM =
> "file://usr/include/VG/openvg.h;endline=30;md5=b0109611dd76961057d4c45ae6519802"
>  DEPENDS = "virtual/libx11 libxrender"
>
> -PROVIDES = "virtual/egl virtual/libgles1 virtual/libgles2"
> +include amd-gpu-mx51.inc
>
> -SRC_URI = "${FSL_MIRROR}/amd-gpu-x11-bin-mx51-${PV}.bin;fsl-eula=true \
> -           file://fix-linux-build-check.patch"
>  SRC_URI[md5sum] = "54391a4e670b597d06d01253fb217cad"
>  SRC_URI[sha256sum] =
> "c7a6fa03b7aa2a375556c59908876554ba720c1e744baba2debb84a408f790db"
>
> -inherit fsl-eula-unpack
> -
> -# FIXME: All binaries lack GNU_HASH in elf binary but as we don't have
> -# the source we cannot fix it. Disable the insane check for now.
> -python populate_packages_prepend() {
> -    for p in d.getVar('PACKAGES', True).split():
> -        d.setVar("INSANE_SKIP_%s" % p, "ldflags")
> -}
> -
> -do_install () {
> -    install -d ${D}${libdir}
> -    install -d ${D}${bindir}
> -    install -d ${D}${includedir}
> -
> -    cp -axr ${S}/usr/bin/* ${D}${bindir}
> -    cp -axf ${S}/usr/lib/* ${D}${libdir}
> -    cp -axr ${S}/usr/include/* ${D}${includedir}
> -
> -    find ${D}${bindir} -type f -exec chmod 755 {} \;
> -    find ${D}${libdir} -type f -exec chmod 644 {} \;
> -    find ${D}${includedir} -type f -exec chmod 644 {} \;
> -
> -    # FIXME: Fix sonames of broken libraries
> -    mv ${D}${libdir}/lib2dz160.so ${D}${libdir}/lib2dz160.so.0
> -    mv ${D}${libdir}/lib2dz430.so ${D}${libdir}/lib2dz430.so.0
> -
> -    # FIXME: Remove unkown files
> -    rm -r ${D}${libdir}/libcsi.a \
> -          ${D}${libdir}/libres.a
> -}
> -
> -PACKAGES =+ "libgsl-fsl-mx51 libgsl-fsl-mx51-dev libgsl-fsl-mx51-dbg \
> -             libegl-mx51 libegl-mx51-dev libegl-mx51-dbg \
> -             libgles-mx51 libgles-mx51-dev libgles-mx51-dbg \
> -             libgles2-mx51 libgles2-mx51-dev libgles2-mx51-dbg \
> -             libopenvg-mx51 libopenvg-mx51-dev libopenvg-mx51-dbg \
> -             lib2dz160-mx51 lib2dz160-mx51-dbg \
> -             lib2dz430-mx51 lib2dz430-mx51-dbg"
> -
> -FILES_${PN}-dbg = "${bindir}/.debug/*"
> -
> -FILES_libgsl-fsl-mx51 = "${libdir}/libgsl-fsl${SOLIBS}"
> -FILES_libgsl-fsl-mx51-dev = "${libdir}/libgsl-fsl${SOLIBSDEV}"
> -FILES_libgsl-fsl-mx51-dbg = "${libdir}/.debug/libgsl-fsl${SOLIBS}"
> -
> -FILES_libegl-mx51 = "${libdir}/libEGL${SOLIBS}"
> -FILES_libegl-mx51-dev = "${includedir}/EGL ${includedir}/KHR
> ${libdir}/libEGL${SOLIBSDEV}"
> -FILES_libegl-mx51-dbg = "${libdir}/.debug/libEGL${SOLIBS}"
> -
> -FILES_libgles-mx51 = "${libdir}/libGLESv1*${SOLIBS}"
> -FILES_libgles-mx51-dev = "${includedir}/GLES
> ${libdir}/libGLESv1*${SOLIBSDEV}"
> -FILES_libgles-mx51-dbg = "${libdir}/.debug/libGLESv1*${SOLIBS}"
> -
> -FILES_libgles2-mx51 = "${libdir}/libGLESv2${SOLIBS}"
> -FILES_libgles2-mx51-dev = "${includedir}/GLES2
> ${libdir}/libGLESv2${SOLIBSDEV}"
> -FILES_libgles2-mx51-dbg = "${libdir}/.debug/libGLESv2${SOLIBS}"
> -
> -FILES_libopenvg-mx51 = "${libdir}/libOpenVG${SOLIBS}"
> -FILES_libopenvg-mx51-dev = "${includedir}/VG
> ${libdir}/libOpenVG${SOLIBSDEV}"
> -FILES_libopenvg-mx51-dbg = "${libdir}/.debug/libOpenVG${SOLIBS}"
> -
> -FILES_lib2dz160-mx51 = "${libdir}/lib2dz160${SOLIBS}"
> -FILES_lib2dz160-mx51-dbg = "${libdir}/.debug/lib2dz160${SOLIBS}"
> -
> -FILES_lib2dz430-mx51 = "${libdir}/lib2dz430${SOLIBS}"
> -FILES_lib2dz430-mx51-dbg = "${libdir}/.debug/lib2dz430${SOLIBS}"
> -
>  COMPATIBLE_MACHINE = "${@base_contains('DISTRO_FEATURES', 'x11', '(mx5)',
> '', d)}"
> -PACKAGE_ARCH = "${MACHINE_ARCH}"
> diff --git
> a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51/fix-linux-build-check.patch
> b/recipes-graphics/amd-gpu-x11-bin/files/fix-linux-build-check.patch
> similarity index 100%
> rename from
> recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51/fix-linux-build-check.patch
> rename to
> recipes-graphics/amd-gpu-x11-bin/files/fix-linux-build-check.patch
> --
> 1.7.10.4
>
> _______________________________________________
> meta-freescale mailing list
> meta-freescale@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale
>



-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

[-- Attachment #2: Type: text/html, Size: 11863 bytes --]

  reply	other threads:[~2013-05-29 17:50 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-29 17:49 [meta-fsl-arm][PATCH v3 1/3] amd-gpu-x11-bin-mx51: only enable when x11 is in DISTRO_FEATURES Eric Bénard
2013-05-29 17:49 ` [meta-fsl-arm][PATCH v3 2/3] amd-gpu-x11-bin-mx51: factorize the recipes Eric Bénard
2013-05-29 17:50   ` Otavio Salvador [this message]
2013-05-29 17:49 ` [meta-fsl-arm][PATCH v3 3/3] amd-gpu-bin-mx51: new recipe Eric Bénard
2013-05-29 17:51   ` Otavio Salvador
2013-05-29 18:01     ` Eric Bénard
2013-05-31 13:19       ` Otavio Salvador

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAP9ODKqRBx3+x7sS+6ZtJ_4kD+mqohyo=dTABhHGJHWDR==aJA@mail.gmail.com' \
    --to=otavio@ossystems.com.br \
    --cc=eric@eukrea.com \
    --cc=meta-freescale@yoctoproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.