Date   

[PATCH 05/10] meta-fri2: add EMGD 1.8 capabilities to fri2

tom.zanussi@...
 

From: Tom Zanussi <tom.zanussi@intel.com>

This patch essentially adds a new EMGD-capable 'fri2' machine to
meta-fri2.

The current version with vesa graphics will become fri2-noemgd; fri2
will become the version with EMGD graphics. This patch does the
fri2->fri2-noemgd renaming and adds the new files for fri2, and
updates the necessary .bbappends to support both fri2 and fri2-noemgd.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta-fri2/conf/machine/fri2-noemgd.conf | 36 +++++++++++++++
meta-fri2/conf/machine/fri2.conf | 5 ++-
.../formfactor/formfactor/fri2-noemgd/machconfig | 3 +
.../recipes-core/tasks/task-core-tools.bbappend | 1 +
.../xserver-xf86-config/fri2-noemgd/xorg.conf | 26 +++++++++++
.../xserver-xf86-config/fri2/xorg.conf | 48 ++++++++++++++-----
.../recipes-kernel/linux/linux-yocto_3.0.bbappend | 13 +++++-
7 files changed, 116 insertions(+), 16 deletions(-)
create mode 100644 meta-fri2/conf/machine/fri2-noemgd.conf
create mode 100644 meta-fri2/recipes-bsp/formfactor/formfactor/fri2-noemgd/machconfig
create mode 100644 meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2-noemgd/xorg.conf

diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf
new file mode 100644
index 0000000..a871529
--- /dev/null
+++ b/meta-fri2/conf/machine/fri2-noemgd.conf
@@ -0,0 +1,36 @@
+#@TYPE: Machine
+#@NAME: fri2
+
+#@DESCRIPTION: Machine configuration for Fish River Island II systems
+# i.e. E660 + EG20T
+
+include conf/machine/include/tune-atom.inc
+
+MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
+ acpi serial usbgadget wifi 3g"
+
+KERNEL_IMAGETYPE = "bzImage"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "3.0%"
+
+PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
+PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
+XSERVER ?= "xserver-xf86-dri-lite \
+ xf86-input-mouse \
+ xf86-input-keyboard \
+ xf86-input-evdev \
+ xf86-input-synaptics \
+ xf86-video-vesa"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
+
+IMAGE_FSTYPES ?= "ext3 cpio.gz live"
+
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index a871529..4b81fab 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -24,7 +24,10 @@ XSERVER ?= "xserver-xf86-dri-lite \
xf86-input-keyboard \
xf86-input-evdev \
xf86-input-synaptics \
- xf86-video-vesa"
+ emgd-driver-bin"
+
+PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.3"
+PREFERRED_VERSION_emgd-driver-bin ?= "1.8"

SERIAL_CONSOLE = "115200 ttyS0"

diff --git a/meta-fri2/recipes-bsp/formfactor/formfactor/fri2-noemgd/machconfig b/meta-fri2/recipes-bsp/formfactor/formfactor/fri2-noemgd/machconfig
new file mode 100644
index 0000000..ffce012
--- /dev/null
+++ b/meta-fri2/recipes-bsp/formfactor/formfactor/fri2-noemgd/machconfig
@@ -0,0 +1,3 @@
+# Assume a USB mouse and keyboard are connected
+HAVE_TOUCHSCREEN=0
+HAVE_KEYBOARD=1
diff --git a/meta-fri2/recipes-core/tasks/task-core-tools.bbappend b/meta-fri2/recipes-core/tasks/task-core-tools.bbappend
index 5accb2e..aa50c91 100644
--- a/meta-fri2/recipes-core/tasks/task-core-tools.bbappend
+++ b/meta-fri2/recipes-core/tasks/task-core-tools.bbappend
@@ -1,2 +1,3 @@
RRECOMMENDS_task-core-tools-profile_append_fri2 = " systemtap"
+RRECOMMENDS_task-core-tools-profile_append_fri2-noemgd = " systemtap"

