From 62307acfc403c54b070299f898230ad1ce7ba3f7 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sun, 20 Apr 2014 21:16:47 -0300 Subject: Use generic bbappend files This uses the % wildcard for recipe matching, this easy the update of recipe versions and maintenance. - formfactor_0.0.bbappend - udev-extraconf_1.0.bbappend - eglinfo-fb_1.0.bbappend - eglinfo-x11_1.0.bbappend - mesa-demos_8.1.0.bbappend - pointercal-xinput_0.0.bbappend - xserver-xf86-config_0.1.bbappend - gst-plugins-base_0.10.36.bbappend - gst-plugins-gl_0.10.3.bbappend - qt4-embedded_4.8.5.bbappend - qt4-x11-free_4.8.5.bbappend Change-Id: Ia901561f327fde3109237994a2a5a76827f11913 Signed-off-by: Otavio Salvador --- .../recipes-bsp/formfactor/formfactor_%.bbappend | 2 ++ .../recipes-bsp/formfactor/formfactor_0.0.bbappend | 2 -- .../recipes-core/udev/udev-extraconf_%.bbappend | 17 +++++++++++++++++ .../recipes-core/udev/udev-extraconf_1.0.bbappend | 17 ----------------- .../recipes-graphics/eglinfo/eglinfo-fb_%.bbappend | 3 +++ .../recipes-graphics/eglinfo/eglinfo-fb_1.0.bbappend | 3 --- .../recipes-graphics/eglinfo/eglinfo-x11_%.bbappend | 3 +++ .../recipes-graphics/eglinfo/eglinfo-x11_1.0.bbappend | 3 --- .../recipes-graphics/mesa/mesa-demos_%.bbappend | 4 ++++ .../recipes-graphics/mesa/mesa-demos_8.1.0.bbappend | 4 ---- .../xinput-calibrator/pointercal-xinput_%.bbappend | 2 ++ .../xinput-calibrator/pointercal-xinput_0.0.bbappend | 2 -- .../xorg-xserver/xserver-xf86-config_%.bbappend | 2 ++ .../xorg-xserver/xserver-xf86-config_0.1.bbappend | 2 -- .../gstreamer/gst-plugins-base_%.bbappend | 11 +++++++++++ .../gstreamer/gst-plugins-base_0.10.36.bbappend | 11 ----------- .../gstreamer/gst-plugins-gl_%.bbappend | 11 +++++++++++ .../gstreamer/gst-plugins-gl_0.10.3.bbappend | 11 ----------- meta-fsl-arm/recipes-qt/qt4/qt4-embedded_%.bbappend | 12 ++++++++++++ meta-fsl-arm/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend | 12 ------------ meta-fsl-arm/recipes-qt/qt4/qt4-x11-free_%.bbappend | 15 +++++++++++++++ meta-fsl-arm/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend | 15 --------------- 22 files changed, 82 insertions(+), 82 deletions(-) create mode 100644 meta-fsl-arm/recipes-bsp/formfactor/formfactor_%.bbappend delete mode 100644 meta-fsl-arm/recipes-bsp/formfactor/formfactor_0.0.bbappend create mode 100644 meta-fsl-arm/recipes-core/udev/udev-extraconf_%.bbappend delete mode 100644 meta-fsl-arm/recipes-core/udev/udev-extraconf_1.0.bbappend create mode 100644 meta-fsl-arm/recipes-graphics/eglinfo/eglinfo-fb_%.bbappend delete mode 100644 meta-fsl-arm/recipes-graphics/eglinfo/eglinfo-fb_1.0.bbappend create mode 100644 meta-fsl-arm/recipes-graphics/eglinfo/eglinfo-x11_%.bbappend delete mode 100644 meta-fsl-arm/recipes-graphics/eglinfo/eglinfo-x11_1.0.bbappend create mode 100644 meta-fsl-arm/recipes-graphics/mesa/mesa-demos_%.bbappend delete mode 100644 meta-fsl-arm/recipes-graphics/mesa/mesa-demos_8.1.0.bbappend create mode 100644 meta-fsl-arm/recipes-graphics/xinput-calibrator/pointercal-xinput_%.bbappend delete mode 100644 meta-fsl-arm/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bbappend create mode 100644 meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend delete mode 100644 meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend create mode 100644 meta-fsl-arm/recipes-multimedia/gstreamer/gst-plugins-base_%.bbappend delete mode 100644 meta-fsl-arm/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bbappend create mode 100644 meta-fsl-arm/recipes-multimedia/gstreamer/gst-plugins-gl_%.bbappend delete mode 100644 meta-fsl-arm/recipes-multimedia/gstreamer/gst-plugins-gl_0.10.3.bbappend create mode 100644 meta-fsl-arm/recipes-qt/qt4/qt4-embedded_%.bbappend delete mode 100644 meta-fsl-arm/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend create mode 100644 meta-fsl-arm/recipes-qt/qt4/qt4-x11-free_%.bbappend delete mode 100644 meta-fsl-arm/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend diff --git a/meta-fsl-arm/recipes-bsp/formfactor/formfactor_%.bbappend b/meta-fsl-arm/recipes-bsp/formfactor/formfactor_%.bbappend new file mode 100644 index 000000000..8c77b8d3c --- /dev/null +++ b/meta-fsl-arm/recipes-bsp/formfactor/formfactor_%.bbappend @@ -0,0 +1,2 @@ +# Append path for freescale to include costom matchconfig +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-fsl-arm/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-fsl-arm/recipes-bsp/formfactor/formfactor_0.0.bbappend deleted file mode 100644 index 8c77b8d3c..000000000 --- a/meta-fsl-arm/recipes-bsp/formfactor/formfactor_0.0.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -# Append path for freescale to include costom matchconfig -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-fsl-arm/recipes-core/udev/udev-extraconf_%.bbappend b/meta-fsl-arm/recipes-core/udev/udev-extraconf_%.bbappend new file mode 100644 index 000000000..f73e4bca8 --- /dev/null +++ b/meta-fsl-arm/recipes-core/udev/udev-extraconf_%.bbappend @@ -0,0 +1,17 @@ +# Freescale imx extra configuration udev rules +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI_append_mxs = " file://10-imx.rules" +SRC_URI_append_mx5 = " file://10-imx.rules" +SRC_URI_append_mx6 = " file://10-imx.rules" + +do_install_prepend () { + if [ -e "${WORKDIR}/10-imx.rules" ]; then + install -d ${D}${sysconfdir}/udev/rules.d + install -m 0644 ${WORKDIR}/10-imx.rules ${D}${sysconfdir}/udev/rules.d + fi +} + +PACKAGE_ARCH_mxs = "${MACHINE_ARCH}" +PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}" +PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}" diff --git a/meta-fsl-arm/recipes-core/udev/udev-extraconf_1.0.bbappend b/meta-fsl-arm/recipes-core/udev/udev-extraconf_1.0.bbappend deleted file mode 100644 index f73e4bca8..000000000 --- a/meta-fsl-arm/recipes-core/udev/udev-extraconf_1.0.bbappend +++ /dev/null @@ -1,17 +0,0 @@ -# Freescale imx extra configuration udev rules -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI_append_mxs = " file://10-imx.rules" -SRC_URI_append_mx5 = " file://10-imx.rules" -SRC_URI_append_mx6 = " file://10-imx.rules" - -do_install_prepend () { - if [ -e "${WORKDIR}/10-imx.rules" ]; then - install -d ${D}${sysconfdir}/udev/rules.d - install -m 0644 ${WORKDIR}/10-imx.rules ${D}${sysconfdir}/udev/rules.d - fi -} - -PACKAGE_ARCH_mxs = "${MACHINE_ARCH}" -PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}" -PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}" diff --git a/meta-fsl-arm/recipes-graphics/eglinfo/eglinfo-fb_%.bbappend b/meta-fsl-arm/recipes-graphics/eglinfo/eglinfo-fb_%.bbappend new file mode 100644 index 000000000..5f359a39e --- /dev/null +++ b/meta-fsl-arm/recipes-graphics/eglinfo/eglinfo-fb_%.bbappend @@ -0,0 +1,3 @@ +# Set i.MX specific dependencies and device type +DEPENDS += "virtual/libgles2" +EGLINFO_DEVICE = "imx6" diff --git a/meta-fsl-arm/recipes-graphics/eglinfo/eglinfo-fb_1.0.bbappend b/meta-fsl-arm/recipes-graphics/eglinfo/eglinfo-fb_1.0.bbappend deleted file mode 100644 index 5f359a39e..000000000 --- a/meta-fsl-arm/recipes-graphics/eglinfo/eglinfo-fb_1.0.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -# Set i.MX specific dependencies and device type -DEPENDS += "virtual/libgles2" -EGLINFO_DEVICE = "imx6" diff --git a/meta-fsl-arm/recipes-graphics/eglinfo/eglinfo-x11_%.bbappend b/meta-fsl-arm/recipes-graphics/eglinfo/eglinfo-x11_%.bbappend new file mode 100644 index 000000000..5f359a39e --- /dev/null +++ b/meta-fsl-arm/recipes-graphics/eglinfo/eglinfo-x11_%.bbappend @@ -0,0 +1,3 @@ +# Set i.MX specific dependencies and device type +DEPENDS += "virtual/libgles2" +EGLINFO_DEVICE = "imx6" diff --git a/meta-fsl-arm/recipes-graphics/eglinfo/eglinfo-x11_1.0.bbappend b/meta-fsl-arm/recipes-graphics/eglinfo/eglinfo-x11_1.0.bbappend deleted file mode 100644 index 5f359a39e..000000000 --- a/meta-fsl-arm/recipes-graphics/eglinfo/eglinfo-x11_1.0.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -# Set i.MX specific dependencies and device type -DEPENDS += "virtual/libgles2" -EGLINFO_DEVICE = "imx6" diff --git a/meta-fsl-arm/recipes-graphics/mesa/mesa-demos_%.bbappend b/meta-fsl-arm/recipes-graphics/mesa/mesa-demos_%.bbappend new file mode 100644 index 000000000..989577d44 --- /dev/null +++ b/meta-fsl-arm/recipes-graphics/mesa/mesa-demos_%.bbappend @@ -0,0 +1,4 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI_append_mx6 = " file://Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch" + diff --git a/meta-fsl-arm/recipes-graphics/mesa/mesa-demos_8.1.0.bbappend b/meta-fsl-arm/recipes-graphics/mesa/mesa-demos_8.1.0.bbappend deleted file mode 100644 index 989577d44..000000000 --- a/meta-fsl-arm/recipes-graphics/mesa/mesa-demos_8.1.0.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI_append_mx6 = " file://Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch" - diff --git a/meta-fsl-arm/recipes-graphics/xinput-calibrator/pointercal-xinput_%.bbappend b/meta-fsl-arm/recipes-graphics/xinput-calibrator/pointercal-xinput_%.bbappend new file mode 100644 index 000000000..a9c60f3ec --- /dev/null +++ b/meta-fsl-arm/recipes-graphics/xinput-calibrator/pointercal-xinput_%.bbappend @@ -0,0 +1,2 @@ +# Append path for freescale layer to include bsp pointercal.xinput +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-fsl-arm/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bbappend b/meta-fsl-arm/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bbappend deleted file mode 100644 index a9c60f3ec..000000000 --- a/meta-fsl-arm/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -# Append path for freescale layer to include bsp pointercal.xinput -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend b/meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend new file mode 100644 index 000000000..ceb438e37 --- /dev/null +++ b/meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend @@ -0,0 +1,2 @@ +# Append path for freescale layer to include bsp xorg.conf +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend deleted file mode 100644 index ceb438e37..000000000 --- a/meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -# Append path for freescale layer to include bsp xorg.conf -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-fsl-arm/recipes-multimedia/gstreamer/gst-plugins-base_%.bbappend b/meta-fsl-arm/recipes-multimedia/gstreamer/gst-plugins-base_%.bbappend new file mode 100644 index 000000000..ecb2b5400 --- /dev/null +++ b/meta-fsl-arm/recipes-multimedia/gstreamer/gst-plugins-base_%.bbappend @@ -0,0 +1,11 @@ +# Freescale gstplaybin2 rawvideo support + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI_append_mxs = " file://gstplaybin2-rawvideo-support.patch" +SRC_URI_append_mx5 = " file://gstplaybin2-rawvideo-support.patch" +SRC_URI_append_mx6 = " file://gstplaybin2-rawvideo-support.patch" + +PACKAGE_ARCH_mxs = "${MACHINE_SOCARCH}" +PACKAGE_ARCH_mx5 = "${MACHINE_SOCARCH}" +PACKAGE_ARCH_mx6 = "${MACHINE_SOCARCH}" diff --git a/meta-fsl-arm/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bbappend b/meta-fsl-arm/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bbappend deleted file mode 100644 index ecb2b5400..000000000 --- a/meta-fsl-arm/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bbappend +++ /dev/null @@ -1,11 +0,0 @@ -# Freescale gstplaybin2 rawvideo support - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI_append_mxs = " file://gstplaybin2-rawvideo-support.patch" -SRC_URI_append_mx5 = " file://gstplaybin2-rawvideo-support.patch" -SRC_URI_append_mx6 = " file://gstplaybin2-rawvideo-support.patch" - -PACKAGE_ARCH_mxs = "${MACHINE_SOCARCH}" -PACKAGE_ARCH_mx5 = "${MACHINE_SOCARCH}" -PACKAGE_ARCH_mx6 = "${MACHINE_SOCARCH}" diff --git a/meta-fsl-arm/recipes-multimedia/gstreamer/gst-plugins-gl_%.bbappend b/meta-fsl-arm/recipes-multimedia/gstreamer/gst-plugins-gl_%.bbappend new file mode 100644 index 000000000..44a4b924e --- /dev/null +++ b/meta-fsl-arm/recipes-multimedia/gstreamer/gst-plugins-gl_%.bbappend @@ -0,0 +1,11 @@ +# gst-plugins-gl for imx6 Vivante + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +DEPENDS_append_mx6 = " gst-fsl-plugin gpu-viv-bin-mx6q" + +SRC_URI_append_mx6 = " file://IMX_MMCODEC_3.0.35_4.0.0.patch" + +CFLAGS_append_mx6 = " -DGLIB_DISABLE_DEPRECATION_WARNINGS -UG_DISABLE_DEPRECATED" + +PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}" diff --git a/meta-fsl-arm/recipes-multimedia/gstreamer/gst-plugins-gl_0.10.3.bbappend b/meta-fsl-arm/recipes-multimedia/gstreamer/gst-plugins-gl_0.10.3.bbappend deleted file mode 100644 index 44a4b924e..000000000 --- a/meta-fsl-arm/recipes-multimedia/gstreamer/gst-plugins-gl_0.10.3.bbappend +++ /dev/null @@ -1,11 +0,0 @@ -# gst-plugins-gl for imx6 Vivante - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -DEPENDS_append_mx6 = " gst-fsl-plugin gpu-viv-bin-mx6q" - -SRC_URI_append_mx6 = " file://IMX_MMCODEC_3.0.35_4.0.0.patch" - -CFLAGS_append_mx6 = " -DGLIB_DISABLE_DEPRECATION_WARNINGS -UG_DISABLE_DEPRECATED" - -PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}" diff --git a/meta-fsl-arm/recipes-qt/qt4/qt4-embedded_%.bbappend b/meta-fsl-arm/recipes-qt/qt4/qt4-embedded_%.bbappend new file mode 100644 index 000000000..05cc2e685 --- /dev/null +++ b/meta-fsl-arm/recipes-qt/qt4/qt4-embedded_%.bbappend @@ -0,0 +1,12 @@ +#Freescale +include qt4-phonon-patches.inc + +DEPENDS_append_mx5 = " virtual/kernel virtual/libgles2" +QT_GLFLAGS_mx5 = "-opengl es2 -openvg" +QT_CONFIG_FLAGS_append_mx5 = " -I${STAGING_KERNEL_DIR}/include/" + +DEPENDS_append_mx6 = " virtual/kernel virtual/libgles2" +QT_GLFLAGS_mx6 = "-opengl es2 -openvg" +QT_CONFIG_FLAGS_append_mx6 = " -I${STAGING_KERNEL_DIR}/include/uapi \ + -I${STAGING_KERNEL_DIR}/include/ \ + -DLINUX=1 -DEGL_API_FB=1" diff --git a/meta-fsl-arm/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend b/meta-fsl-arm/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend deleted file mode 100644 index 05cc2e685..000000000 --- a/meta-fsl-arm/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend +++ /dev/null @@ -1,12 +0,0 @@ -#Freescale -include qt4-phonon-patches.inc - -DEPENDS_append_mx5 = " virtual/kernel virtual/libgles2" -QT_GLFLAGS_mx5 = "-opengl es2 -openvg" -QT_CONFIG_FLAGS_append_mx5 = " -I${STAGING_KERNEL_DIR}/include/" - -DEPENDS_append_mx6 = " virtual/kernel virtual/libgles2" -QT_GLFLAGS_mx6 = "-opengl es2 -openvg" -QT_CONFIG_FLAGS_append_mx6 = " -I${STAGING_KERNEL_DIR}/include/uapi \ - -I${STAGING_KERNEL_DIR}/include/ \ - -DLINUX=1 -DEGL_API_FB=1" diff --git a/meta-fsl-arm/recipes-qt/qt4/qt4-x11-free_%.bbappend b/meta-fsl-arm/recipes-qt/qt4/qt4-x11-free_%.bbappend new file mode 100644 index 000000000..cf763b64a --- /dev/null +++ b/meta-fsl-arm/recipes-qt/qt4/qt4-x11-free_%.bbappend @@ -0,0 +1,15 @@ +#Freescale +include qt4-phonon-patches.inc + +DEPENDS_append_mx5 = " virtual/kernel virtual/libgles2" +QT_GLFLAGS_mx5 = "-opengl es2 -openvg" +QT_CONFIG_FLAGS_append_mx5 = " -I${STAGING_KERNEL_DIR}/include/" + +DEPENDS_append_mx6 = " virtual/kernel virtual/libgles2" +QT_GLFLAGS_mx6 = "-opengl es2 -openvg" +QT_CONFIG_FLAGS_append_mx6 = " -I${STAGING_KERNEL_DIR}/include/uapi \ + -I${STAGING_KERNEL_DIR}/include/ \ + -DLINUX=1 -DEGL_API_FB=1 \ + -DQT_QPA_EXPERIMENTAL_TOUCHEVENT=1" + +SRC_URI_append_mx6 = " file://0003-i.MX6-force-egl-visual-ID-33.patch" diff --git a/meta-fsl-arm/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend b/meta-fsl-arm/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend deleted file mode 100644 index cf763b64a..000000000 --- a/meta-fsl-arm/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend +++ /dev/null @@ -1,15 +0,0 @@ -#Freescale -include qt4-phonon-patches.inc - -DEPENDS_append_mx5 = " virtual/kernel virtual/libgles2" -QT_GLFLAGS_mx5 = "-opengl es2 -openvg" -QT_CONFIG_FLAGS_append_mx5 = " -I${STAGING_KERNEL_DIR}/include/" - -DEPENDS_append_mx6 = " virtual/kernel virtual/libgles2" -QT_GLFLAGS_mx6 = "-opengl es2 -openvg" -QT_CONFIG_FLAGS_append_mx6 = " -I${STAGING_KERNEL_DIR}/include/uapi \ - -I${STAGING_KERNEL_DIR}/include/ \ - -DLINUX=1 -DEGL_API_FB=1 \ - -DQT_QPA_EXPERIMENTAL_TOUCHEVENT=1" - -SRC_URI_append_mx6 = " file://0003-i.MX6-force-egl-visual-ID-33.patch" -- cgit v1.2.3-54-g00ecf