From: Hao Zhang <[email protected]> The patch adds image processing and IPC multi-core demos for Keystone devices.
Signed-off-by: Hao Zhang <[email protected]> --- .../packagegroup-arago-tisdk-matrix.bb | 3 ++- .../recipes-core/matrix/matrix-gui-apps-git.inc | 4 ++-- .../recipes-core/matrix/matrix-gui-mc-demos_2.0.bb | 19 +++++++++++++++++++ .../recipes-core/matrix/matrix-gui-submenus_2.0.bb | 7 ++++--- .../matrix-lighttpd-config/lighttpd.conf.matrix | 2 +- 5 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 meta-arago-extras/recipes-core/matrix/matrix-gui-mc-demos_2.0.bb diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb index 6c58b6f..fd9ef70 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Task to include Matrix v2" LICENSE = "MIT" -PR = "r37" +PR = "r38" inherit packagegroup @@ -127,6 +127,7 @@ MATRIX_APPS_append_am180x-evm = " \ MATRIX_APPS_append_keystone = " \ matrix-gui-utility-demos \ + matrix-gui-mc-demos \ " RDEPENDS_${PN} = " \ diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-apps-git.inc b/meta-arago-extras/recipes-core/matrix/matrix-gui-apps-git.inc index 73e92ac..ab566c9 100644 --- a/meta-arago-extras/recipes-core/matrix/matrix-gui-apps-git.inc +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-apps-git.inc @@ -6,9 +6,9 @@ LIC_FILES_CHKSUM := "file://../${LICENSE_CHECKSUM}" DEPENDS += "ca-certificates-native" SRC_URI = "git://git.ti.com/matrix-gui-v2/matrix-gui-v2-apps.git;protocol=git;branch=${BRANCH}" -SRCREV = "7a3fb05dfb49b144cb149b31cbc9d452975ddfcd" +SRCREV = "0b159d3e832b8d7d9ab46cdfbeef870c48476efc" BRANCH = "master" -INC_PR = "r32" +INC_PR = "r33" # Pull in the base package for installing matrix applications diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-mc-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-mc-demos_2.0.bb new file mode 100644 index 0000000..79c7202 --- /dev/null +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-mc-demos_2.0.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Keystone multi-core demo descriptions for Matrix v2" +HOMEPAGE = "http://git.ti.com/matrix-gui-v2/matrix-gui-v2-apps"; + +require matrix-gui-apps-git.inc + +PR = "${INC_PR}.0" + +inherit allarch + +S = "${WORKDIR}/git/mc_demo_apps" + +# Make sure demo submenu and app images has been installed. +RDEPENDS_${PN} += "matrix-gui-apps-images matrix-gui-submenus-mc-demo" + +FILES_${PN} += "${MATRIX_BASE_DIR}/apps/ \ + ${bindir}/mc_demo_imageproc.sh \ + ${bindir}/mc_run_dsp.sh \ + ${bindir}/mc_demo_ipc.sh \ +" diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-submenus_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-submenus_2.0.bb index 250694d..240ff74 100644 --- a/meta-arago-extras/recipes-core/matrix/matrix-gui-submenus_2.0.bb +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-submenus_2.0.bb @@ -7,7 +7,7 @@ require matrix-gui-apps-git.inc # reset the LIC_FILES_CHKSUM setting from the matrix-gui-apps-git.inc file LIC_FILES_CHKSUM = "file://LICENSE;md5=6e0ae7214f6c74c149cb25f373057fa9" -PR = "${INC_PR}.12" +PR = "${INC_PR}.13" # These packages make submenus in matrix and are not architecture specific inherit allarch @@ -15,7 +15,7 @@ inherit allarch S = "${WORKDIR}/git" # List of submenus to build packages for -SUBMENUS = "arm_submenu 3d_submenu cryptos_submenu display_submenu ethernet_submenu multimedia_submenu power_submenu pru_submenu qt4_submenu settings_submenu usb_submenu wifi_submenu oprofile_submenu utilities_submenu" +SUBMENUS = "arm_submenu 3d_submenu cryptos_submenu display_submenu ethernet_submenu multimedia_submenu power_submenu pru_submenu qt4_submenu settings_submenu usb_submenu wifi_submenu oprofile_submenu utilities_submenu mc_demo_submenu" do_install(){ install -d ${D}${MATRIX_APP_DIR} @@ -26,7 +26,7 @@ do_install(){ done } -PACKAGES += "${PN}-arm ${PN}-3d ${PN}-cryptos ${PN}-display ${PN}-ethernet ${PN}-multimedia ${PN}-power ${PN}-pru ${PN}-qt4 ${PN}-qt5 ${PN}-settings ${PN}-usb ${PN}-wifi ${PN}-oprofile ${PN}-camera ${PN}-utility" +PACKAGES += "${PN}-arm ${PN}-3d ${PN}-cryptos ${PN}-display ${PN}-ethernet ${PN}-multimedia ${PN}-power ${PN}-pru ${PN}-qt4 ${PN}-qt5 ${PN}-settings ${PN}-usb ${PN}-wifi ${PN}-oprofile ${PN}-camera ${PN}-utility ${PN}-mc-demo" # Make sure app images has been installed RDEPENDS_${PN} += "matrix-gui-apps-images" @@ -48,3 +48,4 @@ FILES_${PN}-wifi = "${MATRIX_APP_DIR}/wifi_submenu/*" FILES_${PN}-oprofile = "${MATRIX_APP_DIR}/oprofile_submenu/*" FILES_${PN}-camera = "${MATRIX_APP_DIR}/camera_submenu/*" FILES_${PN}-utility = "${MATRIX_APP_DIR}/utilities_submenu/*" +FILES_${PN}-mc-demo = "${MATRIX_APP_DIR}/mc_demo_submenu/*" diff --git a/meta-arago-extras/recipes-core/matrix/matrix-lighttpd-config/lighttpd.conf.matrix b/meta-arago-extras/recipes-core/matrix/matrix-lighttpd-config/lighttpd.conf.matrix index 82a9fb8..36ed64f 100755 --- a/meta-arago-extras/recipes-core/matrix/matrix-lighttpd-config/lighttpd.conf.matrix +++ b/meta-arago-extras/recipes-core/matrix/matrix-lighttpd-config/lighttpd.conf.matrix @@ -225,7 +225,7 @@ compress.filetype = ("text/plain", "text/html","text/javascript","text/ # ) #### CGI module -cgi.assign = ( ".php" => "/usr/bin/php-cgi") +cgi.assign = ( ".php" => "/usr/bin/php-cgi", ".out" => "" ) #cgi.assign = ( ".pl" => "/usr/bin/perl", # ".cgi" => "/usr/bin/perl" ) # -- 1.7.9.5 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
