diff options
| author | Max Krummenacher <max.oss.09@gmail.com> | 2015-08-13 15:24:43 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.oss.09@gmail.com> | 2015-08-13 17:11:27 +0200 |
| commit | 1233cca15191d211b284b5478f7c179c388c03bc (patch) | |
| tree | 220c9d08c45c449b2e8c6324dddb8f73529cc174 /recipes-graphics | |
| parent | 07fdab6bbb64299b86c96747ce4e0deb2a1280fc (diff) | |
xserver-xorg: drop pinning to 1.14.7 for vf and mx6 based modules
Diffstat (limited to 'recipes-graphics')
| -rw-r--r-- | recipes-graphics/xorg-xserver/xserver-xorg_1.14.7.bb | 3 | ||||
| -rw-r--r-- | recipes-graphics/xorg-xserver/xserver-xorg_1.14.7.bbappend | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.14.7.bb b/recipes-graphics/xorg-xserver/xserver-xorg_1.14.7.bb index d3e8f89..2b2d13a 100644 --- a/recipes-graphics/xorg-xserver/xserver-xorg_1.14.7.bb +++ b/recipes-graphics/xorg-xserver/xserver-xorg_1.14.7.bb @@ -1,5 +1,7 @@ require recipes-graphics/xorg-xserver/xserver-xorg.inc +COMPATIBLE_MACHINE = "(apalis-t30|colibri-t20|colibri-t30)" + LIC_FILES_CHKSUM = "file://COPYING;md5=bc098b9774ed096943f6c37b5beeef13" # Misc build failure for master HEAD @@ -9,7 +11,6 @@ SRC_URI += "file://crosscompile.patch \ file://aarch64.patch \ file://xorg-CVE-2013-6424.patch \ " - SRC_URI[md5sum] = "0c285a813a6c3291c88d5a2b710aecb1" SRC_URI[sha256sum] = "fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f" diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.14.7.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_1.14.7.bbappend index 89ae312..639c9a2 100644 --- a/recipes-graphics/xorg-xserver/xserver-xorg_1.14.7.bbappend +++ b/recipes-graphics/xorg-xserver/xserver-xorg_1.14.7.bbappend @@ -1,9 +1,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/xserver-xorg-${PV}:" -ADD_PATCHES = "" -ADD_PATCHES_tegra = "file://Revert_Use_new_pixman_glyph_cache_t_API_that_will_be_in_pixman0.28.0.patch" - -SRC_URI += "${ADD_PATCHES}" +SRC_URI_append_tegra = "file://Revert_Use_new_pixman_glyph_cache_t_API_that_will_be_in_pixman0.28.0.patch" # HACK: during do_rootfs opkg takes the latest and greatest available # in any feed, e.g. one built for another machine without prefered version @@ -11,5 +8,5 @@ SRC_URI += "${ADD_PATCHES}" # so we set the recipe epoch here. Thus for our architecture we're # always latest and greatest. PE_tegra = "99" -PE_mx6 = "99" + PACKAGE_ARCH_tegra = "${MACHINE_ARCH}" |