sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Darren Hart 2010-10-07 13:04:23 -07:00 committed by Richard Purdie
parent 5f17c07331
commit c449c78c25
16 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/conf/local.conf.sample
View File

@ -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"

4
meta/conf/machine/netbook.conf → meta/conf/machine/atom-pc.conf
View File

@ -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"

0
meta/recipes-bsp/formfactor/files/netbook/machconfig → meta/recipes-bsp/formfactor/files/atom-pc/machconfig
View File

2
meta/recipes-bsp/formfactor/formfactor_0.0.bb
View File

@ -1,7 +1,7 @@
DESCRIPTION = "Device formfactor information"
SECTION = "base"
LICENSE = "MIT"
PR = "r18"
PR = "r19"
SRC_URI = "file://config file://machconfig"
S = "${WORKDIR}"

6
meta/recipes-core/tasks/task-poky-tools.bb
View File

@ -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 \

0
meta/recipes-core/uclibc/uclibc-0.9.30.1/netbook/uClibc.machine → meta/recipes-core/uclibc/uclibc-0.9.30.1/atom-pc/uClibc.machine
View File

6
meta/recipes-gnome/gtk+/gtk+_2.20.1.bb
View File

@ -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

8
meta/recipes-graphics/clutter/clutter.inc
View File

@ -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"

8
meta/recipes-graphics/mesa/mesa-dri_7.5.bb
View File

@ -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
#
#

8
meta/recipes-graphics/mesa/mesa-dri_7.7.bb
View File

@ -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
#
#

6
meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb
View File

@ -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"

6
meta/recipes-graphics/mesa/mesa-dri_git.bb
View File

@ -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-*"

0
meta/recipes-graphics/xorg-xserver/xserver-xf86-config/netbook/xorg.conf → meta/recipes-graphics/xorg-xserver/xserver-xf86-config/atom-pc/xorg.conf
View File

0
meta/recipes-kernel/linux/linux-netbook-2.6.33.2/defconfig-netbook → meta/recipes-kernel/linux/linux-netbook-2.6.33.2/defconfig-atom-pc
View File

2
meta/recipes-kernel/linux/linux-netbook.inc
View File

@ -14,4 +14,4 @@ do_configure() {
}
COMPATIBLE_MACHINE = "(netbook|menlow)"
COMPATIBLE_MACHINE = "(atom-pc|menlow)"

6
meta/recipes-kernel/linux/linux-netbook_2.6.33.2.bb
View File

@ -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}"