From 0b31c7200a368533df970f0efeb81e2e20c73593 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 7 Oct 2011 16:37:10 +0200 Subject: xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite * xserver-xorg is closer to upstream naming and that's how it's named in OE-classic and meta-oe? It would make meta-oe transition easier and better to do it now then convert meta-oe to xserver-xf86 and then rename it back later. Signed-off-by: Martin Jansa --- meta/conf/distro/include/default-providers.inc | 4 ++-- meta/conf/distro/include/distro_tracking_fields.inc | 20 ++++++++++---------- meta/conf/machine/qemux86-64.conf | 6 +++--- meta/conf/machine/qemux86.conf | 6 +++--- meta/conf/multilib.conf | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) (limited to 'meta/conf') diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index d51ac64ef4..a5cdb5b117 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -3,8 +3,8 @@ # PREFERRED_PROVIDER_virtual/db ?= "db" PREFERRED_PROVIDER_virtual/db-native ?= "db-native" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86" -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" +PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib" PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth" PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc index 7b6c4a96a5..b07209eb8b 100644 --- a/meta/conf/distro/include/distro_tracking_fields.inc +++ b/meta/conf/distro/include/distro_tracking_fields.inc @@ -3683,14 +3683,14 @@ RECIPE_INTEL_SECTION_pn-mesa-xlib="graphic core" RECIPE_LAST_UPDATE_pn-mesa-xlib = "Nov 27, 2010" RECIPE_MAINTAINER_pn-mesa-xlib="Yu Ke " -RECIPE_STATUS_pn-xserver-xf86-dri-lite="green" # no update needed -RECIPE_LATEST_VERSION_pn-xserver-xf86-dri-lite="1.8.99.904" -RECIPE_NO_OF_PATCHES_pn-xserver-xf86-dri-lite="2" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xserver-xf86-dri-lite="2 monthes" -RECIPE_LATEST_RELEASE_DATE_pn-xserver-xf86-dri-lite="2010/07/01" -RECIPE_INTEL_SECTION_pn-xserver-xf86-dri-lite="graphic core" -RECIPE_LAST_UPDATE_pn-xserver-xf86-dri-lite = "Jan 18, 2011" -RECIPE_MAINTAINER_pn-xserver-xf86-dri-lite="Yu Ke " +RECIPE_STATUS_pn-xserver-xorg="green" # no update needed +RECIPE_LATEST_VERSION_pn-xserver-xorg="1.8.99.904" +RECIPE_NO_OF_PATCHES_pn-xserver-xorg="2" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xserver-xorg="2 monthes" +RECIPE_LATEST_RELEASE_DATE_pn-xserver-xorg="2010/07/01" +RECIPE_INTEL_SECTION_pn-xserver-xorg="graphic core" +RECIPE_LAST_UPDATE_pn-xserver-xorg = "Jan 18, 2011" +RECIPE_MAINTAINER_pn-xserver-xorg="Yu Ke " RECIPE_STATUS_pn-xf86-input-synaptics = "red" DISTRO_PN_ALIAS_pn-xf86-input-synaptics = "Meego=xorg-x11-drv-synaptics Fedora=xorg-x11-drv-synaptics Ubuntu=xserver-xorg-input-synaptics Mandriva=x11-driver-input-synaptics Debian=xfree86-driver-synaptics" @@ -5908,8 +5908,8 @@ DISTRO_PN_ALIAS_pn-pseudo = "Windriver" DISTRO_PN_ALIAS_pn-btrfs-tools = "Debian=btrfs-tools Fedora=btrfs-progs" DISTRO_PN_ALIAS_pn-rt-tests = "Debian=rt-tests Ubuntu=rt-tests" -DISTRO_PN_ALIAS_pn-xserver-xf86-lite = "Fedora=xorg-x11-server Ubuntu=xserver-xorg" -DISTRO_PN_ALIAS_pn-xserver-xf86-dri-lite = "Fedora=xorg-x11-server Ubuntu=xserver-xorg" +DISTRO_PN_ALIAS_pn-xserver-xorg-lite = "Fedora=xorg-x11-server Ubuntu=xserver-xorg" +DISTRO_PN_ALIAS_pn-xserver-xorg = "Fedora=xorg-x11-server Ubuntu=xserver-xorg" DISTRO_PN_ALIAS_pn-xserver-kdrive = "Fedora=xorg-x11-server Ubuntu=xserver-xorg" DISTRO_PN_ALIAS_pn-dtc = "Fedora=dtc Ubuntu=dtc" DISTRO_PN_ALIAS_pn-dtc-native = "Fedora=dtc Ubuntu=dtc" diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index 18a75138a8..f28cf0819b 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf @@ -4,8 +4,8 @@ PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" +PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" require conf/machine/include/tune-x86_64.inc require conf/machine/include/qemu.inc @@ -17,7 +17,7 @@ KERNEL_IMAGETYPE = "bzImage" SERIAL_CONSOLE = "115200 ttyS0" # We bypass swrast but we need it to be present for X to load correctly -XSERVER ?= "xserver-xf86-dri-lite \ +XSERVER ?= "xserver-xorg \ mesa-dri-driver-swrast \ xf86-input-vmmouse \ xf86-input-keyboard \ diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index 5d0d03e827..75c9042eb5 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf @@ -4,8 +4,8 @@ PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" +PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" require conf/machine/include/tune-i586.inc require conf/machine/include/qemu.inc @@ -17,7 +17,7 @@ KERNEL_IMAGETYPE = "bzImage" SERIAL_CONSOLE = "115200 ttyS0" # We bypass swrast but we need it to be present for X to load correctly -XSERVER ?= "xserver-xf86-dri-lite \ +XSERVER ?= "xserver-xorg \ mesa-dri-driver-swrast \ xf86-input-vmmouse \ xf86-input-keyboard \ diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf index b9da33ae4a..5e4b4354b4 100644 --- a/meta/conf/multilib.conf +++ b/meta/conf/multilib.conf @@ -442,7 +442,7 @@ BBCLASSEXTEND_append_pn-xrandr = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-xrestop = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-xserver-nodm-init = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-xserver-xf86-config = " ${MULTILIBS}" -BBCLASSEXTEND_append_pn-xserver-xf86-dri-lite = " ${MULTILIBS}" +BBCLASSEXTEND_append_pn-xserver-xorg = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-xset = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-xtrans = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-xtscal = " ${MULTILIBS}" -- cgit v1.2.3