diff --git a/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2-noemgd/xorg.conf b/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2-noemgd/xorg.conf
new file mode 100644
index 0000000..da4fc3c
--- /dev/null
+++ b/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2-noemgd/xorg.conf
@@ -0,0 +1,26 @@
+Section "Device"
+ Identifier "Generic VESA"
+ Driver "vesa"
+EndSection
+
+Section "Monitor"
+ Identifier "Generic Monitor"
+ Option "DPMS"
+EndSection
+
+Section "Screen"
+ Identifier "Default Screen"
+ Device "Generic VESA"
+ Monitor "Generic Monitor"
+ DefaultDepth 24
+EndSection
+
+Section "ServerLayout"
+ Identifier "Default Layout"
+ Screen "Default Screen"
+EndSection
+
+Section "ServerFlags"
+ Option "DontZap" "0"
+ Option "AutoAddDevices" "False"
+EndSection
diff --git a/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf b/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf
index da4fc3c..fce58f8 100644
--- a/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf
+++ b/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf
@@ -1,23 +1,45 @@
-Section "Device"
- Identifier "Generic VESA"
- Driver "vesa"
-EndSection
+##
+## X Config options generated from CED
+## x11 conf skeleton
+## DriverVer=
+##

-Section "Monitor"
- Identifier "Generic Monitor"
- Option "DPMS"
+Section "Screen"
+ Identifier "Screen0"
+ Device "IntelEMGD-0"
+ Monitor "Monitor0"
+ SubSection "Display"
+ EndSubSection
EndSection

-Section "Screen"
- Identifier "Default Screen"
- Device "Generic VESA"
- Monitor "Generic Monitor"
- DefaultDepth 24
+# Primary (First/only) display
+Section "Device"
+ Identifier "IntelEMGD-0"
+ Driver "emgd"
+ VendorName "Intel(R) DEG"
+ BoardName "Embedded Graphics"
+ BusID "0:2:0"
+ Screen 0
+ Option "PcfVersion" "1792"
+ Option "ConfigId" "1"
+ Option "ALL/1/name" "e6xx"
+ Option "ALL/1/General/PortOrder" "40000"
+ Option "ALL/1/General/DisplayConfig" "1"
+ Option "ALL/1/General/DisplayDetect" "1"
+ Option "ALL/1/General/TuningWA" "1"
+ Option "ALL/1/Port/4/General/name" "lvds"
+ Option "ALL/1/Port/4/General/EdidAvail" "3"
+ Option "ALL/1/Port/4/General/EdidNotAvail" "1"
+ Option "ALL/1/Port/4/General/Rotation" "0"
+ Option "ALL/1/Port/4/General/Edid" "0"
EndSection

Section "ServerLayout"
Identifier "Default Layout"
- Screen "Default Screen"
+ Screen 0 "Screen0" 0 0
+ # InputDevice "Mouse0" "CorePointer"
+ # InputDevice "Keyboard0" "CoreKeyboard"
+ # InputDevice "DevInputMice" "SendCoreEvents"
EndSection

Section "ServerFlags"
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.0.bbappend
index 739e799..0719ded 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.0.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.0.bbappend
@@ -1,6 +1,15 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
COMPATIBLE_MACHINE_fri2 = "fri2"
KMACHINE_fri2 = "yocto/standard/fri2"
+KERNEL_FEATURES_append_fri2 += " cfg/smp.scc"
+
+COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
+KMACHINE_fri2-noemgd = "yocto/standard/fri2"
+KERNEL_FEATURES_append_fri2-noemgd += " cfg/smp.scc"
+
+SRCREV_machine_pn-linux-yocto_fri2 ?= "f1167dd736c4a4aea834b853d73c51f9863151b4"
+SRCREV_meta_pn-linux-yocto_fri2 ?= "5b535279e61197cb194bb2dfceb8b7a04128387c"

