diff options
-rw-r--r-- | conf/machine/colibri-t20.conf | 3 | ||||
-rw-r--r-- | recipes/images/angstrom-lxde-image.bb | 5 | ||||
-rw-r--r-- | recipes/images/trdx-extra.inc | 2 | ||||
-rw-r--r-- | recipes/trdx-nv-binaries/files/colibri-t20/base.tgz | bin | 8084205 -> 0 bytes | |||
-rw-r--r-- | recipes/trdx-nv-binaries/files/colibri-t20/nvgstapps.tgz | bin | 122495 -> 0 bytes | |||
-rw-r--r-- | recipes/trdx-nv-binaries/files/colibri-t20/restricted_codecs.tbz2 | bin | 346880 -> 0 bytes | |||
-rw-r--r-- | recipes/trdx-nv-binaries/files/colibri-t20/ventana_Tegra-Linux-R16.1.0_armhf.tbz2 | bin | 0 -> 24144868 bytes | |||
-rw-r--r-- | recipes/trdx-nv-binaries/files/colibri-t20/ventana_Tegra-Linux-codecs-R16.1.0_armhf.tbz2 | bin | 0 -> 1849136 bytes | |||
-rw-r--r-- | recipes/trdx-nv-binaries/trdx-nv-binaries.bb | 119 |
9 files changed, 96 insertions, 33 deletions
diff --git a/conf/machine/colibri-t20.conf b/conf/machine/colibri-t20.conf index 3c6a1b1..46d24e0 100644 --- a/conf/machine/colibri-t20.conf +++ b/conf/machine/colibri-t20.conf @@ -33,5 +33,6 @@ SERIAL_CONSOLE = "115200 ttyS0" IMAGE_FSTYPES ?= "tar.bz2" # T20 does not have neon -DEFAULTTUNE = "cortexa9" +#DEFAULTTUNE = "cortexa9" +DEFAULTTUNE = "cortexa9hf" require conf/machine/include/tune-cortexa9.inc diff --git a/recipes/images/angstrom-lxde-image.bb b/recipes/images/angstrom-lxde-image.bb index 0de0249..997fa00 100644 --- a/recipes/images/angstrom-lxde-image.bb +++ b/recipes/images/angstrom-lxde-image.bb @@ -32,7 +32,8 @@ CONMANPKGS_libc-uclibc = "" DEPENDS += "gst-plugins-good gst-plugins-bad gst-plugins-ugly" #deploy the OpenGL ES headers to the sysroot -DEPENDS += "nvsamples" +#this package does not compile with hf +#DEPENDS += "nvsamples" #build some ipk which are needed together with CAN, but do not yet install them DEPENDS += "canutils libsocketcan iproute2" @@ -132,10 +133,10 @@ IMAGE_INSTALL += " \ libpcreposix \ libxcomposite \ alsa-states \ + firefox \ " # firefox at the moment segfaults -# firefox \ # flash-plugins \ # gst-plugin-mpegdemux diff --git a/recipes/images/trdx-extra.inc b/recipes/images/trdx-extra.inc index 53d0719..ddfba29 100644 --- a/recipes/images/trdx-extra.inc +++ b/recipes/images/trdx-extra.inc @@ -46,6 +46,8 @@ IMAGE_INSTALL += " \ nbench-byte \ \ trdx-nv-binaries \ + trdx-nv-binaries-nv-gstapps \ + trdx-nv-binaries-restricted-codecs \ ${IMAGE_INSTALL_MACHINE} \ trdx-config \ \ diff --git a/recipes/trdx-nv-binaries/files/colibri-t20/base.tgz b/recipes/trdx-nv-binaries/files/colibri-t20/base.tgz Binary files differdeleted file mode 100644 index 44190ce..0000000 --- a/recipes/trdx-nv-binaries/files/colibri-t20/base.tgz +++ /dev/null diff --git a/recipes/trdx-nv-binaries/files/colibri-t20/nvgstapps.tgz b/recipes/trdx-nv-binaries/files/colibri-t20/nvgstapps.tgz Binary files differdeleted file mode 100644 index 3ee91d4..0000000 --- a/recipes/trdx-nv-binaries/files/colibri-t20/nvgstapps.tgz +++ /dev/null diff --git a/recipes/trdx-nv-binaries/files/colibri-t20/restricted_codecs.tbz2 b/recipes/trdx-nv-binaries/files/colibri-t20/restricted_codecs.tbz2 Binary files differdeleted file mode 100644 index ed6c9f4..0000000 --- a/recipes/trdx-nv-binaries/files/colibri-t20/restricted_codecs.tbz2 +++ /dev/null diff --git a/recipes/trdx-nv-binaries/files/colibri-t20/ventana_Tegra-Linux-R16.1.0_armhf.tbz2 b/recipes/trdx-nv-binaries/files/colibri-t20/ventana_Tegra-Linux-R16.1.0_armhf.tbz2 Binary files differnew file mode 100644 index 0000000..15c14eb --- /dev/null +++ b/recipes/trdx-nv-binaries/files/colibri-t20/ventana_Tegra-Linux-R16.1.0_armhf.tbz2 diff --git a/recipes/trdx-nv-binaries/files/colibri-t20/ventana_Tegra-Linux-codecs-R16.1.0_armhf.tbz2 b/recipes/trdx-nv-binaries/files/colibri-t20/ventana_Tegra-Linux-codecs-R16.1.0_armhf.tbz2 Binary files differnew file mode 100644 index 0000000..4ce40fd --- /dev/null +++ b/recipes/trdx-nv-binaries/files/colibri-t20/ventana_Tegra-Linux-codecs-R16.1.0_armhf.tbz2 diff --git a/recipes/trdx-nv-binaries/trdx-nv-binaries.bb b/recipes/trdx-nv-binaries/trdx-nv-binaries.bb index ee9c8e1..3fbefd0 100644 --- a/recipes/trdx-nv-binaries/trdx-nv-binaries.bb +++ b/recipes/trdx-nv-binaries/trdx-nv-binaries.bb @@ -1,16 +1,22 @@ DESCRIPTION = "binary files from Nvidia along with there configuration" LICENSE = "CLOSED" -PR = "r4" +PR = "r5" PACKAGE_ARCH = "${MACHINE_ARCH}" -SRC_URI_colibri-t20 = "file://base.tgz \ - file://restricted_codecs.tbz2 \ - file://mimeapps.list \ - file://nvgstapps.tgz \ - file://nvgstplayer.desktop \ +SRC_URI_colibri-t20 = " \ + file://ventana_Tegra-Linux-codecs-R16.1.0_armhf.tbz2 \ + file://ventana_Tegra-Linux-R16.1.0_armhf.tbz2 \ + file://nvgstplayer.desktop \ + file://mimeapps.list \ " +#base.tgz \ +#restricted_codecs.tbz2 \ +#nvgstapps.tgz \ +#mimeapps.list \ +#" + SRC_URI_colibri-t30 = "file://base.tgz \ file://x/tegra_drv.abi*.so \ file://restricted_codecs.tbz2 \ @@ -21,38 +27,91 @@ SRC_URI_colibri-t30 = "file://base.tgz \ file://nvgstplayer.desktop \ " -PACKAGES = "${PN}" +PACKAGES = "${PN}-restricted-codecs ${PN}-nv-gstapps ${PN}" FILES_${PN} += " \ - ${sysconfdir}/X11/def* \ - ${sysconfdir}/X11/xorg.conf.* \ - /lib/firmware/* \ - /usr/lib/* \ - /home/root/.local/share/applications/* \ - " + ${sysconfdir}/X11/def* \ + ${sysconfdir}/X11/xorg.conf.* \ + ${sysconfdir}/init/* \ + ${sysconfdir}/udev/rules.d/* \ + ${sysconfdir}/init/nv* \ + ${sysconfdir}/init/wpa* \ + /lib/firmware/* \ + /opt/licenses/* \ + /usr/lib/* \ + /home/root/.local/share/applications/* \ +" +FILES_${PN}-restricted-codecs += " \ + /lib/firmware/*.axf \ + /opt/licenses/restricted_codecs/* \ +" +FILES_${PN}-nv-gstapps += " \ + /usr/bin/* \ + /usr/share/doc/nv_gstapps/* \ +" #no gnu_hash in NVIDIA binaries, skip QA dev-so for this package #we have symlinks ending in .so, skip QA ldflags for this package INSANE_SKIP_${PN} = "dev-so ldflags" +INSANE_SKIP_${PN}-nv-gstapps = "dev-so ldflags" + +do_compile_colibri-t20() { + #unpack the different packages + #nvidia drivers + mkdir -p nvidia_drivers/opt/licenses/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/opt/licenses/nvidia_drivers/ + + #nvidia sample gstreamer apps + mkdir -p nvgstapps/opt/licenses/nv_gstreamer + 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/opt/licenses/nv_gstreamer/ + cp ${WORKDIR}/Linux_for_Tegra/nv_tegra/nv_sample_apps/nv*.txt nvgstapps/usr/share/doc/nv_gstapps/ + + #restricted codecs + mkdir -p restricted_codecs/opt/licenses/restricted_codecs + tar -C restricted_codecs -xjf ${WORKDIR}/restricted_codecs.tbz2 + cp ${WORKDIR}/*.txt restricted_codecs/opt/licenses/restricted_codecs/ + +} do_install_colibri-t20 () { - #base.tgz - install -d ${D} ${D}/usr/bin ${D}/${sysconfdir}/X11 ${D}/lib/firmware ${D}/usr/lib/gstreamer-0.10 - install -d ${D}/usr/lib/xorg/modules/drivers ${D}/home/root/.local/share/applications/ - install -m 0755 ${WORKDIR}/usr/bin/* ${D}/usr/bin/ - install -m 0644 ${WORKDIR}/${sysconfdir}/X11/xorg.conf ${D}/${sysconfdir}/X11/xorg.conf.nvidia - install -m 0644 ${WORKDIR}/${sysconfdir}/nv* ${D}/${sysconfdir}/ - install -m 0644 ${WORKDIR}/lib/firmware/* ${D}/lib/firmware/ - install -m 0644 ${WORKDIR}/usr/lib/*.so ${D}/usr/lib/ - install -m 0644 ${WORKDIR}/usr/lib/gstreamer-0.10/*.so ${D}/usr/lib/gstreamer-0.10 - install -m 0644 ${WORKDIR}/usr/lib/xorg/modules/drivers/* ${D}/usr/lib/xorg/modules/drivers/ - install -m 0644 ${WORKDIR}/mimeapps.list ${D}//home/root/.local/share/applications/ - install -m 0644 ${WORKDIR}/nvgstplayer.desktop ${D}/home/root/.local/share/applications/ - ln -s libpcre.so.0.0.1 ${D}/usr/lib/libpcre.so.3 - ln -s libpcreposix.so.0.0.0 ${D}/usr/lib/libpcreposix.so.3 - ln -s tegra_drv.abi11.so ${D}/usr/lib/xorg/modules/drivers/tegra_drv.so - ln -s libGLESv2.so ${D}/usr/lib//libGLESv2.so.2 - ln -s libEGL.so ${D}/usr/lib/libEGL.so.1 + #nvidia_driver + install -d ${D}/usr/lib/xorg/modules/drivers ${D}/home/root/.local/share/applications/ + install -d ${D}/opt/licenses/nvidia_drivers ${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/ + install -m 0644 nvidia_drivers/${sysconfdir}/udev/rules.d/* ${D}/${sysconfdir}/udev/rules.d/ + install -m 0644 nvidia_drivers/${sysconfdir}/nv* ${D}/${sysconfdir}/ + install -m 0644 nvidia_drivers/${sysconfdir}/wpa* ${D}/${sysconfdir}/ + install -m 0644 nvidia_drivers/lib/firmware/* ${D}/lib/firmware/ + install -m 0644 nvidia_drivers/opt/licenses/nvidia_drivers/* ${D}/opt/licenses/nvidia_drivers/ + install -m 0644 nvidia_drivers/usr/lib/*.so ${D}/usr/lib/ + install -m 0644 nvidia_drivers/usr/lib/xorg/modules/drivers/* ${D}/usr/lib/xorg/modules/drivers/ + ln -s tegra_drv.abi11.so ${D}/usr/lib/xorg/modules/drivers/tegra_drv.so + ln -s libGLESv2.so ${D}/usr/lib//libGLESv2.so.2 + ln -s libEGL.so ${D}/usr/lib/libEGL.so.1 + + #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}/opt/licenses/nv_gstreamer + 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/opt/licenses/nv_gstreamer/* ${D}/opt/licenses/nv_gstreamer + install -m 0644 ${WORKDIR}/nvgstplayer.desktop ${D}/home/root/.local/share/applications/ + install -m 0644 ${WORKDIR}/mimeapps.list ${D}//home/root/.local/share/applications/ + ln -s libpcre.so.0.0.1 ${D}/usr/lib/libpcre.so.3 + ln -s libpcreposix.so.0.0.0 ${D}/usr/lib/libpcreposix.so.3 + + #nvidia restricted codecs + install -d ${D}/opt/licenses/restricted_codecs ${D}/lib/firmware/ + install -m 0644 restricted_codecs/lib/firmware/* ${D}/lib/firmware/ + install -m 0644 restricted_codecs/opt/licenses/restricted_codecs/* ${D}/opt/licenses/restricted_codecs } do_install_colibri-t30 () { |