diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-10-07 16:37:10 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-11 18:08:31 +0100 |
commit | c09f0eb561a53b97a769dd0744076af7d904eafb (patch) | |
tree | ffdea22503027c6939e08c4e6ebc60b1c1346103 /meta/conf/distro | |
parent | 359006159996f95aaa7e53279229d72e161514bd (diff) | |
download | poky-c09f0eb561a53b97a769dd0744076af7d904eafb.tar.gz |
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.
(From OE-Core rev: 0b31c7200a368533df970f0efeb81e2e20c73593)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/distro')
-rw-r--r-- | meta/conf/distro/include/default-providers.inc | 4 | ||||
-rw-r--r-- | meta/conf/distro/include/distro_tracking_fields.inc | 20 |
2 files changed, 12 insertions, 12 deletions
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 @@ | |||
3 | # | 3 | # |
4 | PREFERRED_PROVIDER_virtual/db ?= "db" | 4 | PREFERRED_PROVIDER_virtual/db ?= "db" |
5 | PREFERRED_PROVIDER_virtual/db-native ?= "db-native" | 5 | PREFERRED_PROVIDER_virtual/db-native ?= "db-native" |
6 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86" | 6 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" |
7 | PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" | 7 | PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" |
8 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib" | 8 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib" |
9 | PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth" | 9 | PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth" |
10 | PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" | 10 | 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" | |||
3683 | RECIPE_LAST_UPDATE_pn-mesa-xlib = "Nov 27, 2010" | 3683 | RECIPE_LAST_UPDATE_pn-mesa-xlib = "Nov 27, 2010" |
3684 | RECIPE_MAINTAINER_pn-mesa-xlib="Yu Ke <ke.yu@intel.com>" | 3684 | RECIPE_MAINTAINER_pn-mesa-xlib="Yu Ke <ke.yu@intel.com>" |
3685 | 3685 | ||
3686 | RECIPE_STATUS_pn-xserver-xf86-dri-lite="green" # no update needed | 3686 | RECIPE_STATUS_pn-xserver-xorg="green" # no update needed |
3687 | RECIPE_LATEST_VERSION_pn-xserver-xf86-dri-lite="1.8.99.904" | 3687 | RECIPE_LATEST_VERSION_pn-xserver-xorg="1.8.99.904" |
3688 | RECIPE_NO_OF_PATCHES_pn-xserver-xf86-dri-lite="2" | 3688 | RECIPE_NO_OF_PATCHES_pn-xserver-xorg="2" |
3689 | RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xserver-xf86-dri-lite="2 monthes" | 3689 | RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xserver-xorg="2 monthes" |
3690 | RECIPE_LATEST_RELEASE_DATE_pn-xserver-xf86-dri-lite="2010/07/01" | 3690 | RECIPE_LATEST_RELEASE_DATE_pn-xserver-xorg="2010/07/01" |
3691 | RECIPE_INTEL_SECTION_pn-xserver-xf86-dri-lite="graphic core" | 3691 | RECIPE_INTEL_SECTION_pn-xserver-xorg="graphic core" |
3692 | RECIPE_LAST_UPDATE_pn-xserver-xf86-dri-lite = "Jan 18, 2011" | 3692 | RECIPE_LAST_UPDATE_pn-xserver-xorg = "Jan 18, 2011" |
3693 | RECIPE_MAINTAINER_pn-xserver-xf86-dri-lite="Yu Ke <ke.yu@intel.com>" | 3693 | RECIPE_MAINTAINER_pn-xserver-xorg="Yu Ke <ke.yu@intel.com>" |
3694 | 3694 | ||
3695 | RECIPE_STATUS_pn-xf86-input-synaptics = "red" | 3695 | RECIPE_STATUS_pn-xf86-input-synaptics = "red" |
3696 | 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" | 3696 | 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" | |||
5908 | 5908 | ||
5909 | DISTRO_PN_ALIAS_pn-btrfs-tools = "Debian=btrfs-tools Fedora=btrfs-progs" | 5909 | DISTRO_PN_ALIAS_pn-btrfs-tools = "Debian=btrfs-tools Fedora=btrfs-progs" |
5910 | DISTRO_PN_ALIAS_pn-rt-tests = "Debian=rt-tests Ubuntu=rt-tests" | 5910 | DISTRO_PN_ALIAS_pn-rt-tests = "Debian=rt-tests Ubuntu=rt-tests" |
5911 | DISTRO_PN_ALIAS_pn-xserver-xf86-lite = "Fedora=xorg-x11-server Ubuntu=xserver-xorg" | 5911 | DISTRO_PN_ALIAS_pn-xserver-xorg-lite = "Fedora=xorg-x11-server Ubuntu=xserver-xorg" |
5912 | DISTRO_PN_ALIAS_pn-xserver-xf86-dri-lite = "Fedora=xorg-x11-server Ubuntu=xserver-xorg" | 5912 | DISTRO_PN_ALIAS_pn-xserver-xorg = "Fedora=xorg-x11-server Ubuntu=xserver-xorg" |
5913 | DISTRO_PN_ALIAS_pn-xserver-kdrive = "Fedora=xorg-x11-server Ubuntu=xserver-xorg" | 5913 | DISTRO_PN_ALIAS_pn-xserver-kdrive = "Fedora=xorg-x11-server Ubuntu=xserver-xorg" |
5914 | DISTRO_PN_ALIAS_pn-dtc = "Fedora=dtc Ubuntu=dtc" | 5914 | DISTRO_PN_ALIAS_pn-dtc = "Fedora=dtc Ubuntu=dtc" |
5915 | DISTRO_PN_ALIAS_pn-dtc-native = "Fedora=dtc Ubuntu=dtc" | 5915 | DISTRO_PN_ALIAS_pn-dtc-native = "Fedora=dtc Ubuntu=dtc" |