-SRCREV_machine_pn-linux-yocto_fri2 ?= "493b09ef2c7124f977421a40955750743a5293d3"
-SRCREV_meta_pn-linux-yocto_fri2 ?= "d588bdafc0d9b4d2386144b7d76a1d379e2d16c0"
+SRCREV_machine_pn-linux-yocto_fri2-noemgd ?= "f1167dd736c4a4aea834b853d73c51f9863151b4"
+SRCREV_meta_pn-linux-yocto_fri2-noemgd ?= "5b535279e61197cb194bb2dfceb8b7a04128387c"
--
1.7.0.4


[PATCH 04/10] meta-crownbay: xorg.conf changes

tom.zanussi@...
 

From: Tom Zanussi <tom.zanussi@intel.com>

Update to the ced-generated xorg.conf for 1.8.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
.../xserver-xf86-config/crownbay/xorg.conf | 3 ++-
.../xorg-xserver/xserver-xf86-config_0.1.bbappend | 1 +
2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay/xorg.conf b/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay/xorg.conf
index f78a538..fce58f8 100644
--- a/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay/xorg.conf
+++ b/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay/xorg.conf
@@ -26,11 +26,12 @@ Section "Device"
Option "ALL/1/General/PortOrder" "40000"
Option "ALL/1/General/DisplayConfig" "1"
Option "ALL/1/General/DisplayDetect" "1"
+ Option "ALL/1/General/TuningWA" "1"
Option "ALL/1/Port/4/General/name" "lvds"
Option "ALL/1/Port/4/General/EdidAvail" "3"
Option "ALL/1/Port/4/General/EdidNotAvail" "1"
Option "ALL/1/Port/4/General/Rotation" "0"
- Option "ALL/1/Port/4/General/Edid" "1"
+ Option "ALL/1/Port/4/General/Edid" "0"
EndSection

Section "ServerLayout"
diff --git a/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
index 4b8d0e6..1461431 100644
--- a/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
+++ b/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
@@ -1,3 +1,4 @@
THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"

+PR := "${PR}.1"
--
1.7.0.4


[PATCH 03/10] meta-crownbay: select emgd 1.8

tom.zanussi@...
 

From: Tom Zanussi <tom.zanussi@intel.com>

Change preferred version of emgd binaries to 1.8.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta-crownbay/conf/machine/crownbay.conf | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf
index 581b976..96dc784 100644
--- a/meta-crownbay/conf/machine/crownbay.conf
+++ b/meta-crownbay/conf/machine/crownbay.conf
@@ -28,7 +28,7 @@ XSERVER ?= "xserver-xf86-dri-lite \
xf86-video-vesa"

PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.3"
-PREFERRED_VERSION_emgd-driver-bin ?= "1.6"
+PREFERRED_VERSION_emgd-driver-bin ?= "1.8"

SERIAL_CONSOLE = "115200 ttyS0"

--
1.7.0.4


[PATCH 02/10] meta-crownbay: new recipe for emgd 1.8 driver binaries

tom.zanussi@...
 

From: Tom Zanussi <tom.zanussi@intel.com>

This adds a new recipe for the emgd 1.8 driver binaries.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
.../xorg-xserver/emgd-driver-bin_1.8.bb | 35 ++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
create mode 100644 meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin-1.8/.gitignore
create mode 100644 meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb

