* [CONSOLIDATED PULL (meta-yocto) 1/4] linux-yocto/meta-yocto: routerstationpro/beagleboard: add 3.0.x support
2012-01-03 16:18 [CONSOLIDATED PULL (meta-yocto) 0/4] Saul Wold
@ 2012-01-03 16:18 ` Saul Wold
2012-01-03 16:18 ` [CONSOLIDATED PULL (meta-yocto) 2/4] linux-yocto-rt/meta-yocto: add routerstationpro support Saul Wold
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Saul Wold @ 2012-01-03 16:18 UTC (permalink / raw)
To: yocto
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Updating the routerstationpro and beagleboard compatibility and SRCREV
to pickup v3.0.12 support.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta-yocto/conf/machine/beagleboard.conf | 1 +
meta-yocto/conf/machine/routerstationpro.conf | 1 +
.../recipes-kernel/linux/linux-yocto_3.0.bbappend | 8 ++++----
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/meta-yocto/conf/machine/beagleboard.conf b/meta-yocto/conf/machine/beagleboard.conf
index 4d21388..dd549d0 100644
--- a/meta-yocto/conf/machine/beagleboard.conf
+++ b/meta-yocto/conf/machine/beagleboard.conf
@@ -32,6 +32,7 @@ EXTRA_IMAGECMD_jffs2 = "-lnp "
SERIAL_CONSOLE = "115200 ttyO2"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "3.0%"
KERNEL_IMAGETYPE = "uImage"
diff --git a/meta-yocto/conf/machine/routerstationpro.conf b/meta-yocto/conf/machine/routerstationpro.conf
index 9338ca1..83c2f8a 100644
--- a/meta-yocto/conf/machine/routerstationpro.conf
+++ b/meta-yocto/conf/machine/routerstationpro.conf
@@ -11,6 +11,7 @@ KERNEL_IMAGETYPE = "vmlinux"
KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "3.0%"
PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
XSERVER = "xserver-kdrive-fbdev"
diff --git a/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend
index 4f68bc1..e510880 100644
--- a/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend
+++ b/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend
@@ -5,11 +5,11 @@ KMACHINE_beagleboard = "yocto/standard/beagleboard"
SRCREV_machine_atom-pc ?= "1e18e44adbe79b846e382370eb29bc4b8cd5a1a0"
-SRCREV_machine_routerstationpro ?= "ed0e03a8b04388a982141919da805392b7ca1c91"
+SRCREV_machine_routerstationpro ?= "8f38705810634a84326d3a3ebe9653951aa4bf61"
SRCREV_machine_mpc8315e-rdb ?= "58ffdb8000e34d2ba7c3ef278b26680b0886e8b5"
-SRCREV_machine_beagleboard ?= "2bba211297d10047637b8f49abd2c5415480ce4d"
+SRCREV_machine_beagleboard ?= "6b4bf6173b0bd2d1619a8218bac66ebc4681dd35"
COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
-# COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
-# COMPATIBLE_MACHINE_beagleboard = "beagleboard"
+COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
+COMPATIBLE_MACHINE_beagleboard = "beagleboard"
COMPATIBLE_MACHINE_atom-pc = "atom-pc"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [CONSOLIDATED PULL (meta-yocto) 2/4] linux-yocto-rt/meta-yocto: add routerstationpro support
2012-01-03 16:18 [CONSOLIDATED PULL (meta-yocto) 0/4] Saul Wold
2012-01-03 16:18 ` [CONSOLIDATED PULL (meta-yocto) 1/4] linux-yocto/meta-yocto: routerstationpro/beagleboard: add 3.0.x support Saul Wold
@ 2012-01-03 16:18 ` Saul Wold
2012-01-03 16:18 ` [CONSOLIDATED PULL (meta-yocto) 3/4] distro: Add POKY_DEFAULT_EXTRA_R* variables Saul Wold
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Saul Wold @ 2012-01-03 16:18 UTC (permalink / raw)
To: yocto
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Fixes [YOCTO #1390]
Updated the meta-yocto support for the routerstationpro on the
preempt-rt kernel support.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
.../linux/linux-yocto-rt_3.0.bbappend | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta-yocto/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend b/meta-yocto/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
index ab0f24c..831df8d 100644
--- a/meta-yocto/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
+++ b/meta-yocto/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
@@ -19,7 +19,7 @@ SRCREV_machine_pn-linux-yocto-rt_mpc8315e-rdb = "0b805cce57f61a244eb3b8fce460b14
#SRCREV_machine_pn-linux-yocto-rt_beagleboard =
# routerstationpro support - preempt-rt kernel build failure
-#COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
-#KMACHINE_routerstationpro = "routerstationpro"
-#KBRANCH_routerstationpro = "yocto/standard/preempt-rt/base"
-#SRCREV_machine_pn-linux-yocto-rt_routerstationpro = "7e1e5b6c8a13c615feb0d7b6d37988a094aae98f"
+COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
+KMACHINE_routerstationpro = "routerstationpro"
+KBRANCH_routerstationpro = "yocto/standard/preempt-rt/routerstationpro"
+SRCREV_machine_pn-linux-yocto-rt_routerstationpro = "43dcdffebb64d9ce2f5cdcb18bb74bd9c301133f"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [CONSOLIDATED PULL (meta-yocto) 3/4] distro: Add POKY_DEFAULT_EXTRA_R* variables
2012-01-03 16:18 [CONSOLIDATED PULL (meta-yocto) 0/4] Saul Wold
2012-01-03 16:18 ` [CONSOLIDATED PULL (meta-yocto) 1/4] linux-yocto/meta-yocto: routerstationpro/beagleboard: add 3.0.x support Saul Wold
2012-01-03 16:18 ` [CONSOLIDATED PULL (meta-yocto) 2/4] linux-yocto-rt/meta-yocto: add routerstationpro support Saul Wold
@ 2012-01-03 16:18 ` Saul Wold
2012-01-03 16:18 ` [CONSOLIDATED PULL (meta-yocto) 4/4] distro: Add poky-tiny distro definition Saul Wold
2012-01-03 21:34 ` [CONSOLIDATED PULL (meta-yocto) 0/4] Richard Purdie
4 siblings, 0 replies; 6+ messages in thread
From: Saul Wold @ 2012-01-03 16:18 UTC (permalink / raw)
To: yocto
From: Darren Hart <dvhart@linux.intel.com>
Allow the reuse of poky.conf by distro definitions wanting to remove
content by introducting POKY_DEFAULT_EXTRA_R*. These are appended
to the corresponding DISTRO_EXTRA_R* variables and can be overriden
by distro configs that "require poky.conf".
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
meta-yocto/conf/distro/poky.conf | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index 80d4e47..86f9bf6 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -24,8 +24,12 @@ SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
EXTRAOPKGCONFIG = "poky-feed-config-opkg"
-DISTRO_EXTRA_RDEPENDS += "task-core-boot"
-DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet"
+# Override these in poky based distros to modify DISTRO_EXTRA_R*
+POKY_DEFAULT_EXTRA_RDEPENDS = "task-core-boot"
+POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet"
+
+DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}"
+DISTRO_EXTRA_RRECOMMENDS += " ${POKY_DEFAULT_EXTRA_RRECOMMENDS}"
POKYQEMUDEPS = "${@base_contains("INCOMPATIBLE_LICENSE", "GPLv3", "", "qemu-config",d)}"
DISTRO_EXTRA_RDEPENDS_append_qemuarm = " ${POKYQEMUDEPS}"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [CONSOLIDATED PULL (meta-yocto) 4/4] distro: Add poky-tiny distro definition
2012-01-03 16:18 [CONSOLIDATED PULL (meta-yocto) 0/4] Saul Wold
` (2 preceding siblings ...)
2012-01-03 16:18 ` [CONSOLIDATED PULL (meta-yocto) 3/4] distro: Add POKY_DEFAULT_EXTRA_R* variables Saul Wold
@ 2012-01-03 16:18 ` Saul Wold
2012-01-03 21:34 ` [CONSOLIDATED PULL (meta-yocto) 0/4] Richard Purdie
4 siblings, 0 replies; 6+ messages in thread
From: Saul Wold @ 2012-01-03 16:18 UTC (permalink / raw)
To: yocto
From: Darren Hart <dvhart@linux.intel.com>
Poky-tiny is intended for building very small OS images. The distro
definition sets the providers for the kernel and the runtime services.
It also reduces the eglibc component list and other DISTRO_FEATURE
elements.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
meta-yocto/conf/distro/poky-tiny.conf | 103 +++++++++++++++++++++++++++++++++
1 files changed, 103 insertions(+), 0 deletions(-)
create mode 100644 meta-yocto/conf/distro/poky-tiny.conf
diff --git a/meta-yocto/conf/distro/poky-tiny.conf b/meta-yocto/conf/distro/poky-tiny.conf
new file mode 100644
index 0000000..49c4397
--- /dev/null
+++ b/meta-yocto/conf/distro/poky-tiny.conf
@@ -0,0 +1,103 @@
+# Distribution definition for: poky-tiny
+#
+# Copyright (c) 2011, Intel Corporation.
+# All rights reserved.
+#
+# Poky-tiny is intended to define a tiny Linux system comprised of a
+# Linux kernel tailored to support each specific MACHINE and busybox.
+# Poky-tiny sets some basic policy to ensure a usable system while still
+# keeping the rootfs and kernel image as small as possible.
+#
+# The policies defined are intended to meet the following goals:
+# o Serial consoles only (no framebuffer or VGA console)
+# o Basic support for IPV4 networking
+# o Single user ash shell
+# o Static images (no support for adding packages or libraries later)
+# o Read-only or RAMFS root filesystem
+# o Combined Linux kernel + rootfs in under 4MB
+# o Allow the user to select between eglibc or uclibc with the TCLIBC variable
+#
+# This is currently a partial definition, the following tasks remain:
+# [ ] Integrate linux-yocto-tiny ktype into linux-yocto
+# [ ] Define linux-yocto-tiny configs for all supported BSPs
+# [ ] Drop ldconfig from the installation
+# [ ] Modify the runqemu scripts to work with ext2 parameter:
+# runqemu qemux86 qemuparams="-nographic" bootparams="console=ttyS0,115200 root=0800"
+# [ ] Modify busybox to allow for DISTRO_FEATURES-like confiruration
+
+require conf/distro/poky.conf
+DISTRO = "poky-tiny"
+
+# FIXME: consider adding a new "tiny" feature
+#DISTRO_FEATURES_append = " tiny"
+
+# Distro config is evaluated after the machine config, so we have to explicitly
+# set the kernel provider to override a machine config.
+PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-tiny"
+PREFERRED_VERSION_linux-yocto-tiny = "3.0%"
+
+# We can use task-core-boot, but in the future we may need a new task-core-tiny
+#POKY_DEFAULT_EXTRA_RDEPENDS += "task-core-boot"
+# Drop kernel-module-af-packet from RRECOMMENDS
+POKY_DEFAULT_EXTRA_RRECOMMENDS = ""
+
+# FIXME: what should we do with this?
+TCLIBCAPPEND = ""
+
+# Disable wide char support for ncurses as we don't include it in
+# in the LIBC features below.
+ENABLE_WIDEC="false"
+
+# Reconfigure eglibc for a smaller installation
+# Comment out any of the lines below to disable them in the build
+DISTRO_FEATURES_LIBC_TINY = "libc-libm libc-crypt"
+# Required for "who"
+DISTRO_FEATURES_LIBC_MINIMAL = "libc-utmp libc-getlogin"
+DISTRO_FEATURES_LIBC_REGEX = "libc-posix-regexp"
+DISTRO_FEATURES_LIBC_NET = "libc-inet libc-nis"
+
+DISTRO_FEATURES_LIBC = "${DISTRO_FEATURES_LIBC_TINY} \
+ ${DISTRO_FEATURES_LIBC_MINIMAL} \
+ ${DISTRO_FEATURES_LIBC_REGEX} \
+ ${DISTRO_FEATURES_LIBC_NET} \
+ "
+
+# Comment out any of the lines below to disable them in the build
+# DISTRO_FEATURES options:
+# alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci
+DISTRO_FEATURES_TINY = "pci"
+DISTRO_FEATURES_NET = "ipv4"
+DISTRO_FEATURES_USB = "usbhost"
+#DISTRO_FEATURES_USBGADGET = "usbgadget"
+#DISTRO_FEATURES_WIFI = "wifi"
+
+DISTRO_FEATURES = "${DISTRO_FEATURES_TINY} \
+ ${DISTRO_FEATURES_NET} \
+ ${DISTRO_FEATURES_USB} \
+ ${DISTRO_FEATURES_USBGADGET} \
+ ${DISTRO_FEATURES_WIFI} \
+ ${DISTRO_FEATURES_LIBC} \
+ "
+
+# Use tmpdevfs and the busybox runtime services
+VIRTUAL-RUNTIME_dev_manager = ""
+VIRTUAL-RUNTIME_login_manager = ""
+VIRTUAL-RUNTIME_init_manager = ""
+VIRTUAL-RUNTIME_keymaps = ""
+
+# FIXME: Consider adding "modules" to MACHINE_FEATURES and using that in
+# task-core-base to select modutils-initscripts or not. Similar with "net" and
+# netbase.
+
+# By default we only support ext2 and initramfs. We don't build live as that
+# pulls in a lot of dependencies for the live image and the installer, like
+# udev, grub, etc. These pull in gettext, which fails to build with wide
+# character support.
+IMAGE_FSTYPES = "ext2 cpio.gz"
+
+# Drop v86d from qemu dependency list (we support serial)
+# Drop grub from meta-intel BSPs
+# FIXME: A different mechanism is needed here. We could define -tiny
+# variants of all compatible machines, but that leads to a lot
+# more machine configs to maintain long term.
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = ""
--
1.7.6.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [CONSOLIDATED PULL (meta-yocto) 0/4]
2012-01-03 16:18 [CONSOLIDATED PULL (meta-yocto) 0/4] Saul Wold
` (3 preceding siblings ...)
2012-01-03 16:18 ` [CONSOLIDATED PULL (meta-yocto) 4/4] distro: Add poky-tiny distro definition Saul Wold
@ 2012-01-03 21:34 ` Richard Purdie
4 siblings, 0 replies; 6+ messages in thread
From: Richard Purdie @ 2012-01-03 21:34 UTC (permalink / raw)
To: Saul Wold; +Cc: yocto
On Tue, 2012-01-03 at 08:18 -0800, Saul Wold wrote:
> Richard,
>
> This is the meta-yocto patches that coordiate with the oe-core changes
> you have already pulled.
>
> Sau!
>
> The following changes since commit f3a1a8897c78e116d7d28947a85687d0ce9d7df7:
>
> pseudo: ensure libs are included in package (2012-01-03 12:14:41 +0000)
>
> are available in the git repository at:
> git://git.yoctoproject.org/poky-contrib sgw/stage
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgw/stage
>
> Bruce Ashfield (2):
> linux-yocto/meta-yocto: routerstationpro/beagleboard: add 3.0.x
> support
> linux-yocto-rt/meta-yocto: add routerstationpro support
>
> Darren Hart (2):
> distro: Add POKY_DEFAULT_EXTRA_R* variables
> distro: Add poky-tiny distro definition
Merged to master, thanks.
Richard
^ permalink raw reply [flat|nested] 6+ messages in thread