summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/local.conf.sample2
-rw-r--r--meta/conf/machine/atom-pc.conf (renamed from meta/conf/machine/netbook.conf)4
-rw-r--r--meta/recipes-bsp/formfactor/files/atom-pc/machconfig (renamed from meta/recipes-bsp/formfactor/files/netbook/machconfig)0
-rw-r--r--meta/recipes-bsp/formfactor/formfactor_0.0.bb2
-rw-r--r--meta/recipes-core/tasks/task-poky-tools.bb6
-rw-r--r--meta/recipes-core/uclibc/uclibc-0.9.30.1/atom-pc/uClibc.machine (renamed from meta/recipes-core/uclibc/uclibc-0.9.30.1/netbook/uClibc.machine)0
-rw-r--r--meta/recipes-gnome/gtk+/gtk+_2.20.1.bb6
-rw-r--r--meta/recipes-graphics/clutter/clutter.inc8
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri_7.5.bb8
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri_7.7.bb8
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb6
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri_git.bb6
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xf86-config/atom-pc/xorg.conf (renamed from meta/recipes-graphics/xorg-xserver/xserver-xf86-config/netbook/xorg.conf)0
-rw-r--r--meta/recipes-kernel/linux/linux-netbook-2.6.33.2/defconfig-atom-pc (renamed from meta/recipes-kernel/linux/linux-netbook-2.6.33.2/defconfig-netbook)0
-rw-r--r--meta/recipes-kernel/linux/linux-netbook.inc2
-rw-r--r--meta/recipes-kernel/linux/linux-netbook_2.6.33.2.bb6
16 files changed, 32 insertions, 32 deletions
diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
index fc6f13932f..29f8967510 100644
--- a/meta/conf/local.conf.sample
+++ b/meta/conf/local.conf.sample
@@ -21,7 +21,7 @@ MACHINE ?= "qemux86"
21# Other supported machines 21# Other supported machines
22#MACHINE ?= "qemuarm" 22#MACHINE ?= "qemuarm"
23#MACHINE ?= "qemux86-64" 23#MACHINE ?= "qemux86-64"
24#MACHINE ?= "netbook" 24#MACHINE ?= "atom-pc"
25#MACHINE ?= "c7x0" 25#MACHINE ?= "c7x0"
26#MACHINE ?= "akita" 26#MACHINE ?= "akita"
27#MACHINE ?= "spitz" 27#MACHINE ?= "spitz"
diff --git a/meta/conf/machine/netbook.conf b/meta/conf/machine/atom-pc.conf
index 17bb8d789d..d1fa1efcb1 100644
--- a/meta/conf/machine/netbook.conf
+++ b/meta/conf/machine/atom-pc.conf
@@ -1,7 +1,7 @@
1#@TYPE: Machine 1#@TYPE: Machine
2#@NAME: Netbook 2#@NAME: Atom-PC
3 3
4#@DESCRIPTION: Machine configuration for Netbooks. Currently supported machines are the Asus eee901 and the Acer Aspire One 4#@DESCRIPTION: Machine configuration for Intel Atom based PCs. Currently supported machines are the Asus eee901, Acer Aspire One, Toshiba NB305, and Intel BlackSand development board.
5 5
6TARGET_ARCH = "i586" 6TARGET_ARCH = "i586"
7PACKAGE_EXTRA_ARCHS = "x86 core2" 7PACKAGE_EXTRA_ARCHS = "x86 core2"
diff --git a/meta/recipes-bsp/formfactor/files/netbook/machconfig b/meta/recipes-bsp/formfactor/files/atom-pc/machconfig
index bef4ce3c9b..bef4ce3c9b 100644
--- a/meta/recipes-bsp/formfactor/files/netbook/machconfig
+++ b/meta/recipes-bsp/formfactor/files/atom-pc/machconfig
diff --git a/meta/recipes-bsp/formfactor/formfactor_0.0.bb b/meta/recipes-bsp/formfactor/formfactor_0.0.bb
index bee1b380aa..7a3fa3f700 100644
--- a/meta/recipes-bsp/formfactor/formfactor_0.0.bb
+++ b/meta/recipes-bsp/formfactor/formfactor_0.0.bb
@@ -1,7 +1,7 @@
1DESCRIPTION = "Device formfactor information" 1DESCRIPTION = "Device formfactor information"
2SECTION = "base" 2SECTION = "base"
3LICENSE = "MIT" 3LICENSE = "MIT"
4PR = "r18" 4PR = "r19"
5 5
6SRC_URI = "file://config file://machconfig" 6SRC_URI = "file://config file://machconfig"
7S = "${WORKDIR}" 7S = "${WORKDIR}"
diff --git a/meta/recipes-core/tasks/task-poky-tools.bb b/meta/recipes-core/tasks/task-poky-tools.bb
index 9181941bf7..0a2533c525 100644
--- a/meta/recipes-core/tasks/task-poky-tools.bb
+++ b/meta/recipes-core/tasks/task-poky-tools.bb
@@ -4,7 +4,7 @@
4 4
5DESCRIPTION = "Tools tasks for Poky" 5DESCRIPTION = "Tools tasks for Poky"
6LICENSE = "MIT" 6LICENSE = "MIT"
7PR = "r7" 7PR = "r8"
8 8
9PACKAGES = "\ 9PACKAGES = "\
10 task-poky-tools-debug \ 10 task-poky-tools-debug \
@@ -52,14 +52,14 @@ RRECOMMENDS_task-poky-tools-profile = "\
52# exmap-server 52# exmap-server
53 53
54# At present we only build lttng-ust on 54# At present we only build lttng-ust on
55# qemux86/qemux86-64/qemuppc/emenlow/netbook since upstream liburcu 55# qemux86/qemux86-64/qemuppc/emenlow/atom-pc since upstream liburcu
56# (which is required by lttng-ust) may not build on other platforms, like 56# (which is required by lttng-ust) may not build on other platforms, like
57# MIPS and qemu ARMv5te that poky uses now. 57# MIPS and qemu ARMv5te that poky uses now.
58RDEPENDS_task-poky-tools-profile_append_qemux86 = " valgrind lttng-ust" 58RDEPENDS_task-poky-tools-profile_append_qemux86 = " valgrind lttng-ust"
59RDEPENDS_task-poky-tools-profile_append_qemux86-64 = " lttng-ust" 59RDEPENDS_task-poky-tools-profile_append_qemux86-64 = " lttng-ust"
60RDEPENDS_task-poky-tools-profile_append_qemuppc = " lttng-ust" 60RDEPENDS_task-poky-tools-profile_append_qemuppc = " lttng-ust"
61RDEPENDS_task-poky-tools-profile_append_emenlow = " lttng-ust" 61RDEPENDS_task-poky-tools-profile_append_emenlow = " lttng-ust"
62RDEPENDS_task-poky-tools-profile_append_netbook = " lttng-ust" 62RDEPENDS_task-poky-tools-profile_append_atom-pc = " lttng-ust"
63 63
64RDEPENDS_task-poky-tools-testapps = "\ 64RDEPENDS_task-poky-tools-testapps = "\
65 blktool \ 65 blktool \
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/netbook/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/atom-pc/uClibc.machine
index 5df15f94cb..5df15f94cb 100644
--- a/meta/recipes-core/uclibc/uclibc-0.9.30.1/netbook/uClibc.machine
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/atom-pc/uClibc.machine
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.20.1.bb b/meta/recipes-gnome/gtk+/gtk+_2.20.1.bb
index 7bb79bf0c4..b32d8e44c1 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.20.1.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.20.1.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
4 file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \ 4 file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \
5 file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \ 5 file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \
6 file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c" 6 file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c"
7PR = "r0" 7PR = "r1"
8 8
9SRC_URI = "http://download.gnome.org/sources/gtk+/2.20/gtk+-${PV}.tar.bz2 \ 9SRC_URI = "http://download.gnome.org/sources/gtk+/2.20/gtk+-${PV}.tar.bz2 \
10 file://xsettings.patch;patch=1 \ 10 file://xsettings.patch;patch=1 \
@@ -34,9 +34,9 @@ LIBV = "2.10.0"
34 34
35PACKAGES_DYNAMIC += "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*" 35PACKAGES_DYNAMIC += "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*"
36 36
37#-fomit-frame-pointer in default FULL_OPTIMIZATION will cause matchbox-panel segfault on netbook & emenlow 37#-fomit-frame-pointer in default FULL_OPTIMIZATION will cause matchbox-panel segfault on atom-pc & emenlow
38FULL_OPTIMIZATION_emenlow = "-fexpensive-optimizations -frename-registers -O2 -ggdb -feliminate-unused-debug-types" 38FULL_OPTIMIZATION_emenlow = "-fexpensive-optimizations -frename-registers -O2 -ggdb -feliminate-unused-debug-types"
39FULL_OPTIMIZATION_netbook = "-fexpensive-optimizations -frename-registers -O2 -ggdb -feliminate-unused-debug-types" 39FULL_OPTIMIZATION_atom-pc = "-fexpensive-optimizations -frename-registers -O2 -ggdb -feliminate-unused-debug-types"
40 40
41python populate_packages_prepend () { 41python populate_packages_prepend () {
42 import os.path 42 import os.path
diff --git a/meta/recipes-graphics/clutter/clutter.inc b/meta/recipes-graphics/clutter/clutter.inc
index c099309bbb..a42a6c59d6 100644
--- a/meta/recipes-graphics/clutter/clutter.inc
+++ b/meta/recipes-graphics/clutter/clutter.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Clutter graphics library"
2HOMEPAGE = "http://www.clutter-project.org/" 2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPL" 3LICENSE = "LGPL"
4 4
5COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-3430sdp|mx31ads|qemuarm|qemux86|ipodtouch|netbook|menlow)" 5COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-3430sdp|mx31ads|qemuarm|qemux86|ipodtouch|atom-pc|menlow)"
6 6
7STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+ libxi" 7STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+ libxi"
8BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}" 8BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}"
@@ -35,9 +35,9 @@ EXTRA_OECONF_mx31ads = "${BASE_CONF} --with-flavour=eglnative"
35PACKAGE_ARCH_mx31ads = "${MACHINE_ARCH}" 35PACKAGE_ARCH_mx31ads = "${MACHINE_ARCH}"
36LDFLAGS_append_mx31ads = " -lpvrNULLWSEGL -lstdc++ " 36LDFLAGS_append_mx31ads = " -lpvrNULLWSEGL -lstdc++ "
37 37
38DEPENDS_netbook = "${STDDEPENDS} virtual/xserver-xf86 virtual/libgl" 38DEPENDS_atom-pc = "${STDDEPENDS} virtual/xserver-xf86 virtual/libgl"
39EXTRA_OECONF_netbook = "${BASE_CONF} --with-flavour=glx" 39EXTRA_OECONF_atom-pc = "${BASE_CONF} --with-flavour=glx"
40PACKAGE_ARCH_netbook = "${MACHINE_ARCH}" 40PACKAGE_ARCH_atom-pc = "${MACHINE_ARCH}"
41 41
42DEPENDS_menlow = "${STDDEPENDS} virtual/xserver-xf86 virtual/libgl" 42DEPENDS_menlow = "${STDDEPENDS} virtual/xserver-xf86 virtual/libgl"
43EXTRA_OECONF_menlow = "${BASE_CONF} --with-flavour=glx" 43EXTRA_OECONF_menlow = "${BASE_CONF} --with-flavour=glx"
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.5.bb b/meta/recipes-graphics/mesa/mesa-dri_7.5.bb
index 6e9cdc9aa8..b50cee8639 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_7.5.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.5.bb
@@ -8,13 +8,13 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat"
8 8
9DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" 9DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
10 10
11PR = "r11" 11PR = "r12"
12 12
13# most of our targets do not have DRI so will use mesa-xlib 13# most of our targets do not have DRI so will use mesa-xlib
14DEFAULT_PREFERENCE = "-1" 14DEFAULT_PREFERENCE = "-1"
15 15
16# Netbooks have DRI support so use mesa-dri by default 16# Atom PCs have DRI support so use mesa-dri by default
17DEFAULT_PREFERENCE_netbook = "1" 17DEFAULT_PREFERENCE_atom-pc = "1"
18 18
19PACKAGES =+ "${PN}-xprogs" 19PACKAGES =+ "${PN}-xprogs"
20PACKAGES_DYNAMIC = "mesa-dri-driver-*" 20PACKAGES_DYNAMIC = "mesa-dri-driver-*"
@@ -45,4 +45,4 @@ COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
45# 45#
46# Header generated by i586-poky-linux-gcc gen_matypes.c -o gen_matypes -I ../../../include/GL -I ../../../include -I .. -I ../main/ -I ../math -I ../glapi/ -I ../tnl 46# Header generated by i586-poky-linux-gcc gen_matypes.c -o gen_matypes -I ../../../include/GL -I ../../../include -I .. -I ../main/ -I ../math -I ../glapi/ -I ../tnl
47# then run gen_matypes > matypes.h on device 47# then run gen_matypes > matypes.h on device
48# \ No newline at end of file 48#
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.7.bb b/meta/recipes-graphics/mesa/mesa-dri_7.7.bb
index a5899f3892..4cae9c8699 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_7.7.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.7.bb
@@ -9,13 +9,13 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat"
9 9
10DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" 10DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
11 11
12PR = "r11" 12PR = "r12"
13 13
14# most of our targets do not have DRI so will use mesa-xlib 14# most of our targets do not have DRI so will use mesa-xlib
15DEFAULT_PREFERENCE = "-1" 15DEFAULT_PREFERENCE = "-1"
16 16
17# Netbooks have DRI support so use mesa-dri by default 17# Atom PCs have DRI support so use mesa-dri by default
18DEFAULT_PREFERENCE_netbook = "1" 18DEFAULT_PREFERENCE_atom-pc = "1"
19 19
20PACKAGES =+ "${PN}-xprogs" 20PACKAGES =+ "${PN}-xprogs"
21PACKAGES_DYNAMIC = "mesa-dri-driver-*" 21PACKAGES_DYNAMIC = "mesa-dri-driver-*"
@@ -46,4 +46,4 @@ COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
46# 46#
47# Header generated by i586-poky-linux-gcc gen_matypes.c -o gen_matypes -I ../../../include/GL -I ../../../include -I .. -I ../main/ -I ../math -I ../glapi/ -I ../tnl 47# Header generated by i586-poky-linux-gcc gen_matypes.c -o gen_matypes -I ../../../include/GL -I ../../../include -I .. -I ../main/ -I ../math -I ../glapi/ -I ../tnl
48# then run gen_matypes > matypes.h on device 48# then run gen_matypes > matypes.h on device
49# \ No newline at end of file 49#
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb b/meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb
index ffd885f293..caa9b2ecbc 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb
@@ -7,15 +7,15 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat"
7 7
8DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} mesa-dri-glsl-native" 8DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} mesa-dri-glsl-native"
9 9
10PR = "r1" 10PR = "r2"
11 11
12SRC_URI += "file://crossfix.patch" 12SRC_URI += "file://crossfix.patch"
13 13
14# most of our targets do not have DRI so will use mesa-xlib 14# most of our targets do not have DRI so will use mesa-xlib
15DEFAULT_PREFERENCE = "-1" 15DEFAULT_PREFERENCE = "-1"
16 16
17# Netbooks have DRI support so use mesa-dri by default 17# Atom PCs have DRI support so use mesa-dri by default
18DEFAULT_PREFERENCE_netbook = "1" 18DEFAULT_PREFERENCE_atom-pc = "1"
19 19
20LEAD_SONAME = "libGL.so.1" 20LEAD_SONAME = "libGL.so.1"
21 21
diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb
index fa0a7c8dc2..20bb9125d4 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_git.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_git.bb
@@ -12,13 +12,13 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat"
12DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" 12DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
13 13
14PV = "7.7+git${SRCPV}" 14PV = "7.7+git${SRCPV}"
15PR = "r0" 15PR = "r1"
16 16
17# most of our targets do not have DRI so will use mesa-xlib 17# most of our targets do not have DRI so will use mesa-xlib
18DEFAULT_PREFERENCE = "-1" 18DEFAULT_PREFERENCE = "-1"
19 19
20# Netbooks have DRI support so use mesa-dri by default 20# Atom PCs have DRI support so use mesa-dri by default
21DEFAULT_PREFERENCE_netbook = "1" 21DEFAULT_PREFERENCE_atom-pc = "1"
22 22
23PACKAGES =+ "${PN}-xprogs" 23PACKAGES =+ "${PN}-xprogs"
24PACKAGES_DYNAMIC = "mesa-dri-driver-*" 24PACKAGES_DYNAMIC = "mesa-dri-driver-*"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/netbook/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/atom-pc/xorg.conf
index e18b911199..e18b911199 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/netbook/xorg.conf
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/atom-pc/xorg.conf
diff --git a/meta/recipes-kernel/linux/linux-netbook-2.6.33.2/defconfig-netbook b/meta/recipes-kernel/linux/linux-netbook-2.6.33.2/defconfig-atom-pc
index cbb453513b..cbb453513b 100644
--- a/meta/recipes-kernel/linux/linux-netbook-2.6.33.2/defconfig-netbook
+++ b/meta/recipes-kernel/linux/linux-netbook-2.6.33.2/defconfig-atom-pc
diff --git a/meta/recipes-kernel/linux/linux-netbook.inc b/meta/recipes-kernel/linux/linux-netbook.inc
index 71ea1d3e62..05a21d49dd 100644
--- a/meta/recipes-kernel/linux/linux-netbook.inc
+++ b/meta/recipes-kernel/linux/linux-netbook.inc
@@ -14,4 +14,4 @@ do_configure() {
14 14
15} 15}
16 16
17COMPATIBLE_MACHINE = "(netbook|menlow)" 17COMPATIBLE_MACHINE = "(atom-pc|menlow)"
diff --git a/meta/recipes-kernel/linux/linux-netbook_2.6.33.2.bb b/meta/recipes-kernel/linux/linux-netbook_2.6.33.2.bb
index 9b0fd9aaa2..b0ee13704c 100644
--- a/meta/recipes-kernel/linux/linux-netbook_2.6.33.2.bb
+++ b/meta/recipes-kernel/linux/linux-netbook_2.6.33.2.bb
@@ -1,9 +1,9 @@
1require linux-netbook.inc 1require linux-netbook.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5DEFAULT_PREFERENCE = "-1" 5DEFAULT_PREFERENCE = "-1"
6DEFAULT_PREFERENCE_netbook = "1" 6DEFAULT_PREFERENCE_atom-pc = "1"
7 7
8SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ 8SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
9 file://linux-2.6.29-dont-wait-for-mouse.patch;patch=1 \ 9 file://linux-2.6.29-dont-wait-for-mouse.patch;patch=1 \
@@ -103,6 +103,6 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
103 file://rtl8192_no_autoconnect.patch;patch=1 \ 103 file://rtl8192_no_autoconnect.patch;patch=1 \
104 file://rtl8192_no_WAP_unassoc.patch;patch=1 \ 104 file://rtl8192_no_WAP_unassoc.patch;patch=1 \
105# file://defconfig-menlow \ 105# file://defconfig-menlow \
106 file://defconfig-netbook" 106 file://defconfig-atom-pc"
107 107
108S = "${WORKDIR}/linux-${PV}" 108S = "${WORKDIR}/linux-${PV}"