trdx-nv-binaries: use oe to deploy the license files

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>

1 files changed, 10 insertions, 18 deletions

diff --git a/recipes/trdx-nv-binaries/trdx-nv-binaries.bb b/recipes/trdx-nv-binaries/trdx-nv-binaries.bb
index 80bae9a..ef1af59 100644
--- a/recipes/trdx-nv-binaries/trdx-nv-binaries.bb
+++ b/recipes/trdx-nv-binaries/trdx-nv-binaries.bb
@@ -8,8 +8,6 @@ COMPATIBLE_MACHINE = "(tegra)"
 PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2"
 DEPENDS = "virtual/xserver libxv gstreamer libpcre alsa-lib gst-plugins-base"
 
-LIC_DIR = "${datadir}/common-licenses"
-
 # the khronos headers are taken from here: https://www.khronos.org/registry/khronos_headers.tgz
 # this tarball changes from time to time breaking the receipe, thus it is provided with the recipe
 SRC_COMMON =  " \
@@ -43,7 +41,12 @@ SRC_URI[openmax-h.sha256sum] = "9e8aee85f37946202ff15a52836233f983e90a751c0816ba
 # xserver-xorg driver ABI version to be used by the symlink, must match the required ABI version from the used xserver
 XSERVER_DRIVER_ABI_REQUIRED = "14"
 
-LIC_FILES_CHKSUM = "file://../khronos_headers/GLES2/gl2.h;beginline=8;endline=29;md5=c0e8cc16602f8077310fb00bbf128ef6"
+LIC_FILES_CHKSUM = " \
+    file://../khronos_headers/GLES2/gl2.h;beginline=8;endline=29;md5=c0e8cc16602f8077310fb00bbf128ef6 \
+    file://${WORKDIR}/Linux_for_Tegra/nv_tegra/LICENSE;md5=d88b0db2ba7f6dfe70852c64b2fce6ce \
+    file://${WORKDIR}/Tegra_Software_License_Agreement-Tegra-Linux-codecs.txt;md5=47cc79e762df48980a032c610cfc172f \
+    file://${WORKDIR}/Linux_for_Tegra/nv_tegra/nv_sample_apps/LICENSE.gst-openmax;md5=a7d467726825e72551082b781a94d09d \
+"
 
 PACKAGES = "${PN}-dbg ${PN}-restricted-codecs ${PN}-nv-gstapps ${PN} ${PN}-dev"
 
@@ -58,7 +61,6 @@ FILES_${PN} += " \
     ${sysconfdir}/init/nv* \
     ${sysconfdir}/init/wpa* \	
     /lib/firmware/* \
-    ${LIC_DIR}/${PN}/* \
     /usr/lib/lib* \
     /usr/lib/xorg/* \
     /usr/lib/gstreamer*/* \
@@ -66,12 +68,10 @@ FILES_${PN} += " \
 "
 FILES_${PN}-restricted-codecs += " \
     /lib/firmware/*.axf \
-    ${LIC_DIR}/${PN}-restricted-codecs/* \
 "
 FILES_${PN}-nv-gstapps += " \
     /usr/bin/* \
     /usr/share/doc/nv_gstapps/* \
-    ${LIC_DIR}/${PN}-nv-gstapps/* \
 "
 
 #no gnu_hash in NVIDIA binaries, skip QA dev-so for this package
