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

netbook: changed platform name from eee901 to netbook 

We want to have a more generic platform definition.
The netbook machine one currently supports the eee901 and the aspire one.
We also moved the machine and netbook image definitions to meta-moblin.
This commit is contained in:
Samuel Ortiz 2008-10-21 16:01:02 +02:00 committed by Samuel Ortiz
parent 3e045793c7
commit e5c53ce035
26 changed files with 5001 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
build/conf/local.conf.sample
View File

@ -1,6 +1,15 @@
# Where to cache the files Poky downloads
DL_DIR ?= "${OEROOT}/sources"
BBFILES = "${OEROOT}/meta/packages/*/*.bb"
BBFILES = "\
${OEROOT}/meta/packages/*/*.bb \
${OEROOT}/meta-moblin/packages/*/*.bb"
BBFILE_COLLECTIONS = "normal moblin"
BBFILE_PATTERN_normal = "^${OEROOT}/meta/"
BBFILE_PATTERN_moblin = "^${OEROOT}/meta-moblin/"
BBFILE_PRIORITY_normal = "5"
BBFILE_PRIORITY_moblin = "5"
# Uncomment and set to allow bitbake to execute multiple tasks at once.
# For a quadcore, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would
@ -10,11 +19,11 @@ BBFILES = "${OEROOT}/meta/packages/*/*.bb"
# PARALLEL_MAKE = "-j 4"
# The machine to target
MACHINE ?= "qemuarm"
MACHINE ?= "netbook"
# Other supported machines
#MACHINE ?= "qemux86"
#MACHINE ?= "eee901"
#MACHINE ?= "qemuarm"
#MACHINE ?= "c7x0"
#MACHINE ?= "akita"
#MACHINE ?= "spitz"
@ -37,17 +46,20 @@ DISTRO ?= "poky"
# Poky has various extra metadata collections (openmoko, extras).
# To enable these, uncomment all (or some of) the following lines:
# BBFILES = "\
# ${OEROOT}/meta/packages/*/*.bb
# ${OEROOT}/meta-extras/packages/*/*.bb
# ${OEROOT}/meta-openmoko/packages/*/*.bb
# ${OEROOT}/meta/packages/*/*.bb \
# ${OEROOT}/meta-extras/packages/*/*.bb \
# ${OEROOT}/meta-openmoko/packages/*/*.bb \
# ${OEROOT}/meta-moblin/packages/*/*.bb \
# "
# BBFILE_COLLECTIONS = "normal extras openmoko"
# BBFILE_COLLECTIONS = "normal extras openmoko moblin"
# BBFILE_PATTERN_normal = "^${OEROOT}/meta/"
# BBFILE_PATTERN_extras = "^${OEROOT}/meta-extras/"
# BBFILE_PATTERN_openmoko = "^${OEROOT}/meta-openmoko/"
# BBFILE_PATTERN_moblin = "^${OEROOT}/meta-moblin/"
# BBFILE_PRIORITY_normal = "5"
# BBFILE_PRIORITY_extras = "5"
# BBFILE_PRIORITY_openmoko = "5"
# BBFILE_PRIORITY_moblin = "5"
BBMASK = ""

1
meta-moblin/conf/machine/include/tune-atom.inc Normal file
View File

@ -0,0 +1 @@
TARGET_CC_ARCH = "-march=i586"

42
meta-moblin/conf/machine/netbook.conf Normal file
View File

@ -0,0 +1,42 @@
#@TYPE: Machine
#@NAME: Netbook
#@DESCRIPTION: Machine configuration for Netbooks. Currently supported machines are the Asus eee901 and the Acer Aspire One
TARGET_ARCH = "i586"
PACKAGE_EXTRA_ARCHS = "x86"
include conf/machine/include/tune-atom.inc
MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 wifi \
acpi"
KERNEL_IMAGETYPE = "bzImage"
PREFERRED_PROVIDER_virtual/kernel = "linux-moblin"
PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim"
PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
PREFERRED_PROVIDER_virtual/xserver = "xserver-xf86-dri-lite"
XSERVER ?= "xserver-xf86-dri-lite \
xf86-input-mouse \
xf86-input-keyboard \
xf86-input-synaptics \
xf86-video-intel"
MACHINE_DRI_MODULES = "i915"
MACHINE_EXTRA_RDEPENDS = "rt2860"
MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
GUI_MACHINE_CLASS = "bigscreen"
IMAGE_ROOTFS_SIZE_ext3 = "250000"
IMAGE_FSTYPES ?= "ext3 jffs2 cpio.gz"
APPEND += "video=intelfb:mode=800x600,accel=0,hwcursor=0 vga=788 usbcore.autosuspend=1"
GLIBC_ADDONS = "nptl"
GLIBC_EXTRA_OECONF = "--with-tls"
EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi"

