diff options
Diffstat (limited to 'meta-amdfalconx86')
6 files changed, 54 insertions, 30 deletions
diff --git a/meta-amdfalconx86/recipes-applications/gpio-test/gpio-test_1.0.bb b/meta-amdfalconx86/recipes-applications/gpio-test/gpio-test_1.0.bb index 9b1c1f5a..3056c8d2 100644 --- a/meta-amdfalconx86/recipes-applications/gpio-test/gpio-test_1.0.bb +++ b/meta-amdfalconx86/recipes-applications/gpio-test/gpio-test_1.0.bb @@ -2,13 +2,7 @@ DESCRIPTION = "Sample application for AMD GPIO driver" SECTION = "applications" LICENSE = "BSD" DEPENDS = "readline" -LIC_FILES_CHKSUM = "\ - file://gpio-test.c;md5=35bd4f849bf7b97ea60ecf724ff7d228 \ - file://gpio-test.h;md5=c7aaa743b172cf584032f9bfc5e85044 \ - " - -PR = "r1" -PV = "1.0" +LIC_FILES_CHKSUM = "file://gpio-test.c;endline=29;md5=8e7a9706367d146e5073510a6e176dc2" SRC_URI = "\ file://gpio-test.c \ diff --git a/meta-amdfalconx86/recipes-applications/spi-test/spi-test_1.0.bb b/meta-amdfalconx86/recipes-applications/spi-test/spi-test_1.0.bb index f83aa820..764f112a 100644 --- a/meta-amdfalconx86/recipes-applications/spi-test/spi-test_1.0.bb +++ b/meta-amdfalconx86/recipes-applications/spi-test/spi-test_1.0.bb @@ -2,12 +2,7 @@ DESCRIPTION = "Sample application for AMD SPI driver" SECTION = "applications" LICENSE = "BSD" DEPENDS = "readline" -LIC_FILES_CHKSUM = "file://spirom-test.c;md5=8dac97fc0527a3c7721fc257dd110445 \ - file://spirom.h;md5=1990f1f1e7a82115c354152bed83df52 \ - " - -PR = "r1" -PV = "1.0" +LIC_FILES_CHKSUM = "file://spirom-test.c;endline=29;md5=8e7a9706367d146e5073510a6e176dc2" SRC_URI = "file://spirom-test.c \ file://spirom.h \ diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools/0005-CMakeLists-add-include-paths-for-xcb-and-Xlib.patch b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools/0005-CMakeLists-add-include-paths-for-xcb-and-Xlib.patch new file mode 100644 index 00000000..d665785d --- /dev/null +++ b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools/0005-CMakeLists-add-include-paths-for-xcb-and-Xlib.patch @@ -0,0 +1,35 @@ +From 233ba185542405bc38ecb01d1dd90881056291cf Mon Sep 17 00:00:00 2001 +From: Ahsan Hussain <ahsan_hussain@mentor.com> +Date: Tue, 19 Sep 2017 13:59:27 +0500 +Subject: [PATCH 1/1] CMakeLists: add include paths for xcb and Xlib + +--- + vktrace/src/vktrace_viewer/CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/vktrace/src/vktrace_viewer/CMakeLists.txt b/vktrace/src/vktrace_viewer/CMakeLists.txt +index dfe2a48..7fbfa12 100644 +--- a/vktrace/src/vktrace_viewer/CMakeLists.txt ++++ b/vktrace/src/vktrace_viewer/CMakeLists.txt +@@ -22,6 +22,9 @@ else() + find_package(Threads REQUIRED) + find_package(X11 REQUIRED) + ++find_path(XCB_INCLUDE_DIR xcb/xcb.h DOC "Path to xcb/xcb.h") ++find_path(X11_XLIB_INCLUDE_DIR X11/Xlib.h DOC "Path to X11/Xlib.h") ++ + require_pthreads() + + include_directories( +@@ -33,6 +36,8 @@ include_directories( + ${SRC_DIR}/vktrace_viewer + ${CMAKE_CURRENT_BINARY_DIR} + ${Qt5Widgets_INCLUDE_DIRS} ++ ${X11_XLIB_INCLUDE_DIR} ++ ${XCB_INCLUDE_DIR} + ) + + set(SRC_LIST +-- +2.11.1 + diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools_1.0.26.bb b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools_1.0.26.bb index c7e65dfe..ad324dce 100644 --- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools_1.0.26.bb +++ b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools_1.0.26.bb @@ -22,7 +22,9 @@ SRC_URI = "git://github.com/LunarG/VulkanTools;branch=sdk-${PV} \ file://0001-CMakeLists-add-include-path-so-Xlib.h-is-found-as-ne.patch \ file://0002-obey-CMAKE_INSTALL_LIBDIR.patch \ file://0003-vktrace-do-not-link-to-internal-loader.patch\ - file://0004-json-correct-layer-lib-paths.patch" + file://0004-json-correct-layer-lib-paths.patch \ + file://0005-CMakeLists-add-include-paths-for-xcb-and-Xlib.patch \ +" EXTRA_OECMAKE = " \ -DBUILD_LOADER=0 \ @@ -51,3 +53,15 @@ do_install_append() { cp -f ${S}/layersvt/${HOST_OS}/*.json ${D}${sysconfdir}/vulkan/explicit_layer.d cp -f ${S}/vktrace/src/vktrace_layer/${HOST_OS}/*.json ${D}${sysconfdir}/vulkan/explicit_layer.d } + +# Conditional building of vktraceviewer +QTBITS ?= "${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'cmake_qt5', '',d)}" +inherit ${QTBITS} +DEPENDS += "${@base_conditional('QTBITS', '', '', 'libxcb', d)}" +RDEPENDS_${PN}_append = " ${@base_conditional('QTBITS', '', '', 'qtsvg', d)}" +do_install_append() { + if [ "${QTBITS}" != "" ] + then + install ${B}/vktrace/vktraceviewer ${D}${bindir} + fi +} diff --git a/meta-amdfalconx86/recipes-kernel/amd-spi/amd-spi_1.0.bb b/meta-amdfalconx86/recipes-kernel/amd-spi/amd-spi_1.0.bb index 2b0b2eb0..b23e5ce6 100644 --- a/meta-amdfalconx86/recipes-kernel/amd-spi/amd-spi_1.0.bb +++ b/meta-amdfalconx86/recipes-kernel/amd-spi/amd-spi_1.0.bb @@ -1,17 +1,9 @@ DESCRIPTION = "This kernel module provides support for AMD SPI controller driver" LICENSE = "BSD | GPLv2" -LIC_FILES_CHKSUM = "file://spi_amd.c;md5=80f01f3b969d0b1d633df6ba9edf4170 \ - file://spi_amd.h;md5=488f986ada9e64f6b5ee6d55c269ae1b \ - file://spirom.c;md5=122bee09c280ae24c3b97bec1359a94c \ - file://spirom.h;md5=8de0c535224dbd8ecd2f40ef29c15d0a \ - file://Makefile;md5=8ea80a6d4ae15bcf922d090df6cfdd4c \ - " +LIC_FILES_CHKSUM = "file://spi_amd.c;endline=29;md5=e9fdf6da58412e619d89ec9e135a1be3" inherit module -PR = "r0" -PV = "1.0" - SRC_URI = "file://Makefile \ file://spi_amd.c \ file://spi_amd.h \ diff --git a/meta-amdfalconx86/recipes-kernel/amd-wdt/amd-wdt_1.0.bb b/meta-amdfalconx86/recipes-kernel/amd-wdt/amd-wdt_1.0.bb index 10e29743..edaecf5a 100644 --- a/meta-amdfalconx86/recipes-kernel/amd-wdt/amd-wdt_1.0.bb +++ b/meta-amdfalconx86/recipes-kernel/amd-wdt/amd-wdt_1.0.bb @@ -1,15 +1,9 @@ DESCRIPTION = "This kernel module provides support for AMD Watchdog driver" LICENSE = "BSD | GPLv2" -LIC_FILES_CHKSUM = "file://amd_wdt.c;md5=b29790cbc2f022e868ca443bdd03858a \ - file://amd_wdt.h;md5=a9f4cbcd9c7179dbe5e1444bbf764a53 \ - file://Makefile;md5=111ec65dfed99f6cd330ccb4957fb924 \ - " +LIC_FILES_CHKSUM = "file://amd_wdt.c;endline=29;md5=8e7a9706367d146e5073510a6e176dc2" inherit module -PR = "r0" -PV = "1.0" - SRC_URI = "file://Makefile \ file://amd_wdt.c \ file://amd_wdt.h \ |