diff --git a/meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin-1.8/.gitignore b/meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin-1.8/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb b/meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb
new file mode 100644
index 0000000..8f309c9
--- /dev/null
+++ b/meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb
@@ -0,0 +1,35 @@
+SUMMARY = "EMGD 1.8 xserver binaries"
+DESCRIPTION = "EMGD 1.8 includes some userspace binaries that use non-free \
+licensing. Intel Open Source Technology Center unfortunately has no power \
+to change that, but tries to make their use as painless as possible. Please \
+see the README in meta-crownbay/ for instructions on the (simple) manual \
+steps necessary to make the necessary binaries available to this recipe. \
+Please do that before building an image."
+LICENSE = "Intel-binary-only"
+PR = "r0"
+
+LIC_FILES_CHKSUM = "file://${WORKDIR}/License.txt;md5=b54f01caaf8483b3cb60c0c40f2bf22d"
+
+FILESPATH = "${FILE_DIRNAME}/emgd-driver-bin-1.8"
+
+SRC_URI = "file://lib \
+ file://License.txt"
+
+FILES_${PN} += "${libdir}/dri ${libdir}/xorg/modules/drivers ${libdir}/*.so"
+FILES_${PN}-dbg += "${libdir}/xorg/modules/drivers/.debug ${libdir}/dri/.debug"
+
+S = "${WORKDIR}"
+
+do_install () {
+ install -d -m 0755 ${D}/${libdir}/dri
+ install -d -m 0755 ${D}/${libdir}/xorg/modules/drivers
+ install -m 0755 ${S}/lib/*.so.* ${D}${libdir}/
+ install -m 0755 ${S}/lib/dri/* ${D}${libdir}/dri/
+ install -m 0755 ${S}/lib/xorg/modules/drivers/* ${D}${libdir}/xorg/modules/drivers/
+
+ ln -sf libEGl.so.1 ${D}${libdir}/libEGl.so
+ ln -sf libGLES_CM.so.1 ${D}${libdir}/libGLES_CM.so
+ ln -sf libGLESv2.so.2 ${D}${libdir}/libGLESv2.so
+}
+
+LEAD_SONAME = "libEGL.so"
--
1.7.0.4


[PATCH 01/10] meta-crownbay: switch to linux-yocto 3.0 kernel

tom.zanussi@...
 

From: Tom Zanussi <tom.zanussi@intel.com>

Switch crownbay and crownbay-noemgd to the 3.0 kernel, lock it down,
and update kernel SRCREVs.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta-crownbay/conf/machine/crownbay-noemgd.conf | 2 ++
meta-crownbay/conf/machine/crownbay.conf | 2 ++
.../recipes-kernel/linux/linux-yocto_3.0.bbappend | 15 +++++++++++++++
3 files changed, 19 insertions(+), 0 deletions(-)
create mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend

diff --git a/meta-crownbay/conf/machine/crownbay-noemgd.conf b/meta-crownbay/conf/machine/crownbay-noemgd.conf
index 0219bd1..30c575a 100644
--- a/meta-crownbay/conf/machine/crownbay-noemgd.conf
+++ b/meta-crownbay/conf/machine/crownbay-noemgd.conf
@@ -12,6 +12,8 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
KERNEL_IMAGETYPE = "bzImage"

PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto = "3.0%"
+
PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf
index 323c8c1..581b976 100644
--- a/meta-crownbay/conf/machine/crownbay.conf
+++ b/meta-crownbay/conf/machine/crownbay.conf
@@ -12,6 +12,8 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
KERNEL_IMAGETYPE = "bzImage"

PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto = "3.0%"
+
PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend
new file mode 100644
index 0000000..c9aef72
--- /dev/null
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend
@@ -0,0 +1,15 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+COMPATIBLE_MACHINE_crownbay = "crownbay"
+KMACHINE_crownbay = "yocto/standard/crownbay"
+KERNEL_FEATURES_append_crownbay += " cfg/smp.scc"
+
+COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
+KMACHINE_crownbay-noemgd = "yocto/standard/crownbay"
+KERNEL_FEATURES_append_crownbay-noemgd += " cfg/smp.scc"
+
+SRCREV_machine_pn-linux-yocto_crownbay ?= "9a259cf4f6d404db2820642df755a295bbfb7fe7"
+SRCREV_meta_pn-linux-yocto_crownbay ?= "fe8eac15e144a35a716cd32c9d2b296ecd5202ac"
+
+SRCREV_machine_pn-linux-yocto_crownbay-noemgd ?= "9a259cf4f6d404db2820642df755a295bbfb7fe7"
+SRCREV_meta_pn-linux-yocto_crownbay-noemgd ?= "fe8eac15e144a35a716cd32c9d2b296ecd5202ac"
--
1.7.0.4


Re: Adding X to image

Chris Tapp
 

On 25 Aug 2011, at 20:36, Gary Thomas wrote:

On 2011-08-25 13:33, Chris Tapp wrote:
On 25 Aug 2011, at 20:15, Gary Thomas wrote:

On 2011-08-25 13:07, Chris Tapp wrote:
What do I need to add where to get 'X' in to my image?

I've built poky-image-base (under 4.0.1) and things like xinit have been built and are in the tmp/work tree.

What do I need to add so that xinit (and dependencies) are added to the image? Should I be building a different image?
Try core-image-sato - it has a full-up X [matchbox based] X desktop
Thanks Gary,

I can't find that one, bit I'm trying task-poky-x11-sato...
If you're not using the bleeding-edge-master, it might be named poky- image-sato

task-poky-x11-sato is just a collection of packages needed for X. It won't
build a final root file system.
Sure. I should have mentioned that I will add this to my project image ;-)

However, poky-image-sato sounds like it's worth a try first. Building...

Chris Tapp

opensource@keylevel.com
www.keylevel.com


Re: Adding X to image

Gary Thomas
 

On 2011-08-25 13:33, Chris Tapp wrote:
On 25 Aug 2011, at 20:15, Gary Thomas wrote:

On 2011-08-25 13:07, Chris Tapp wrote:
What do I need to add where to get 'X' in to my image?

I've built poky-image-base (under 4.0.1) and things like xinit have been built and are in the tmp/work tree.

What do I need to add so that xinit (and dependencies) are added to the image? Should I be building a different image?
Try core-image-sato - it has a full-up X [matchbox based] X desktop
Thanks Gary,

I can't find that one, bit I'm trying task-poky-x11-sato...
If you're not using the bleeding-edge-master, it might be named poky-image-sato

task-poky-x11-sato is just a collection of packages needed for X. It won't
build a final root file system.

--
------------------------------------------------------------
Gary Thomas | Consulting for the
MLB Associates | Embedded world
------------------------------------------------------------


Re: Adding X to image

Chris Tapp
 

On 25 Aug 2011, at 20:15, Gary Thomas wrote:

On 2011-08-25 13:07, Chris Tapp wrote:
What do I need to add where to get 'X' in to my image?

I've built poky-image-base (under 4.0.1) and things like xinit have been built and are in the tmp/work tree.

What do I need to add so that xinit (and dependencies) are added to the image? Should I be building a different image?
Try core-image-sato - it has a full-up X [matchbox based] X desktop
Thanks Gary,

I can't find that one, bit I'm trying task-poky-x11-sato...

Chris Tapp

opensource@keylevel.com
www.keylevel.com


Re: Adding X to image

Gary Thomas
 

On 2011-08-25 13:07, Chris Tapp wrote:
What do I need to add where to get 'X' in to my image?

I've built poky-image-base (under 4.0.1) and things like xinit have been built and are in the tmp/work tree.

What do I need to add so that xinit (and dependencies) are added to the image? Should I be building a different image?
Try core-image-sato - it has a full-up X [matchbox based] X desktop

--
------------------------------------------------------------
Gary Thomas | Consulting for the
MLB Associates | Embedded world
------------------------------------------------------------


Adding X to image

Chris Tapp
 

What do I need to add where to get 'X' in to my image?

I've built poky-image-base (under 4.0.1) and things like xinit have been built and are in the tmp/work tree.

What do I need to add so that xinit (and dependencies) are added to the image? Should I be building a different image?

Chris Tapp

opensource@keylevel.com
www.keylevel.com


[PATCH 1/1] [YOCTO #1396] Fix adt-installer for consistent naming for powerpc and add all arch template for installation

Zhang, Jessica
 

Signed-off-by: Jessica Zhang <jessica.zhang@intel.com>
---
.../installer/adt-installer/adt_installer.conf | 17 +++++++++++++++--
.../adt-installer/scripts/adt_installer_internal | 2 +-
.../installer/adt-installer/scripts/data_define | 2 +-
3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
index 0c93237..e31f9af 100644
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
@@ -27,7 +27,7 @@ YOCTOADT_REPO="http://adtrepo.yoctoproject.org/$YOCTOADT_VERSION"

# The following are for system wide setup
# Target architectures that you want to setup host cross dev environment for
-# valid values are: powerpc, mips, arm, x86, x86_64 with space separation between entries
+# valid values are: arm, x86, x86_64, powerpc, mips with space separation between entries
YOCTOADT_TARGETS="arm x86"
# Whether install qemu or not, valid entries are: Y/N
YOCTOADT_QEMU="Y"
@@ -40,7 +40,7 @@ YOCTOADT_NFS_UTIL="Y"

#The followings are for setting up specific target architecture
#YOCTOADT_ROOTFS_$arch is for specifying what root filesystem image files you want to download from the repository. The valid values to replace $arch are: arm, x86, x86_64, powerpc, mips. The valid image files are: minimal, minimal-dev, sato, sato-dev, sato-sdk,lsb, lsb-dev, lsb-sdk. If you want to download multiple images, the entries are space separated
-YOCTOADT_ROOTFS_arm="minimal sato-sdk"
+YOCTOADT_ROOTFS_arm="minimal"
#Specify which root filesystem file to use to extract as target sysroot. Please ensure the entry is in the list of downloaded root filesystem files that specified above in YOCTOADT_ROOTFS_$arch
YOCTOADT_TARGET_SYSROOT_IMAGE_arm="minimal"
#The location where the target sysroot will be setup
@@ -50,3 +50,16 @@ YOCTOADT_TARGET_SYSROOT_LOC_arm="$HOME/test-yocto/arm"
#YOCTOADT_ROOTFS_x86="sato-sdk"
#YOCTOADT_TARGET_SYSROOT_IMAGE_x86="sato-sdk"
#YOCTOADT_TARGET_SYSROOT_LOC_x86="$HOME/test-yocto/x86"
+
+#Here's some template of other arches, which you need to change the value in ""
+#YOCTOADT_TARGET_SYSROOT_IMAGE_x86_64=""
+#YOCTOADT_TARGET_SYSROOT_LOC_x86_64=""
+#YOCTOADT_ROOTFS_x86_64=""
+
+#YOCTOADT_TARGET_SYSROOT_IMAGE_powerpc=""
+#YOCTOADT_TARGET_SYSROOT_LOC_powerpc=""
+#YOCTOADT_ROOTFS_powerpc=""
+
+#YOCTOADT_TARGET_SYSROOT_IMAGE_mips=""
+#YOCTOADT_TARGET_SYSROOT_LOC_mips=""
+#YOCTOADT_ROOTFS_mips=""
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
index 870931e..c7de0e2 100755
--- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
@@ -105,7 +105,7 @@ $OPKG_INSTALL_NATIVE_CMD libtool-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE
check_result

for native_target_type in $YOCTOADT_TARGETS; do
- native_target_type=`echo "$native_target_type" | sed -e 's/x86_64/x86-64/' -e 's/ppc/powerpc/' -e 's/x86$/i586/'`
+ native_target_type=`echo "$native_target_type" | sed -e 's/x86_64/x86-64/' -e 's/x86$/i586/'`
echo_info "Installing cross toolchain for $native_target_type ..."
echo_info "Installing binutils for $native_target_type ..."
$OPKG_INSTALL_NATIVE_CMD binutils-cross-canadian-$native_target_type &>> $YOCTOADT_INSTALL_LOG_FILE
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/data_define b/meta/recipes-devtools/installer/adt-installer/scripts/data_define
index 2781e77..1de21d7 100644
--- a/meta/recipes-devtools/installer/adt-installer/scripts/data_define
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/data_define
@@ -32,7 +32,7 @@ OPKG_LIBDIR="/var/lib"
# List all supported root fs types and target types,
# it will be used in user configuration validity checking
YOCTOADT_SUPPORTED_ROOTFS="minimal minimal-dev sato sato-dev sato-sdk lsb lsb-dev lsb-sdk"
-YOCTOADT_SUPPORTED_TARGETS="x86 x86_64 arm ppc mips"
+YOCTOADT_SUPPORTED_TARGETS="x86 x86_64 arm powerpc mips"
# Different host (32 bit or 64 bit) will have different opkg
# configuration files
YOCTOADT_OPKG_CONF_FILE_32="./opkg/conf/opkg-sdk-i686.conf"
--
1.7.0.4


[PATCH 0/1] [YOCTO #1396] Fix adt-installer for consistent naming for powerpc and add all arch template for installation

Zhang, Jessica
 

The following changes since commit 1759d6dac3fe4022183f73898c035322c3f49865:
Jessica Zhang (1):
Merge branch 'master' of ssh://git.yoctoproject.org/poky

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib jzhang/1396
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jzhang/1396

Jessica Zhang (1):
[YOCTO #1396] Fix adt-installer for consistent naming for powerpc and
add all arch template for installation

.../installer/adt-installer/adt_installer.conf | 17 +++++++++++++++--
.../adt-installer/scripts/adt_installer_internal | 2 +-
.../installer/adt-installer/scripts/data_define | 2 +-
3 files changed, 17 insertions(+), 4 deletions(-)


[PATCH 1/1] poky.conf: perform network sanity check by default for poky distros

Joshua Lock <josh@...>
 

Add CONNECTIVITY_CHECK_URIS to run the network connectivity sanity test for
http, https and git sources.

The variable is soft-assigned so that it's easily overrideable.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
meta-yocto/conf/distro/poky.conf | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index c5fc3b9..46b22f4 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -54,5 +54,10 @@ ftp://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \
http://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \
https://.*/.* http://autobuilder.yoctoproject.org/sources/ \n"

-
+# The CONNECTIVITY_CHECK_URI's are used to test whether we can succesfully
+# fetch from the network (and warn you if not). To disable the test set
+# the variable to be empty.
+CONNECTIVITY_CHECK_URIS ?= "git://git.yoctoproject.org/yocto-firewall-test;protocol=git;rev=HEAD \
+ https://eula-downloads.yoctoproject.org/index.php \
+ http://bugzilla.yoctoproject.org/report.cgi"

--
1.7.6


[PATCH 0/1] Enable network sanity checks for Poky derived distros

Joshua Lock <josh@...>
 

With recent enhancements to the network sanity check we can now enable this
for Poky derived distributions without significant impact to the user.

The following changes since commit 6c2b7beac3cd23ed44bd3e195c6360a0932876bf:

classes/sanity: enhance the network connectivity test (2011-08-25 08:51:30 -0700)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib josh/connection-test
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=josh/connection-test

Joshua Lock (1):
poky.conf: perform network sanity check by default for poky distros

meta-yocto/conf/distro/poky.conf | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)

