Rename MACHINE=netbook to MACHINE=atom-pc

In preparation for the more generic atom-pc, rename the netbook machine and all
the relevant overrides. Leave the linux-netbook kernel recipe intact and as the
default kernel for the atom-pc machine.  A future patch will convert this over
to linux-wrs and likely remove the linux-netbook kernel recipe.

Cc: Tom Zanussi <tom.zanussi@intel.com>
Cc: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

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"
 # Other supported machines
 #MACHINE ?= "qemuarm"
 #MACHINE ?= "qemux86-64"
-#MACHINE ?= "netbook"
+#MACHINE ?= "atom-pc"
 #MACHINE ?= "c7x0"
 #MACHINE ?= "akita"
 #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 @@
 #@TYPE: Machine
-#@NAME: Netbook
+#@NAME: Atom-PC
 
-#@DESCRIPTION: Machine configuration for Netbooks. Currently supported machines are the Asus eee901 and the Acer Aspire One
+#@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.
 
 TARGET_ARCH = "i586"
 PACKAGE_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 @@
 DESCRIPTION = "Device formfactor information"
 SECTION = "base"
 LICENSE = "MIT"
-PR = "r18"
+PR = "r19"
 
 SRC_URI = "file://config file://machconfig"
 S = "${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 @@
 
 DESCRIPTION = "Tools tasks for Poky"
 LICENSE = "MIT"
-PR = "r7"
+PR = "r8"
 
 PACKAGES = "\
     task-poky-tools-debug \
@@ -52,14 +52,14 @@ RRECOMMENDS_task-poky-tools-profile = "\
 #    exmap-server
 
 # At present we only build lttng-ust on
-# qemux86/qemux86-64/qemuppc/emenlow/netbook since upstream liburcu
+# qemux86/qemux86-64/qemuppc/emenlow/atom-pc since upstream liburcu
 # (which is required by lttng-ust) may not build on other platforms, like
 # MIPS and qemu ARMv5te that poky uses now.
 RDEPENDS_task-poky-tools-profile_append_qemux86 = " valgrind lttng-ust"
 RDEPENDS_task-poky-tools-profile_append_qemux86-64 = " lttng-ust"
 RDEPENDS_task-poky-tools-profile_append_qemuppc = " lttng-ust"
 RDEPENDS_task-poky-tools-profile_append_emenlow = " lttng-ust"
-RDEPENDS_task-poky-tools-profile_append_netbook = " lttng-ust"
+RDEPENDS_task-poky-tools-profile_append_atom-pc = " lttng-ust"
 
 RDEPENDS_task-poky-tools-testapps = "\
     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 \
                     file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \
                     file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \
                     file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://download.gnome.org/sources/gtk+/2.20/gtk+-${PV}.tar.bz2 \
            file://xsettings.patch;patch=1 \
@@ -34,9 +34,9 @@ LIBV = "2.10.0"
 
 PACKAGES_DYNAMIC += "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*"
 
-#-fomit-frame-pointer in default FULL_OPTIMIZATION will cause matchbox-panel segfault on netbook & emenlow
+#-fomit-frame-pointer in default FULL_OPTIMIZATION will cause matchbox-panel segfault on atom-pc & emenlow
 FULL_OPTIMIZATION_emenlow = "-fexpensive-optimizations -frename-registers -O2 -ggdb -feliminate-unused-debug-types"
-FULL_OPTIMIZATION_netbook = "-fexpensive-optimizations -frename-registers -O2 -ggdb -feliminate-unused-debug-types"
+FULL_OPTIMIZATION_atom-pc = "-fexpensive-optimizations -frename-registers -O2 -ggdb -feliminate-unused-debug-types"
 
 python populate_packages_prepend () {
         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"
 HOMEPAGE = "http://www.clutter-project.org/"
 LICENSE = "LGPL"
 
-COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-3430sdp|mx31ads|qemuarm|qemux86|ipodtouch|netbook|menlow)"
+COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-3430sdp|mx31ads|qemuarm|qemux86|ipodtouch|atom-pc|menlow)"
 
 STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+ libxi"
 BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}"
