This email list is read-only. Emails sent to this list will be discarded
----------------------------------
build/conf/local.conf.sample | 26 +-
meta-moblin/conf/machine/include/tune-atom.inc | 1 +
meta-moblin/conf/machine/netbook.conf | 42 +
meta-moblin/packages/images/poky-image-live.bb | 9 +
meta-moblin/packages/images/poky-image-live.inc | 18 +
.../images/poky-image-minimal-initramfs.bb | 8 +
.../packages/images/poky-image-minimal-live.bb | 9 +
meta-moblin/packages/images/poky-image-netbook.bb | 7 +
.../packages/images/poky-image-sato-live.bb | 9 +
meta/packages/clutter/clutter-0.6_svn.bb | 2 +-
meta/packages/clutter/clutter-0.8_svn.bb | 2 +-
meta/packages/clutter/clutter.inc | 8 +-
meta/packages/clutter/clutter_svn.bb | 2 +-
meta/packages/formfactor/files/eee901/machconfig | 6 -
meta/packages/formfactor/files/netbook/machconfig | 6 +
meta/packages/formfactor/formfactor_0.0.bb | 2 +-
.../linux-moblin-2.6.27-rc1/defconfig-netbook | 2419 +++++++++++++++++++
.../linux-moblin-2.6.27-rc6/defconfig-netbook | 2424 ++++++++++++++++++++
meta/packages/linux/linux-moblin.inc | 2 +-
meta/packages/linux/linux-moblin_2.6.27-rc1.bb | 4 +-
meta/packages/linux/linux-moblin_2.6.27-rc6.bb | 6 +-
meta/packages/mesa/mesa-dri_7.2.bb | 6 +-
meta/packages/mesa/mesa-dri_git.bb | 6 +-
meta/packages/rt2860/rt2860_1.7.0.0.bb | 4 +-
scripts/poky-autobuild-postprocess | 6 +-
scripts/poky-env-internal | 4 +
scripts/pokyABConfig.py | 14 +-
27 files changed, 5007 insertions(+), 45 deletions(-)
New commits:
commit e5c53ce035eb36fc1b416e9971582a45754844be
Author: Samuel Ortiz <[EMAIL PROTECTED]>
Date: Tue Oct 21 16:01:02 2008 +0200
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.
Diff in this email is a maximum of 400 lines.
diff --git a/build/conf/local.conf.sample b/build/conf/local.conf.sample
index 619dcca..478dac9 100644
--- a/build/conf/local.conf.sample
+++ b/build/conf/local.conf.sample
@@ -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 = ""
diff --git a/meta-moblin/conf/machine/include/tune-atom.inc
b/meta-moblin/conf/machine/include/tune-atom.inc
new file mode 100644
index 0000000..6070546
--- /dev/null
+++ b/meta-moblin/conf/machine/include/tune-atom.inc
@@ -0,0 +1 @@
+TARGET_CC_ARCH = "-march=i586"
diff --git a/meta-moblin/conf/machine/netbook.conf
b/meta-moblin/conf/machine/netbook.conf
new file mode 100644
index 0000000..12f9af7
--- /dev/null
+++ b/meta-moblin/conf/machine/netbook.conf
@@ -0,0 +1,42 @@
[EMAIL PROTECTED]: Machine
[EMAIL PROTECTED]: Netbook
+
[EMAIL PROTECTED]: 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"
diff --git a/meta-moblin/packages/images/poky-image-live.bb
b/meta-moblin/packages/images/poky-image-live.bb
new file mode 100644
index 0000000..a3bfbfc
--- /dev/null
+++ b/meta-moblin/packages/images/poky-image-live.bb
@@ -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"
diff --git a/meta-moblin/packages/images/poky-image-live.inc
b/meta-moblin/packages/images/poky-image-live.inc
new file mode 100644
index 0000000..7f8dd8f
--- /dev/null
+++ b/meta-moblin/packages/images/poky-image-live.inc
@@ -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")
+}
+
diff --git a/meta-moblin/packages/images/poky-image-minimal-initramfs.bb
b/meta-moblin/packages/images/poky-image-minimal-initramfs.bb
new file mode 100644
index 0000000..b2824a7
--- /dev/null
+++ b/meta-moblin/packages/images/poky-image-minimal-initramfs.bb
@@ -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
diff --git a/meta-moblin/packages/images/poky-image-minimal-live.bb
b/meta-moblin/packages/images/poky-image-minimal-live.bb
new file mode 100644
index 0000000..7d9aa5f
--- /dev/null
+++ b/meta-moblin/packages/images/poky-image-minimal-live.bb
@@ -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"
diff --git a/meta-moblin/packages/images/poky-image-netbook.bb
b/meta-moblin/packages/images/poky-image-netbook.bb
new file mode 100644
index 0000000..8138e9d
--- /dev/null
+++ b/meta-moblin/packages/images/poky-image-netbook.bb
@@ -0,0 +1,7 @@
+#
+# Copyright (C) 2007 OpenedHand Ltd.
+#
+
+IMAGE_FEATURES += "apps-console-core ${NETBOOK_IMAGE_FEATURES}"
+
+inherit poky-image
diff --git a/meta-moblin/packages/images/poky-image-sato-live.bb
b/meta-moblin/packages/images/poky-image-sato-live.bb
new file mode 100644
index 0000000..9b686e8
--- /dev/null
+++ b/meta-moblin/packages/images/poky-image-sato-live.bb
@@ -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"
diff --git a/meta/packages/clutter/clutter-0.6_svn.bb
b/meta/packages/clutter/clutter-0.6_svn.bb
index cf0543d..60f09dc 100644
--- a/meta/packages/clutter/clutter-0.6_svn.bb
+++ b/meta/packages/clutter/clutter-0.6_svn.bb
@@ -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"
diff --git a/meta/packages/clutter/clutter-0.8_svn.bb
b/meta/packages/clutter/clutter-0.8_svn.bb
index aa5df0d..02f7206 100644
--- a/meta/packages/clutter/clutter-0.8_svn.bb
+++ b/meta/packages/clutter/clutter-0.8_svn.bb
@@ -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 \
diff --git a/meta/packages/clutter/clutter.inc
b/meta/packages/clutter/clutter.inc
index 06f3b97..0b8b6a6 100644
--- a/meta/packages/clutter/clutter.inc
+++ b/meta/packages/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|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 [EMAIL PROTECTED](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"
diff --git a/meta/packages/clutter/clutter_svn.bb
b/meta/packages/clutter/clutter_svn.bb
index 150828c..2b65f23 100644
--- a/meta/packages/clutter/clutter_svn.bb
+++ b/meta/packages/clutter/clutter_svn.bb
@@ -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 \
diff --git a/meta/packages/formfactor/files/eee901/machconfig
b/meta/packages/formfactor/files/eee901/machconfig
deleted file mode 100644
index bef4ce3..0000000
--- a/meta/packages/formfactor/files/eee901/machconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-HAVE_TOUCHSCREEN=0
-HAVE_KEYBOARD=1
-
-DISPLAY_CAN_ROTATE=0
-DISPLAY_ORIENTATION=0
-DISPLAY_DPI=133
diff --git a/meta/packages/formfactor/files/netbook/machconfig
b/meta/packages/formfactor/files/netbook/machconfig
new file mode 100644
index 0000000..bef4ce3
--- /dev/null
+++ b/meta/packages/formfactor/files/netbook/machconfig
@@ -0,0 +1,6 @@
+HAVE_TOUCHSCREEN=0
+HAVE_KEYBOARD=1
+
+DISPLAY_CAN_ROTATE=0
+DISPLAY_ORIENTATION=0
+DISPLAY_DPI=133
diff --git a/meta/packages/formfactor/formfactor_0.0.bb
b/meta/packages/formfactor/formfactor_0.0.bb
index fcc11a1..b62a3a5 100644
--- a/meta/packages/formfactor/formfactor_0.0.bb
+++ b/meta/packages/formfactor/formfactor_0.0.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Device formfactor information"
SECTION = "base"
-PR = "r16"
+PR = "r17"
SRC_URI = "file://config file://machconfig"
S = "${WORKDIR}"
diff --git a/meta/packages/linux/linux-moblin-2.6.27-rc1/defconfig-netbook
b/meta/packages/linux/linux-moblin-2.6.27-rc1/defconfig-netbook
new file mode 100644
index 0000000..666a14c
--- /dev/null
+++ b/meta/packages/linux/linux-moblin-2.6.27-rc1/defconfig-netbook
@@ -0,0 +1,2419 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.27-rc1
+# Wed Oct 1 17:20:02 2008
+#
+# CONFIG_64BIT is not set
+CONFIG_X86_32=y
+# CONFIG_X86_64 is not set
+CONFIG_X86=y
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
+# CONFIG_GENERIC_LOCKBREAK is not set
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_FAST_CMPXCHG_LOCAL=y
+CONFIG_MMU=y
+CONFIG_ZONE_DMA=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_HWEIGHT=y
+# CONFIG_GENERIC_GPIO is not set
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+# CONFIG_GENERIC_TIME_VSYSCALL is not set
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+# CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+# CONFIG_ZONE_DMA32 is not set
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+# CONFIG_AUDIT_ARCH is not set
+CONFIG_ARCH_SUPPORTS_AOUT=y
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_X86_SMP=y
+CONFIG_X86_32_SMP=y
+CONFIG_X86_HT=y
+CONFIG_X86_BIOS_REBOOT=y
+CONFIG_X86_TRAMPOLINE=y
+CONFIG_KTIME_SCALAR=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION="-netbook"
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_AUDIT=y
+CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_TREE=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=17
+# CONFIG_CGROUPS is not set
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+# CONFIG_GROUP_SCHED is not set
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
_______________________________________________
Commits mailing list
[email protected]
https://lists.moblin.org/mailman/listinfo/commits