9
meta-moblin/packages/images/poky-image-live.bb Normal file
View File

@ -0,0 +1,9 @@
DESCRIPTION = "Netbook Bootable Live Image"
require poky-image-live.inc
LABELS += "boot install"
ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-netbook-${MACHINE}.ext3"
do_bootimg[depends] += "poky-image-netbook:do_rootfs"

18
meta-moblin/packages/images/poky-image-live.inc Normal file
View File

@ -0,0 +1,18 @@
AUTO_SYSLINUXCFG = "1"
INITRD = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-initramfs-${MACHINE}.cpio.gz"
APPEND += "root=/dev/ram0 "
TIMEOUT = "10"
EXCLUDE_FROM_WORLD = "1"
do_bootimg[depends] += "poky-image-minimal-initramfs:do_rootfs"
inherit bootimg
do_bootimg_prepend () {
import bb
fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True)
if 'ext3' not in fstypes:
bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES")
}

8
meta-moblin/packages/images/poky-image-minimal-initramfs.bb Normal file
View File

@ -0,0 +1,8 @@
# Simple initramfs image. Mostly used for live images.
IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev"
export IMAGE_BASENAME = "poky-image-minimal-initramfs"
IMAGE_LINGUAS = ""
inherit poky-image

9
meta-moblin/packages/images/poky-image-minimal-live.bb Normal file
View File

@ -0,0 +1,9 @@
DESCRIPTION = "Minimal Bootable Live Image"
require poky-image-live.inc
LABELS += "boot install"
ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-${MACHINE}.ext3"
do_bootimg[depends] += "poky-image-minimal:do_rootfs"

7
meta-moblin/packages/images/poky-image-netbook.bb Normal file
View File

@ -0,0 +1,7 @@
#
# Copyright (C) 2007 OpenedHand Ltd.
#
IMAGE_FEATURES += "apps-console-core ${NETBOOK_IMAGE_FEATURES}"
inherit poky-image

9
meta-moblin/packages/images/poky-image-sato-live.bb Normal file
View File

@ -0,0 +1,9 @@
DESCRIPTION = "Sato Bootable Live Image"
require poky-image-live.inc
LABELS += "boot install"
ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sato-${MACHINE}.ext3"
do_bootimg[depends] += "poky-image-sato:do_rootfs"

2
meta/packages/clutter/clutter-0.6_svn.bb
View File

@ -7,4 +7,4 @@ SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-6;proto=
S = "${WORKDIR}/clutter-0-6"
PR = "r2"
PR = "r3"

2
meta/packages/clutter/clutter-0.8_svn.bb
View File

@ -1,7 +1,7 @@
require clutter.inc
PE = "1"
PR = "r0"
PR = "r1"
PV = "0.8.0+svnr${SRCREV}"
SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-8;proto=http \

8
meta/packages/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|eee901)"
COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-3430sdp|mx31ads|qemuarm|qemux86|ipodtouch|netbook)"
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_eee901 = "${STDDEPENDS} virtual/xserver-xf86 virtual/libgl"
EXTRA_OECONF_eee901 = "${BASE_CONF} --with-flavour=glx"
PACKAGE_ARCH_eee901 = "${MACHINE_ARCH}"
DEPENDS_netbook = "${STDDEPENDS} virtual/xserver-xf86 virtual/libgl"
EXTRA_OECONF_netbook = "${BASE_CONF} --with-flavour=glx"
PACKAGE_ARCH_netbook = "${MACHINE_ARCH}"
FILESPATH = "${FILE_DIRNAME}/clutter"

2
meta/packages/clutter/clutter_svn.bb
View File