@@ -35,9 +35,9 @@ EXTRA_OECONF_mx31ads = "${BASE_CONF} --with-flavour=eglnative"
 PACKAGE_ARCH_mx31ads = "${MACHINE_ARCH}"
 LDFLAGS_append_mx31ads = " -lpvrNULLWSEGL -lstdc++ "
 
-DEPENDS_netbook = "${STDDEPENDS} virtual/xserver-xf86 virtual/libgl"
-EXTRA_OECONF_netbook = "${BASE_CONF} --with-flavour=glx"
-PACKAGE_ARCH_netbook = "${MACHINE_ARCH}"
+DEPENDS_atom-pc = "${STDDEPENDS} virtual/xserver-xf86 virtual/libgl"
+EXTRA_OECONF_atom-pc = "${BASE_CONF} --with-flavour=glx"
+PACKAGE_ARCH_atom-pc = "${MACHINE_ARCH}"
 
 DEPENDS_menlow = "${STDDEPENDS} virtual/xserver-xf86 virtual/libgl"
 EXTRA_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"
 
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
-PR = "r11"
+PR = "r12"
 
 # most of our targets do not have DRI so will use mesa-xlib
 DEFAULT_PREFERENCE = "-1"
 
-# Netbooks have DRI support so use mesa-dri by default
-DEFAULT_PREFERENCE_netbook = "1"
+# Atom PCs have DRI support so use mesa-dri by default
+DEFAULT_PREFERENCE_atom-pc = "1"
 
 PACKAGES =+ "${PN}-xprogs"
 PACKAGES_DYNAMIC = "mesa-dri-driver-*"
@@ -45,4 +45,4 @@ COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
 #
 # 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
 # then run gen_matypes > matypes.h on device
-#
\ No newline at end of file
+#
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"
 
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
-PR = "r11"
+PR = "r12"
 
 # most of our targets do not have DRI so will use mesa-xlib
 DEFAULT_PREFERENCE = "-1"
 
-# Netbooks have DRI support so use mesa-dri by default
-DEFAULT_PREFERENCE_netbook = "1"
+# Atom PCs have DRI support so use mesa-dri by default
+DEFAULT_PREFERENCE_atom-pc = "1"
 
 PACKAGES =+ "${PN}-xprogs"
 PACKAGES_DYNAMIC = "mesa-dri-driver-*"
@@ -46,4 +46,4 @@ COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
 #
 # 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
 # then run gen_matypes > matypes.h on device
-#
\ No newline at end of file
+#
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"
 
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS} mesa-dri-glsl-native"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "file://crossfix.patch"
 
 # most of our targets do not have DRI so will use mesa-xlib
 DEFAULT_PREFERENCE = "-1"
 
-# Netbooks have DRI support so use mesa-dri by default
-DEFAULT_PREFERENCE_netbook = "1"
+# Atom PCs have DRI support so use mesa-dri by default
+DEFAULT_PREFERENCE_atom-pc = "1"
 
 LEAD_SONAME = "libGL.so.1"
 
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"
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
 PV = "7.7+git${SRCPV}"
-PR = "r0"
+PR = "r1"
 
 # most of our targets do not have DRI so will use mesa-xlib
 DEFAULT_PREFERENCE = "-1"
 
-# Netbooks have DRI support so use mesa-dri by default
-DEFAULT_PREFERENCE_netbook = "1"
+# Atom PCs have DRI support so use mesa-dri by default
+DEFAULT_PREFERENCE_atom-pc = "1"
 
 PACKAGES =+ "${PN}-xprogs"
 PACKAGES_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() {
 
 }
 
-COMPATIBLE_MACHINE = "(netbook|menlow)"
+COMPATIBLE_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 @@
 require linux-netbook.inc
 
-PR = "r1"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_netbook = "1"
+DEFAULT_PREFERENCE_atom-pc = "1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            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 \
            file://rtl8192_no_autoconnect.patch;patch=1 \
            file://rtl8192_no_WAP_unassoc.patch;patch=1 \
 #           file://defconfig-menlow \
-           file://defconfig-netbook"
+           file://defconfig-atom-pc"
            
 S = "${WORKDIR}/linux-${PV}"