@@ -88,28 +88,24 @@ do_patch () {
 do_compile () {
     #unpack the different packages
     #nvidia drivers
-    mkdir -p nvidia_drivers${LIC_DIR}/${PN}/nvidia_drivers
+    mkdir nvidia_drivers
     tar -C nvidia_drivers -xjf ${WORKDIR}/Linux_for_Tegra/nv_tegra/nvidia_drivers.tbz2
     tar -C nvidia_drivers -xjf ${WORKDIR}/Linux_for_Tegra/nv_tegra/config.tbz2
-    cp ${WORKDIR}/Linux_for_Tegra/nv_tegra/LICENSE nvidia_drivers${LIC_DIR}/${PN}/nvidia_drivers/
 
     #nvidia sample gstreamer apps
-    mkdir -p nvgstapps${LIC_DIR}/${PN}-nv-gstapps
     mkdir -p nvgstapps/usr/share/doc/nv_gstapps
     tar -C nvgstapps -xjf ${WORKDIR}/Linux_for_Tegra/nv_tegra/nv_sample_apps/nvgstapps.tbz2
-    cp ${WORKDIR}/Linux_for_Tegra/nv_tegra/nv_sample_apps/LICENSE* nvgstapps${LIC_DIR}/${PN}-nv-gstapps/
     cp ${WORKDIR}/Linux_for_Tegra/nv_tegra/nv_sample_apps/nv*.txt nvgstapps/usr/share/doc/nv_gstapps/
 
     #restricted codecs
-    mkdir -p restricted_codecs${LIC_DIR}/${PN}-restricted-codecs/
+    mkdir restricted_codecs
     tar -C restricted_codecs -xjf ${WORKDIR}/restricted_codecs.tbz2
-    cp ${WORKDIR}/*.txt restricted_codecs${LIC_DIR}/${PN}-restricted-codecs/
 }
 
 do_install () {
     #nvidia_driver
     install -d ${D}/usr/lib/xorg/modules/drivers ${D}/home/root/.local/share/applications/
-    install -d ${D}${LIC_DIR}/${PN}/nvidia_drivers ${D}/lib/firmware/
+    install -d ${D}/lib/firmware/
     install -d ${D}/${sysconfdir}/X11 ${D}/${sysconfdir}/init ${D}/${sysconfdir}/udev/rules.d
     install -m 0644 nvidia_drivers/${sysconfdir}/X11/xorg.conf ${D}/${sysconfdir}/X11/xorg.conf.nvidia
     install -m 0755 nvidia_drivers/${sysconfdir}/init/* ${D}/${sysconfdir}/init/
@@ -117,7 +113,6 @@ do_install () {
     install -m 0644 nvidia_drivers/${sysconfdir}/nv* ${D}/${sysconfdir}/
     install -m 0644 nvidia_drivers/${sysconfdir}/wpa_supplicant.conf ${D}/${sysconfdir}/wpa_supplicant.conf.nvidia
     install -m 0644 nvidia_drivers/lib/firmware/* ${D}/lib/firmware/
-    install -m 0644 nvidia_drivers${LIC_DIR}/${PN}/nvidia_drivers/* ${D}${LIC_DIR}/${PN}/nvidia_drivers/
     install -m 0644 nvidia_drivers/usr/lib/*.so ${D}/usr/lib/
     install -m 0644 nvidia_drivers/usr/lib/*.so.? ${D}/usr/lib/
     rm ${D}/usr/lib/libjpeg.so
@@ -137,20 +132,17 @@ do_install () {
     #nvidia sample gstreamer apps
     install -d ${D}/usr/bin ${D}/usr/lib/gstreamer-0.10 ${D}/usr/share/doc/nv_gstapps
     install -d ${D}/usr/lib/xorg/modules/drivers ${D}/home/root/.local/share/applications/
-    install -d ${D}${LIC_DIR}/${PN}-nv-gstapps/
     install -m 0755 nvgstapps/usr/bin/* ${D}/usr/bin/
     install -m 0644 nvgstapps/usr/lib/gstreamer-0.10/*.so ${D}/usr/lib/gstreamer-0.10/
     install -m 0644 nvgstapps/usr/share/doc/nv_gstapps/* ${D}/usr/share/doc/nv_gstapps/
-    install -m 0644 nvgstapps${LIC_DIR}/${PN}-nv-gstapps/* ${D}${LIC_DIR}/${PN}-nv-gstapps/
     install -m 0644 ${WORKDIR}/*.desktop ${D}/home/root/.local/share/applications/
     install -m 0644 ${WORKDIR}/mimeapps.list ${D}//home/root/.local/share/applications/
     ln -s libpcre.so.1 ${D}/usr/lib/libpcre.so.3
     ln -s libpcreposix.so.0 ${D}/usr/lib/libpcreposix.so.3
 
     #nvidia restricted codecs
-    install -d ${D}${LIC_DIR}/${PN}-restricted-codecs ${D}/lib/firmware/
+    install -d ${D}/lib/firmware/
     install -m 0644 restricted_codecs/lib/firmware/* ${D}/lib/firmware/
-    install -m 0644 restricted_codecs${LIC_DIR}/${PN}-restricted-codecs/* ${D}${LIC_DIR}/${PN}-restricted-codecs/
 
     #khronos headers for EGL/GLES/GLES2/OpenMax
     for dir in EGL GLES GLES2 KD KHR