--
1.7.6


[PATCH RESEND v2 1/1] scripts/runqemu: disable unfs boot mode for qemuppc

Liming Wang <liming.wang@...>
 

Because unfs boot mode is unstable for qemuppc, disable
it temporarily.

Signed-off-by: Liming Wang <liming.wang@windriver.com>
---
scripts/runqemu | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/scripts/runqemu b/scripts/runqemu
index ed8c05b..f6cc6f4 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -351,6 +351,12 @@ if [ -z "$FSTYPE" ]; then
usage
fi
fi
+
+if [ "$FSTYPE" = "nfs" -a "$MACHINE" = "qemuppc" ]; then
+ echo "Error: usermode NFS boot is not available for qemuppc."
+ exit 1
+fi
+
# FSTYPE is now set for all cases

# Handle cases where a ROOTFS type is given instead of a filename, e.g.
--
1.7.0.4


[PATCH RESEND v2 0/1] scripts/runqemu: disable unfs boot mode for qemuppc

Liming Wang <liming.wang@...>
 

It's a workaround to fix yocto bug:
[Bug 414][PPC] kernel panic when booting poky-image-sdk-qemuppc through UNFS

Liming Wang (1):
scripts/runqemu: disable unfs boot mode for qemuppc

scripts/runqemu | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)


