aboutsummaryrefslogtreecommitdiffstats
path: root/conf/distro/micro.conf
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2010-12-16 21:48:53 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2011-01-10 18:00:13 +0100
commitb329bb24204c59f4f9c156f9942f5a876bdad136 (patch)
tree0ac57cf8b4d1bb738707abb3f6d92a30887d4eec /conf/distro/micro.conf
parent48d527cd249636f34497612ef06e9d1e04f3cab1 (diff)
downloadopenembedded-b329bb24204c59f4f9c156f9942f5a876bdad136.tar.gz
xorg: upgrade to X11R7.6 and remove preferred-xorg-versions*.inc files
* X11R7.6-RC1 was already released http://www.x.org/releases/X11R7.6-RC1/doc/xorg-docs/ReleaseNotes.html so it's IMHO time to start migration there * preferred-xorg-versions-live.inc was tracking latest stable released tarballs, but only reason I was maintaining it was to overwrite older preferred-xorg-versions-X11R7.5.inc if your distribution included ie X11R7.5.inc and you wanted live.inc from local.conf * default recipe versions without any preferred-xorg-versions include are now the same as live.inc * we will get better test coverage if we use same versions * if someone really needs older release then pinning only core stuff like xserver/libx11 will be probably better, than pinning every xorg app/proto/font etc. * I can slow down adding newest xorg stuff or ie keep it everytime for at least a week on ML for another review and test on more targets (I'm testing it only on om-gta02/spitz/nokia900) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Acked-by: Khem Raj <raj.khem@gmail.com> Acked-by: Otavio Salvador <otavio@ossystems.com.br> Ackey-by: Tom Rini <tom_rini@mentor.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'conf/distro/micro.conf')
-rw-r--r--conf/distro/micro.conf5
1 files changed, 0 insertions, 5 deletions
diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf
index 102afa1dcc..5902105d5c 100644
--- a/conf/distro/micro.conf
+++ b/conf/distro/micro.conf
@@ -75,11 +75,6 @@ MACHINE_CLASS ?= ""
MACHINE_OVERRIDES += "${MACHINE_CLASS}"
#############################################################################
-# PREFERRED VERSIONS
-#############################################################################
-require conf/distro/include/preferred-xorg-versions-X11R7.5.inc
-
-#############################################################################
# NLS
#############################################################################
USE_NLS = "no"