From cb1bbea44864127987fc47da89b78738a989b8ce Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 20 Oct 2016 14:26:43 +0200 Subject: linux-driver-package: use wildcard for bbappend Signed-off-by: Max Krummenacher Acked-by: Marcel Ziswiler --- .../linux-driver-package-21.5.0/xorg.conf | 22 --------- .../binary-drivers/linux-driver-package/xorg.conf | 22 +++++++++ .../linux-driver-package_21.%.bbappend | 52 ++++++++++++++++++++++ .../linux-driver-package_21.5.0.bbappend | 52 ---------------------- 4 files changed, 74 insertions(+), 74 deletions(-) delete mode 100644 jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package-21.5.0/xorg.conf create mode 100644 jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/xorg.conf create mode 100644 jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package_21.%.bbappend delete mode 100644 jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package_21.5.0.bbappend (limited to 'jetson-tk1') diff --git a/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package-21.5.0/xorg.conf b/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package-21.5.0/xorg.conf deleted file mode 100644 index 68b7925..0000000 --- a/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package-21.5.0/xorg.conf +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (c) 2011-2013 NVIDIA CORPORATION. All Rights Reserved. - -# -# This is the minimal configuration necessary to use the Tegra driver. -# Please refer to the xorg.conf man page for more configuration -# options provided by the X server, including display-related options -# provided by RandR 1.2 and higher. - -# Disable extensions not useful on Tegra. -Section "Module" - Disable "dri" - SubSection "extmod" - Option "omit xfree86-dga" - EndSubSection -EndSection - -Section "Device" - Identifier "Tegra0" - Driver "nvidia" - Option "NoLogo" "true" -EndSection - diff --git a/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/xorg.conf b/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/xorg.conf new file mode 100644 index 0000000..68b7925 --- /dev/null +++ b/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/xorg.conf @@ -0,0 +1,22 @@ +# Copyright (c) 2011-2013 NVIDIA CORPORATION. All Rights Reserved. + +# +# This is the minimal configuration necessary to use the Tegra driver. +# Please refer to the xorg.conf man page for more configuration +# options provided by the X server, including display-related options +# provided by RandR 1.2 and higher. + +# Disable extensions not useful on Tegra. +Section "Module" + Disable "dri" + SubSection "extmod" + Option "omit xfree86-dga" + EndSubSection +EndSection + +Section "Device" + Identifier "Tegra0" + Driver "nvidia" + Option "NoLogo" "true" +EndSection + diff --git a/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package_21.%.bbappend b/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package_21.%.bbappend new file mode 100644 index 0000000..0a5fdb2 --- /dev/null +++ b/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package_21.%.bbappend @@ -0,0 +1,52 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/linux-driver-package:" + +SRC_URI_append_apalis-tk1 = " file://xorg.conf" + +do_install_append_apalis-tk1 () { + cp ${WORKDIR}/xorg.conf ${D}/etc/X11/ +} + +# deploy additional binaries from the nv_gst_apps tarball +PACKAGES_prepend = "${PN}-gstnvcamera ${PN}-gstnvvidconv ${PN}-nvgstjpeg ${PN}-nvgstapps " +RRECOMMENDS_${PN}_append = " ${PN}-gstnvcamera ${PN}-gstnvvidconv ${PN}-nvgstjpeg ${PN}-nvgstapps" + +RDEPENDS_${PN}-gstnvcamera = "libgstvideo-1.0" +RDEPENDS_${PN}-gst-gstnvvidconv = "libgstvideo-1.0" +RDEPENDS_${PN}-nvgstjpeg = "libgstvideo-1.0" +RDEPENDS_${PN}-nvgstapps = "libgstpbutils-1.0" + +FILES_${PN}-gstnvcamera = " \ + ${libdir}/gstreamer-1.0/libgstnvcamera.so \ +" +FILES_${PN}-gstnvvidconv = " \ + ${libdir}/gstreamer-1.0/libgstnvvidconv.so \ +" +FILES_${PN}-nvgstjpeg = " \ + ${libdir}/gstreamer-1.0/libnvgstjpeg.so \ +" +FILES_${PN}-nvgstapps = " \ + ${bindir}/nvgstcapture-1.0 \ + ${bindir}/nvgstplayer-1.0 \ + ${docdir}/nvgst*README.txt \ +" +#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 +#inhibit warnings about files being stripped +INSANE_SKIP_${PN}-gstnvcamera = "build-deps dev-so ldflags already-stripped textrel" +INSANE_SKIP_${PN}-gstnvvidconv = "build-deps dev-so ldflags already-stripped textrel" +INSANE_SKIP_${PN}-nvgstjpeg = "build-deps dev-so ldflags already-stripped textrel" +INSANE_SKIP_${PN}-nvgstapps = "build-deps dev-so ldflags already-stripped textrel" + +do_install_append () { + NV_SAMPLE=${WORKDIR}/Linux_for_Tegra/nv_tegra/nv_sample_apps + tar xjf ${NV_SAMPLE}/nvgstapps.tbz2 -C ${NV_SAMPLE} + install -d ${D}${bindir} ${D}${libdir}/gstreamer-1.0 ${D}${docdir} + install -m 0755 ${NV_SAMPLE}/usr/bin/nvgstcapture-1.0 ${D}${bindir} + install -m 0755 ${NV_SAMPLE}/usr/bin/nvgstplayer-1.0 ${D}${bindir} + install -m 0755 ${NV_SAMPLE}/nvgstcapture-1.0_README.txt ${D}${docdir} + install -m 0755 ${NV_SAMPLE}/nvgstplayer-1.0_README.txt ${D}${docdir} + + install -m 0755 ${NV_SAMPLE}/usr/lib/arm-linux-gnueabihf/gstreamer-1.0/libgstnvcamera.so ${D}${libdir}/gstreamer-1.0 + install -m 0755 ${NV_SAMPLE}/usr/lib/arm-linux-gnueabihf/gstreamer-1.0/libgstnvvidconv.so ${D}${libdir}/gstreamer-1.0 + install -m 0755 ${NV_SAMPLE}/usr/lib/arm-linux-gnueabihf/gstreamer-1.0/libnvgstjpeg.so ${D}${libdir}/gstreamer-1.0 +} diff --git a/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package_21.5.0.bbappend b/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package_21.5.0.bbappend deleted file mode 100644 index fca82b8..0000000 --- a/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package_21.5.0.bbappend +++ /dev/null @@ -1,52 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-driver-package-${PV}:" - -SRC_URI_append_apalis-tk1 = " file://xorg.conf" - -do_install_append_apalis-tk1 () { - cp ${WORKDIR}/xorg.conf ${D}/etc/X11/ -} - -# deploy additional binaries from the nv_gst_apps tarball -PACKAGES_prepend = "${PN}-gstnvcamera ${PN}-gstnvvidconv ${PN}-nvgstjpeg ${PN}-nvgstapps " -RRECOMMENDS_${PN}_append = " ${PN}-gstnvcamera ${PN}-gstnvvidconv ${PN}-nvgstjpeg ${PN}-nvgstapps" - -RDEPENDS_${PN}-gstnvcamera = "libgstvideo-1.0" -RDEPENDS_${PN}-gst-gstnvvidconv = "libgstvideo-1.0" -RDEPENDS_${PN}-nvgstjpeg = "libgstvideo-1.0" -RDEPENDS_${PN}-nvgstapps = "libgstpbutils-1.0" - -FILES_${PN}-gstnvcamera = " \ - ${libdir}/gstreamer-1.0/libgstnvcamera.so \ -" -FILES_${PN}-gstnvvidconv = " \ - ${libdir}/gstreamer-1.0/libgstnvvidconv.so \ -" -FILES_${PN}-nvgstjpeg = " \ - ${libdir}/gstreamer-1.0/libnvgstjpeg.so \ -" -FILES_${PN}-nvgstapps = " \ - ${bindir}/nvgstcapture-1.0 \ - ${bindir}/nvgstplayer-1.0 \ - ${docdir}/nvgst*README.txt \ -" -#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 -#inhibit warnings about files being stripped -INSANE_SKIP_${PN}-gstnvcamera = "build-deps dev-so ldflags already-stripped textrel" -INSANE_SKIP_${PN}-gstnvvidconv = "build-deps dev-so ldflags already-stripped textrel" -INSANE_SKIP_${PN}-nvgstjpeg = "build-deps dev-so ldflags already-stripped textrel" -INSANE_SKIP_${PN}-nvgstapps = "build-deps dev-so ldflags already-stripped textrel" - -do_install_append () { - NV_SAMPLE=${WORKDIR}/Linux_for_Tegra/nv_tegra/nv_sample_apps - tar xjf ${NV_SAMPLE}/nvgstapps.tbz2 -C ${NV_SAMPLE} - install -d ${D}${bindir} ${D}${libdir}/gstreamer-1.0 ${D}${docdir} - install -m 0755 ${NV_SAMPLE}/usr/bin/nvgstcapture-1.0 ${D}${bindir} - install -m 0755 ${NV_SAMPLE}/usr/bin/nvgstplayer-1.0 ${D}${bindir} - install -m 0755 ${NV_SAMPLE}/nvgstcapture-1.0_README.txt ${D}${docdir} - install -m 0755 ${NV_SAMPLE}/nvgstplayer-1.0_README.txt ${D}${docdir} - - install -m 0755 ${NV_SAMPLE}/usr/lib/arm-linux-gnueabihf/gstreamer-1.0/libgstnvcamera.so ${D}${libdir}/gstreamer-1.0 - install -m 0755 ${NV_SAMPLE}/usr/lib/arm-linux-gnueabihf/gstreamer-1.0/libgstnvvidconv.so ${D}${libdir}/gstreamer-1.0 - install -m 0755 ${NV_SAMPLE}/usr/lib/arm-linux-gnueabihf/gstreamer-1.0/libnvgstjpeg.so ${D}${libdir}/gstreamer-1.0 -} -- cgit v1.2.3