Re: [PATCH 1/1] scripts/runqemu: disable unfs boot mode for qemuppc

Bruce Ashfield <bruce.ashfield@...>
 

On 11-08-25 04:44 AM, Liming Wang wrote:
Because unfs boot mode is unstable for qemuppc, disable
it temporarily.

Signed-off-by: Liming Wang<liming.wang@windriver.com>
---
scripts/runqemu | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/scripts/runqemu b/scripts/runqemu
index ed8c05b..10da6c9 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -351,6 +351,12 @@ if [ -z "$FSTYPE" ]; then
usage
fi
fi
+
+if [ "$FSTYPE" = "nfs" -a "$MACHINE" = "qemuppc" ]; then
+ echo "Error: NFS boot mode is unstable for qemuppc, please don't use it now"
We can drop the last part.

"Error: usermode NFS boot is not available for qemuppc."

... or something similar is sufficient.

On the v2, make sure to cc' Saul just to be sure that this
doesn't miss any filters.

Cheers,

Bruce

+ exit 1
+fi
+
# FSTYPE is now set for all cases

# Handle cases where a ROOTFS type is given instead of a filename, e.g.


Re: [PATCH 0/1] mips/rt: convert cascade interrupt to no threaded

Bruce Ashfield <bruce.ashfield@...>
 

