diff options
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/distro/include/default-providers.inc | 4 | ||||
-rw-r--r-- | meta/conf/distro/include/distro_tracking_fields.inc | 20 | ||||
-rw-r--r-- | meta/conf/machine/qemux86-64.conf | 6 | ||||
-rw-r--r-- | meta/conf/machine/qemux86.conf | 6 | ||||
-rw-r--r-- | meta/conf/multilib.conf | 2 |
5 files changed, 19 insertions, 19 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" |
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 @@ | |||
4 | 4 | ||
5 | PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" | 5 | PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" |
6 | PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" | 6 | PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" |
7 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" | 7 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" |
8 | PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" | 8 | PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" |
9 | 9 | ||
10 | require conf/machine/include/tune-x86_64.inc | 10 | require conf/machine/include/tune-x86_64.inc |
11 | require conf/machine/include/qemu.inc | 11 | require conf/machine/include/qemu.inc |
@@ -17,7 +17,7 @@ KERNEL_IMAGETYPE = "bzImage" | |||
17 | SERIAL_CONSOLE = "115200 ttyS0" | 17 | SERIAL_CONSOLE = "115200 ttyS0" |
18 | 18 | ||
19 | # We bypass swrast but we need it to be present for X to load correctly | 19 | # We bypass swrast but we need it to be present for X to load correctly |
20 | XSERVER ?= "xserver-xf86-dri-lite \ | 20 | XSERVER ?= "xserver-xorg \ |
21 | mesa-dri-driver-swrast \ | 21 | mesa-dri-driver-swrast \ |
22 | xf86-input-vmmouse \ | 22 | xf86-input-vmmouse \ |
23 | xf86-input-keyboard \ | 23 | 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 @@ | |||
4 | 4 | ||
5 | PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" | 5 | PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" |
6 | PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" | 6 | PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" |
7 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" | 7 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" |
8 | PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" | 8 | PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" |
9 | 9 | ||
10 | require conf/machine/include/tune-i586.inc | 10 | require conf/machine/include/tune-i586.inc |
11 | require conf/machine/include/qemu.inc | 11 | require conf/machine/include/qemu.inc |
@@ -17,7 +17,7 @@ KERNEL_IMAGETYPE = "bzImage" | |||
17 | SERIAL_CONSOLE = "115200 ttyS0" | 17 | SERIAL_CONSOLE = "115200 ttyS0" |
18 | 18 | ||
19 | # We bypass swrast but we need it to be present for X to load correctly | 19 | # We bypass swrast but we need it to be present for X to load correctly |
20 | XSERVER ?= "xserver-xf86-dri-lite \ | 20 | XSERVER ?= "xserver-xorg \ |
21 | mesa-dri-driver-swrast \ | 21 | mesa-dri-driver-swrast \ |
22 | xf86-input-vmmouse \ | 22 | xf86-input-vmmouse \ |
23 | xf86-input-keyboard \ | 23 | 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}" | |||
442 | BBCLASSEXTEND_append_pn-xrestop = " ${MULTILIBS}" | 442 | BBCLASSEXTEND_append_pn-xrestop = " ${MULTILIBS}" |
443 | BBCLASSEXTEND_append_pn-xserver-nodm-init = " ${MULTILIBS}" | 443 | BBCLASSEXTEND_append_pn-xserver-nodm-init = " ${MULTILIBS}" |
444 | BBCLASSEXTEND_append_pn-xserver-xf86-config = " ${MULTILIBS}" | 444 | BBCLASSEXTEND_append_pn-xserver-xf86-config = " ${MULTILIBS}" |
445 | BBCLASSEXTEND_append_pn-xserver-xf86-dri-lite = " ${MULTILIBS}" | 445 | BBCLASSEXTEND_append_pn-xserver-xorg = " ${MULTILIBS}" |
446 | BBCLASSEXTEND_append_pn-xset = " ${MULTILIBS}" | 446 | BBCLASSEXTEND_append_pn-xset = " ${MULTILIBS}" |
447 | BBCLASSEXTEND_append_pn-xtrans = " ${MULTILIBS}" | 447 | BBCLASSEXTEND_append_pn-xtrans = " ${MULTILIBS}" |
448 | BBCLASSEXTEND_append_pn-xtscal = " ${MULTILIBS}" | 448 | BBCLASSEXTEND_append_pn-xtscal = " ${MULTILIBS}" |