@ -1,7 +1,7 @@
require clutter.inc
PV = "0.8.0+svnr${SRCREV}"
PR = "r1"
PR = "r2"
SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \
file://enable_tests.patch;patch=1;maxrev=2989 \

0
meta/packages/formfactor/files/eee901/machconfig → meta/packages/formfactor/files/netbook/machconfig
View File

2
meta/packages/formfactor/formfactor_0.0.bb
View File

@ -1,6 +1,6 @@
DESCRIPTION = "Device formfactor information"
SECTION = "base"
PR = "r16"
PR = "r17"
SRC_URI = "file://config file://machconfig"
S = "${WORKDIR}"

2419
meta/packages/linux/linux-moblin-2.6.27-rc1/defconfig-netbook Normal file
View File

File diff suppressed because it is too large Load Diff

2424
meta/packages/linux/linux-moblin-2.6.27-rc6/defconfig-netbook Normal file
View File

File diff suppressed because it is too large Load Diff

2
meta/packages/linux/linux-moblin.inc
View File

@ -15,4 +15,4 @@ do_configure() {
}
COMPATIBLE_MACHINE = "eee901"
COMPATIBLE_MACHINE = "netbook"

4
meta/packages/linux/linux-moblin_2.6.27-rc1.bb
View File

@ -1,6 +1,6 @@
require linux-moblin.inc
PR = "r4"
PR = "r5"
SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.26.tar.bz2 \
${KERNELORG_MIRROR}pub/linux/kernel/v2.6/testing/patch-2.6.27-rc1.bz2;patch=1 \
@ -16,6 +16,6 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.26.tar.bz2 \
file://0010_unionfs-2.4_for_2.6.27-rc1.patch;patch=1 \
file://0011_workaround_unidef_step.patch;patch=1 \
file://0012_intelfb_945gme.patch;patch=1 \
file://defconfig-eee901"
file://defconfig-netbook"
S = "${WORKDIR}/linux-2.6.26"

6
meta/packages/linux/linux-moblin_2.6.27-rc6.bb
View File

@ -1,9 +1,9 @@
require linux-moblin.inc
PR = "r3"
PR = "r4"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_eee901 = "1"
DEFAULT_PREFERENCE_netbook = "1"
SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.26.tar.bz2 \
${KERNELORG_MIRROR}pub/linux/kernel/v2.6/testing/patch-2.6.27-rc6.bz2;patch=1 \
@ -49,6 +49,6 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.26.tar.bz2 \
file://0040-fastboot-fix-issues-and-improve-output-of-bootgraph.patch;patch=1 \
file://0041-r8169-8101e.patch;patch=1 \
file://0042-intelfb-945gme.patch;patch=1 \
file://defconfig-eee901"
file://defconfig-netbook"
S = "${WORKDIR}/linux-2.6.26"

6
meta/packages/mesa/mesa-dri_7.2.bb
View File

@ -5,13 +5,13 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat"
DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
PR = "r4"
PR = "r5"
# most of our targets do not have DRI so will use mesa-xlib
DEFAULT_PREFERENCE = "-1"
# ASUS EeePC 901 has DRI support so use mesa-dri by default
DEFAULT_PREFERENCE_eee901 = "1"
# Netbooks have DRI support so use mesa-dri by default
DEFAULT_PREFERENCE_netbook = "1"
PACKAGES =+ "${PN}-xprogs"

6
meta/packages/mesa/mesa-dri_git.bb
View File

@ -6,13 +6,13 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat"
DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
PV = "7.3.0+git${SRCREV}"
PR = "r0"
PR = "r1"
# most of our targets do not have DRI so will use mesa-xlib
DEFAULT_PREFERENCE = "-1"
# ASUS EeePC 901 has DRI support so use mesa-dri by default
DEFAULT_PREFERENCE_eee901 = "1"
# Netbooks have has DRI support so use mesa-dri by default
DEFAULT_PREFERENCE_netbook = "1"
SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git"
S = "${WORKDIR}/git"

4
meta/packages/rt2860/rt2860_1.7.0.0.bb
View File