On 11-08-25 03:55 AM, Liming Wang wrote:
This patch fixes yocto bug:
[Bug 1392] qemumips: linux-yocto-rt_3.0 panics at boot
Ack'd. I do recall a similar fix for mips back in the
2.6.27 days. Both for this and the timer interrupt.

Will merge this shortly.

Bruce



Liming Wang (1):
mips/rt: convert cascade interrupt to no threaded

arch/mips/kernel/i8259.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)


[PATCH 1/1] scripts/runqemu: disable unfs boot mode for qemuppc

Liming Wang <liming.wang@...>
 

Because unfs boot mode is unstable for qemuppc, disable
it temporarily.

Signed-off-by: Liming Wang <liming.wang@windriver.com>
---
scripts/runqemu | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/scripts/runqemu b/scripts/runqemu
index ed8c05b..10da6c9 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -351,6 +351,12 @@ if [ -z "$FSTYPE" ]; then
usage
fi
fi
+
+if [ "$FSTYPE" = "nfs" -a "$MACHINE" = "qemuppc" ]; then
+ echo "Error: NFS boot mode is unstable for qemuppc, please don't use it now"
+ exit 1
+fi
+
# FSTYPE is now set for all cases

# Handle cases where a ROOTFS type is given instead of a filename, e.g.
--
1.7.0.4


[PATCH 0/1] scripts/runqemu: disable unfs boot mode for qemuppc

Liming Wang <liming.wang@...>
 

It's a workaround to fix yocto bug:
[Bug 414][PPC] kernel panic when booting poky-image-sdk-qemuppc through UNFS

Liming Wang (1):
scripts/runqemu: disable unfs boot mode for qemuppc

scripts/runqemu | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)