@ -2,7 +2,7 @@ DESCRIPTION = "Driver for the 802.11n RaLink rt2860 chipset"
PRIORITY = "optional"
SECTION = "kernel/modules"
LICENSE = "GPL"
PR = "r2"
PR = "r3"
SRC_URI = "http://folks.o-hand.com/sameo/rt2860/rt2860-1.7.0.0.tar.bz2 \
file://01_dev_get_by_name.patch;patch=1 \
@ -13,7 +13,7 @@ SRC_URI = "http://folks.o-hand.com/sameo/rt2860/rt2860-1.7.0.0.tar.bz2 \
S = "${WORKDIR}/rt2860-1.7.0.0"
COMPATIBLE_MACHINE = "eee901"
COMPATIBLE_MACHINE = "netbook"
inherit module

6
scripts/poky-autobuild-postprocess
View File

@ -70,7 +70,7 @@ if [ "x$ABTARGET" = "xpoky" ]; then
`readlink images/zImage-spitz.bin`
`readlink images/zImage-nokia800.bin`
`readlink images/bzImage-qemux86.bin`
`readlink images/bzImage-eee901.bin`
`readlink images/bzImage-netbook.bin`
`readlink images/zImage-htcuniversal.bin`
`readlink images/zImage-mx31litekit.bin`
`readlink images/zImage-mx31ads.bin`
@ -86,8 +86,8 @@ if [ "x$ABTARGET" = "xpoky" ]; then
updater.sh.c7x0
updater.sh.spitz
gnu-tar
poky-image-netbook-live-eee901-*.hddimg
poky-image-minimal-live-eee901-*.hddimg
poky-image-live-netbook-*.hddimg
poky-image-minimal-live-netbook-*.hddimg
poky-image-sato-akita-*.rootfs.summary.jffs2
poky-image-sato-c7x0-*.rootfs.jffs2
poky-image-sato-spitz-*.rootfs.tar.gz

4
scripts/poky-env-internal
View File

@ -33,6 +33,7 @@ fi
BBDIR="$OEROOT/bitbake$BBEXTRA/"
PKGDIR="$OEROOT/meta/"
PKGDIR_MOBLIN="$OEROOT/meta-moblin/"
BUILDDIR="$OEROOT/$BDIR/"
MSG=''
@ -59,6 +60,9 @@ if ! (test -r "$BUILDDIR/conf/local.conf"); then
fi
BBPATH=$BBDIR
if test x"$BBDIR" != x"$PKGDIR_MOBLIN"; then
BBPATH=$PKGDIR_MOBLIN:$BBPATH
fi
if test x"$BBDIR" != x"$PKGDIR"; then
BBPATH=$PKGDIR:$BBPATH
fi

14
scripts/pokyABConfig.py
View File

@ -64,12 +64,12 @@ runImage(f3, 'beagleboard', 'poky-image-sato')
runImage(f3, 'qemux86', 'poky-image-minimal')
runImage(f3, 'qemux86', 'poky-image-sato')
runImage(f3, 'qemux86', 'poky-image-sdk')
runImage(f3, 'eee901', 'poky-image-minimal')
runImage(f3, 'eee901', 'poky-image-minimal-live')
runImage(f3, 'eee901', 'poky-image-sato')
runImage(f3, 'eee901', 'poky-image-sato-live')
runImage(f3, 'eee901', 'poky-image-netbook-live')
runImage(f3, 'eee901', 'poky-image-sdk')
runImage(f3, 'netbook', 'poky-image-minimal')
runImage(f3, 'netbook', 'poky-image-minimal-live')
runImage(f3, 'netbook', 'poky-image-sato')
runImage(f3, 'netbook', 'poky-image-sato-live')
runImage(f3, 'netbook', 'poky-image-live')
runImage(f3, 'netbook', 'poky-image-sdk')
runImage(f3, 'bootcdx86', 'poky-image-sato-cd')
defaultenv['POKYLIBC'] = 'uclibc'
runImage(f3, 'cm-x270', 'poky-image-minimal-mtdutils')
@ -87,7 +87,7 @@ runImage(f4, 'qemuarm', 'world')
runImage(f4, 'qemux86', 'poky-image-sdk')
runImage(f4, 'qemux86', 'world')
runImage(f4, 'omap-3430ldp', 'poky-image-sato')
runImage(f4, 'eee901', 'poky-image-sato-live')
runImage(f4, 'netbook', 'poky-image-sato-live')
runComplete(f4)
from buildbot.process import step, factory