[PATCH 00/37] V2 - Consolidated Pull Request

[PATCH 00/37] V2 - Consolidated Pull Request

[Saul Wold]

From: Saul Wold <sgw@linux.intel.com>

Richard,

Please pull this request, based on some cleanups and
additional changes.  This has been built on multiple 
machines.

Sau!

Pull URL: git://git.openembedded.org/openembedded-core-contrib
  Branch: sgw/stage
  Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage

Thanks,
    Saul Wold <sgw@linux.intel.com>
---


Dexuan Cui (9):
  libxfixes: upgrade from 4.0.5 to the latest version 5.0
  util-macros: upgrade from 1.11.0 to 1.13.0
  preferred-xorg-versions.inc: update libxfixes, util-macros,
    xorg-cf-files
  mdadm: upgrade from 3.1.4 to the latest version 3.2.1
  liburcu: upgrade from 0.5.2 to 0.5.4
  lttng-ust: upgrade from 0.11 to the latest version 0.12
  task-poky-tools.bb, task-sdk-gmae.inc: enable lttng-ust for ARM
  lttng-viewer: upgrade from 0.12.36 to the latest version 0.12.38
  distro_tracking_fields.inc: update the info for the following recipes

Gary Thomas (1):
  Control over when package init scripts are run

Kang Kai (1):
  lsbsetup: add some workaround for LSB tests

Khem Raj (1):
  pcmciautils: Upgrade 017 -> 018

Koen Kooi (1):
  librsvg 2.32.1: fix postinst script

Martin Jansa (3):
  gconf-dbus: add SRCREV to recipe
  xf86-video-omapfb: add SRCREV to recipe
  task-base: allow distribution to define apm provider

Nitin A Kamble (8):
  mpfr: upgrade from 3.0.0 to 3.0.1
  python-gst: upgrade from 0.10.19 to 0.10.21
  git: upgrade from 1.7.3.4 to 1.7.4.3
  python-pycairo: fix installation path of __init__.py
  perl-5.12.2: use of PERLHOSTLIB var fix
  cpan.bbclass: export PERLHOSTLIB for perl modules
  libxml-parser-perl: upgrade from 2.36 to 2.40
  distro_tracking: recipe information update

Petr Štetiar (1):
  modutils-initscripts: fix wrong order of module loading happening in
    udev

Saul Wold (4):
  slang: Fix host contamination issue
  qemu: disable sdl for target build
  ofono: add bluez4 to DEPENDS list
  qemu-helper-nativesdk: Update LIC_FILE_CHKSUM for renamed helper

Tom Zanussi (1):
  linux-tools.inc: turn off newt and dwarf for perf

Xiaofeng Yan (1):
  create-lsb-image:Rename creat-lsb-image and fix some bugs

Zhai Edwin (6):
  tasks: Upgrade to 0.19 (from 0.18)
  avahi: Upgrade to 0.6.30 (from 0.6.28)
  consolekit: Upgrade to 0.4.4 (from 0.4.3)
  libgpg-error: Upgrade to 1.10 (from 1.9)
  jpeg: Upgrade to 8c (from 8b)
  puzzles: Upgrade to svn r9151 (from r9084)

 meta/classes/cpan.bbclass                          |    1 +
 meta/classes/rootfs_rpm.bbclass                    |   11 +-
 .../conf/distro/include/distro_tracking_fields.inc |   72 ++++---
 .../distro/include/preferred-xorg-versions.inc     |    8 +-
 .../pcmciautils-017/version_workaround.patch       |   16 --
 .../makefile_fix.patch                             |   24 +-
 meta/recipes-bsp/pcmciautils/pcmciautils.inc       |    1 +
 meta/recipes-bsp/pcmciautils/pcmciautils_017.bb    |   12 -
 meta/recipes-bsp/pcmciautils/pcmciautils_018.bb    |   11 +
 meta/recipes-connectivity/avahi/avahi.inc          |    2 +-
 .../avahi/{avahi_0.6.28.bb => avahi_0.6.30.bb}     |    6 +-
 .../avahi/files/initscript.patch                   |    2 +
 meta/recipes-connectivity/ofono/ofono.inc          |    2 +-
 .../{jpeg-8b => jpeg-8c}/debian-libjpeg7_7-1.diff  |    4 +
 meta/recipes-core/jpeg/{jpeg_8b.bb => jpeg_8c.bb}  |    8 +-
 meta/recipes-core/tasks/task-base.bb               |    5 +-
 meta/recipes-core/tasks/task-core-tools.bb         |    8 +-
 meta/recipes-devtools/git/files/autotools.patch    |    2 +
 .../git/{git_1.7.3.4.bb => git_1.7.4.3.bb}         |    4 +-
 meta/recipes-devtools/opkg/opkg.inc                |    4 +
 meta/recipes-devtools/opkg/opkg_0.1.8.bb           |   13 +-
 meta/recipes-devtools/opkg/opkg_svn.bb             |   13 +-
 .../libperl-5.8.3-create-libperl-soname.patch      |   11 -
 ...e_2.36.bb => libxml-parser-perl-native_2.40.bb} |    0
 ...ser-perl_2.36.bb => libxml-parser-perl_2.40.bb} |    8 +-
 .../perl/perl-5.12.2/09_fix_installperl.patch      |    2 +
 .../Configure-multilib.patch                       |    2 +
 .../perl/perl-5.12.2/Makefile.SH.patch             |    2 +
 .../perl/perl-5.12.2/Makefile.patch                |    2 +
 .../perl/perl-5.12.2/asm-pageh-fix.patch           |    2 +
 .../perl/perl-5.12.2/cross-generate_uudmap.patch   |    2 +
 .../perl/perl-5.12.2/debian/arm_optim.diff         |    2 +
 .../debian/arm_thread_stress_timeout.diff          |    2 +
 .../perl/perl-5.12.2/debian/cpan_config_path.diff  |    2 +
 .../perl-5.12.2/debian/cpan_definstalldirs.diff    |    2 +
 .../perl-5.12.2/debian/cpanplus_config_path.diff   |    2 +
 .../debian/cpanplus_definstalldirs.diff            |    2 +
 .../perl/perl-5.12.2/debian/db_file_ver.diff       |    2 +
 .../perl-5.12.2/debian/deprecate-with-apt.diff     |    2 +
 .../debian/devel-ppport-ia64-optim.diff            |    2 +
 .../perl-5.12.2/debian/disable-zlib-bundling.diff  |    2 +
 .../perl/perl-5.12.2/debian/doc_info.diff          |    2 +
 .../perl/perl-5.12.2/debian/enc2xs_inc.diff        |    2 +
 .../perl/perl-5.12.2/debian/errno_ver.diff         |    2 +
 .../perl/perl-5.12.2/debian/extutils_hacks.diff    |    2 +
 .../perl/perl-5.12.2/debian/fakeroot.diff          |    2 +
 .../perl-5.12.2/debian/fixes/autodie-flock.diff    |    2 +
 .../debian/fixes/concat-stack-corruption.diff      |    2 +
 .../debian/fixes/cpanplus-without-home.diff        |    2 +
 .../perl-5.12.2/debian/fixes/h2ph-gcc-4.5.diff     |    2 +
 .../perl-5.12.2/debian/fixes/hurd-ccflags.diff     |    2 +
 .../perl-5.12.2/debian/fixes/lc-numeric-docs.diff  |    2 +
 .../debian/fixes/lc-numeric-sprintf.diff           |    2 +
 .../perl-5.12.2/debian/fixes/net_smtp_docs.diff    |    2 +
 .../perl/perl-5.12.2/debian/fixes/processPL.diff   |    2 +
 .../perl/perl-5.12.2/debian/instmodsh_doc.diff     |    2 +
 .../perl/perl-5.12.2/debian/ld_run_path.diff       |    2 +
 .../perl-5.12.2/debian/libnet_config_path.diff     |    2 +
 .../perl-5.12.2/debian/m68k_thread_stress.diff     |    2 +
 .../perl/perl-5.12.2/debian/mod_paths.diff         |    2 +
 .../debian/module_build_man_extensions.diff        |    2 +
 .../perl/perl-5.12.2/debian/perlivp.diff           |    2 +
 .../perl/perl-5.12.2/debian/prune_libs.diff        |    2 +
 .../debian/squelch-locale-warnings.diff            |    2 +
 .../perl/perl-5.12.2/generate-sh.patch             |    2 +
 .../perl/perl-5.12.2/installperl.patch             |    2 +
 .../{files => perl-5.12.2}/letgcc-find-errno.patch |    2 +
 .../perl/perl-5.12.2/native-nopacklist.patch       |    2 +
 .../perl/perl-5.12.2/native-perlinc.patch          |    2 +
 .../perl/perl-5.12.2/native-ssp.patch              |    2 +
 .../perl/perl-5.12.2/parallel_build_fix_1.patch    |    2 +
 .../perl/perl-5.12.2/parallel_build_fix_2.patch    |    2 +
 .../perl/perl-5.12.2/parallel_build_fix_3.patch    |    2 +
 .../perl/perl-5.12.2/parallel_build_fix_4.patch    |    2 +
 .../perl/perl-5.12.2/parallel_build_fix_5.patch    |    2 +
 .../perl/perl-5.12.2/parallel_build_fix_6.patch    |    2 +
 .../perl/perl-5.12.2/perl-configpm-switch.patch    |    2 +
 .../perl/perl-5.12.2/perl-dynloader.patch          |   12 +-
 .../perl/perl-5.12.2/perl-enable-gdbm.patch        |    2 +
 .../perl/perl-5.12.2/perl-moreconfig.patch         |    2 +
 meta/recipes-devtools/perl/perl_5.12.2.bb          |    2 +-
 .../python/python-gst/python-path.patch            |    2 +
 ...python-gst_0.10.19.bb => python-gst_0.10.21.bb} |    6 +-
 .../python/python-pycairo_1.8.10.bb                |    8 +-
 .../qemu/qemu-helper-nativesdk_1.0.bb              |    2 +-
 meta/recipes-devtools/qemu/qemu.inc                |    8 +-
 meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh    |   15 ++-
 meta/recipes-extended/lsb/lsbsetup_0.9.bb          |    8 +-
 meta/recipes-extended/mdadm/files/fix-z-now.patch  |   15 --
 .../mdadm/{mdadm_3.1.4.bb => mdadm_3.2.1.bb}       |    9 +-
 meta/recipes-extended/slang/slang_2.2.4.bb         |    3 +-
 meta/recipes-gnome/gnome/gconf-dbus_svn.bb         |    1 +
 meta/recipes-gnome/librsvg/librsvg_2.32.1.bb       |   10 +-
 meta/recipes-gnome/tasks/task-core-sdk-gmae.bb     |    4 +-
 .../tasks/task-core-standalone-gmae-sdk-target.bb  |    4 +-
 meta/recipes-gnome/tasks/task-sdk-gmae.inc         |    1 +
 .../xorg-driver/xf86-video-omapfb_git.bb           |    1 +
 .../{libxfixes_4.0.5.bb => libxfixes_5.0.bb}       |    4 +-
 .../xorg-util/util-macros/xaw.patch                |   14 --
 ...util-macros_1.11.0.bb => util-macros_1.13.0.bb} |    4 +-
 meta/recipes-kernel/linux/linux-tools.inc          |    4 +-
 ...remove_ppc_specific_time_reading_function.patch |   85 --------
 meta/recipes-kernel/lttng/lttng-ust_0.11.bb        |   32 ---
 meta/recipes-kernel/lttng/lttng-ust_0.12.bb        |   28 +++
 ...g-viewer_0.12.36.bb => lttng-viewer_0.12.38.bb} |    6 +-
 .../modutils/modutils-initscripts.bb               |    4 +-
 meta/recipes-sato/pimlico/tasks/tasks-owl.diff     |    5 +
 .../pimlico/{tasks_0.18.bb => tasks_0.19.bb}       |    4 +-
 .../puzzles/files/oh-puzzles-owl-menu.patch        |    5 +
 .../puzzles/{puzzles_r9084.bb => puzzles_r9151.bb} |    2 +-
 .../{consolekit_0.4.3.bb => consolekit_0.4.4.bb}   |   10 +-
 .../consolekit/files/nopolkit.patch                |    2 +
 .../pkgconfig.patch                                |    2 +
 .../{libgpg-error_1.9.bb => libgpg-error_1.10.bb}  |    6 +-
 .../liburcu/{liburcu_0.5.2.bb => liburcu_0.5.4.bb} |   11 +-
 .../mpfr/{mpfr_3.0.0.bb => mpfr_3.0.1.bb}          |    4 +-
 scripts/creat-lsb-image                            |  198 -----------------
 scripts/create-lsb-image                           |  228 ++++++++++++++++++++
 118 files changed, 594 insertions(+), 531 deletions(-)
 delete mode 100644 meta/recipes-bsp/pcmciautils/pcmciautils-017/version_workaround.patch
 rename meta/recipes-bsp/pcmciautils/{pcmciautils-017 => pcmciautils-018}/makefile_fix.patch (89%)
 delete mode 100644 meta/recipes-bsp/pcmciautils/pcmciautils_017.bb
 create mode 100644 meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
 rename meta/recipes-connectivity/avahi/{avahi_0.6.28.bb => avahi_0.6.30.bb} (82%)
 rename meta/recipes-core/jpeg/{jpeg-8b => jpeg-8c}/debian-libjpeg7_7-1.diff (98%)
 rename meta/recipes-core/jpeg/{jpeg_8b.bb => jpeg_8c.bb} (85%)
 rename meta/recipes-devtools/git/{git_1.7.3.4.bb => git_1.7.4.3.bb} (59%)
 delete mode 100644 meta/recipes-devtools/perl/files/libperl-5.8.3-create-libperl-soname.patch
 rename meta/recipes-devtools/perl/{libxml-parser-perl-native_2.36.bb => libxml-parser-perl-native_2.40.bb} (100%)
 rename meta/recipes-devtools/perl/{libxml-parser-perl_2.36.bb => libxml-parser-perl_2.40.bb} (61%)
 rename meta/recipes-devtools/perl/{files => perl-5.12.2}/Configure-multilib.patch (96%)
 rename meta/recipes-devtools/perl/{files => perl-5.12.2}/letgcc-find-errno.patch (96%)
 rename meta/recipes-devtools/python/{python-gst_0.10.19.bb => python-gst_0.10.21.bb} (82%)
 delete mode 100644 meta/recipes-extended/mdadm/files/fix-z-now.patch
 rename meta/recipes-extended/mdadm/{mdadm_3.1.4.bb => mdadm_3.2.1.bb} (78%)
 rename meta/recipes-graphics/xorg-lib/{libxfixes_4.0.5.bb => libxfixes_5.0.bb} (79%)
 delete mode 100644 meta/recipes-graphics/xorg-util/util-macros/xaw.patch
 rename meta/recipes-graphics/xorg-util/{util-macros_1.11.0.bb => util-macros_1.13.0.bb} (79%)
 delete mode 100644 meta/recipes-kernel/lttng/lttng-ust-0.11/remove_ppc_specific_time_reading_function.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-ust_0.11.bb
 create mode 100644 meta/recipes-kernel/lttng/lttng-ust_0.12.bb
 rename meta/recipes-kernel/lttng/{lttng-viewer_0.12.36.bb => lttng-viewer_0.12.38.bb} (85%)
 rename meta/recipes-sato/pimlico/{tasks_0.18.bb => tasks_0.19.bb} (78%)
 rename meta/recipes-sato/puzzles/{puzzles_r9084.bb => puzzles_r9151.bb} (94%)
 rename meta/recipes-support/consolekit/{consolekit_0.4.3.bb => consolekit_0.4.4.bb} (75%)
 rename meta/recipes-support/libgpg-error/{libgpg-error-1.9 => libgpg-error-1.10}/pkgconfig.patch (98%)
 rename meta/recipes-support/libgpg-error/{libgpg-error_1.9.bb => libgpg-error_1.10.bb} (82%)
 rename meta/recipes-support/liburcu/{liburcu_0.5.2.bb => liburcu_0.5.4.bb} (61%)
 rename meta/recipes-support/mpfr/{mpfr_3.0.0.bb => mpfr_3.0.1.bb} (70%)
 delete mode 100755 scripts/creat-lsb-image
 create mode 100755 scripts/create-lsb-image

[PATCH 01/37] slang: Fix host contamination issue

[Saul Wold]

From: Saul Wold <sgw@linux.intel.com>

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/slang/slang_2.2.4.bb |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-extended/slang/slang_2.2.4.bb b/meta/recipes-extended/slang/slang_2.2.4.bb
index 2b000a4..4257b05 100644
--- a/meta/recipes-extended/slang/slang_2.2.4.bb
+++ b/meta/recipes-extended/slang/slang_2.2.4.bb
@@ -24,7 +24,8 @@ inherit autotools
 SRC_URI[md5sum] = "7fcfd447e378f07dd0c0bae671fe6487"
 SRC_URI[sha256sum] = "9a8257a9a2a55099af858b13338dc8f3a06dd2069f46f0df2c9c3bb84a01d5db"
 
-EXTRA_OECONF += " --without-png"
+EXTRA_OECONF += " --without-z --without-png --x-includes=${STAGING_DIR_HOST}/usr/include/X11 --x-libraries=${STAGING_DIR_HOST}/usr/lib"
+
 do_install() {
 	oe_runmake install DESTDIR=${D} -e 'INST_LIB_DIR=${STAGING_DIR_HOST}/usr/lib'
 }
-- 
1.7.1.1

[PATCH 02/37] tasks: Upgrade to 0.19 (from 0.18)

[Saul Wold]

From: Zhai Edwin <edwin.zhai@intel.com>

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
 meta/recipes-sato/pimlico/tasks/tasks-owl.diff     |    5 +++++
 .../pimlico/{tasks_0.18.bb => tasks_0.19.bb}       |    4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 rename meta/recipes-sato/pimlico/{tasks_0.18.bb => tasks_0.19.bb} (78%)

diff --git a/meta/recipes-sato/pimlico/tasks/tasks-owl.diff b/meta/recipes-sato/pimlico/tasks/tasks-owl.diff
index e407806..aab23ff 100644
--- a/meta/recipes-sato/pimlico/tasks/tasks-owl.diff
+++ b/meta/recipes-sato/pimlico/tasks/tasks-owl.diff
@@ -1,3 +1,8 @@
+This patch enable owl menu, which is hidden in the title bar to save space on
+small screen. It has not been used for a long time, rebase needed.
+
+Upstream-Status: Inappropriate [enable feature]
+
 Index: src/gtk/tasks-ui.xml
 ===================================================================
 --- src/gtk/tasks-ui.xml	(revision 338)
diff --git a/meta/recipes-sato/pimlico/tasks_0.18.bb b/meta/recipes-sato/pimlico/tasks_0.19.bb
similarity index 78%
rename from meta/recipes-sato/pimlico/tasks_0.18.bb
rename to meta/recipes-sato/pimlico/tasks_0.19.bb
index fd7edb3..8326643 100644
--- a/meta/recipes-sato/pimlico/tasks_0.18.bb
+++ b/meta/recipes-sato/pimlico/tasks_0.19.bb
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 
 SRC_URI = "http://pimlico-project.org/sources/${BPN}/${BPN}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "d40c0227e496b51be6fde10f387215ed"
-SRC_URI[sha256sum] = "08802003da2517c6e0b2defd66bcaf466edd0ce7188373f564d629af6b93cc91"
+SRC_URI[md5sum] = "0afd969758561599fd782e1effb39c08"
+SRC_URI[sha256sum] = "1a7fdc5f95a2193a1a25fdb13f071867fb7e42245ce19ccee4bcccb69e557f2e"
 
 OWL_poky = "--with-owl"
 
-- 
1.7.1.1

[PATCH 03/37] avahi: Upgrade to 0.6.30 (from 0.6.28)

[Saul Wold]

From: Zhai Edwin <edwin.zhai@intel.com>

This upgrade fix the one security issue:
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-1002
[YOCTO #975] fixed.

This should be included in the Bernard point-release.

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
 meta/recipes-connectivity/avahi/avahi.inc          |    2 +-
 .../avahi/{avahi_0.6.28.bb => avahi_0.6.30.bb}     |    6 +++---
 .../avahi/files/initscript.patch                   |    2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)
 rename meta/recipes-connectivity/avahi/{avahi_0.6.28.bb => avahi_0.6.30.bb} (82%)

diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 6d4b830..b2fa8ca 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -24,7 +24,7 @@ RRECOMMENDS_${PN}_append_libc-glibc = "libnss-mdns"
 SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
         file://00avahi-autoipd \
         file://99avahi-autoipd \
-        file://initscript.patch;patch=1"
+        file://initscript.patch"
 
 inherit autotools pkgconfig update-rc.d gettext
 
diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.28.bb b/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
similarity index 82%
rename from meta/recipes-connectivity/avahi/avahi_0.6.28.bb
rename to meta/recipes-connectivity/avahi/avahi_0.6.30.bb
index 6e034b0..1084c04 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.6.28.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
                     file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf"
 
 RDEPENDS_avahi-daemon = "sysvinit-pidof"
-PR = "r2"
+PR = "r0"
 
 EXTRA_OECONF += "--disable-gtk3"
 
@@ -15,5 +15,5 @@ FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \
                        ${sysconfdir}/avahi/avahi-autoipd.action \
 		       ${sysconfdir}/dhcp3/*/avahi-autoipd"
 
-SRC_URI[md5sum] = "d0143a5aa3265019072e53ab497818d0"
-SRC_URI[sha256sum] = "a0d80aac88212b9f9d5331c248091d3c9c9209f0e41985421636ebd14230fc91"
+SRC_URI[md5sum] = "e4db89a2a403ff4c47d66ac66fad1f43"
+SRC_URI[sha256sum] = "f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f"
diff --git a/meta/recipes-connectivity/avahi/files/initscript.patch b/meta/recipes-connectivity/avahi/files/initscript.patch
index f76a965..193889e 100644
--- a/meta/recipes-connectivity/avahi/files/initscript.patch
+++ b/meta/recipes-connectivity/avahi/files/initscript.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 diff --git a/initscript/debian/avahi-daemon.in b/initscript/debian/avahi-daemon.in
 index 30a2c2f..b5848a8 100755
 --- a/initscript/debian/avahi-daemon.in
-- 
1.7.1.1

[PATCH 04/37] consolekit: Upgrade to 0.4.4 (from 0.4.3)

[Saul Wold]

From: Zhai Edwin <edwin.zhai@intel.com>

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
 .../{consolekit_0.4.3.bb => consolekit_0.4.4.bb}   |   10 ++++++----
 .../consolekit/files/nopolkit.patch                |    2 ++
 2 files changed, 8 insertions(+), 4 deletions(-)
 rename meta/recipes-support/consolekit/{consolekit_0.4.3.bb => consolekit_0.4.4.bb} (75%)

diff --git a/meta/recipes-support/consolekit/consolekit_0.4.3.bb b/meta/recipes-support/consolekit/consolekit_0.4.4.bb
similarity index 75%
rename from meta/recipes-support/consolekit/consolekit_0.4.3.bb
rename to meta/recipes-support/consolekit/consolekit_0.4.4.bb
index 5bf4c52..0aec639 100644
--- a/meta/recipes-support/consolekit/consolekit_0.4.3.bb
+++ b/meta/recipes-support/consolekit/consolekit_0.4.4.bb
@@ -8,13 +8,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
 
 DEPENDS = "dbus"
 
+PR = "r0"
+
 inherit gnome
 
-SRC_URI = "http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-0.4.3.tar.bz2 \
-           file://nopolkit.patch;patch=1"
+SRC_URI = "http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-${PV}.tar.bz2 \
+           file://nopolkit.patch"
 
-SRC_URI[md5sum] = "4c39c6eacc75334b890f21eead1d2945"
-SRC_URI[sha256sum] = "fe02aca2b4c21df59aa5fbe6f28ea3ea4b3c9dd64c48c50634e9a53cf9c0dcc5"
+SRC_URI[md5sum] = "b57eb18eae8c4d3631d5f4f030218a29"
+SRC_URI[sha256sum] = "f0c00969fb6fe7d628071f0f43ac0d411982a5e798d7dc31747caa772c9716ae"
 S = "${WORKDIR}/ConsoleKit-${PV}"
 
 FILES_${PN} += "${libdir}/ConsoleKit ${datadir}/dbus-1 ${datadir}/PolicyKit"
diff --git a/meta/recipes-support/consolekit/files/nopolkit.patch b/meta/recipes-support/consolekit/files/nopolkit.patch
index 7a1f02a..a0d9d06 100644
--- a/meta/recipes-support/consolekit/files/nopolkit.patch
+++ b/meta/recipes-support/consolekit/files/nopolkit.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 Index: ConsoleKit-0.4.3/configure.ac
 ===================================================================
 --- ConsoleKit-0.4.3.orig/configure.ac	2010-10-26 22:34:03.000000000 +0800
-- 
1.7.1.1

[PATCH 05/37] libgpg-error: Upgrade to 1.10 (from 1.9)

[Saul Wold]

From: Zhai Edwin <edwin.zhai@intel.com>

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
 .../pkgconfig.patch                                |    2 ++
 .../{libgpg-error_1.9.bb => libgpg-error_1.10.bb}  |    6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)
 rename meta/recipes-support/libgpg-error/{libgpg-error-1.9 => libgpg-error-1.10}/pkgconfig.patch (98%)
 rename meta/recipes-support/libgpg-error/{libgpg-error_1.9.bb => libgpg-error_1.10.bb} (82%)

diff --git a/meta/recipes-support/libgpg-error/libgpg-error-1.9/pkgconfig.patch b/meta/recipes-support/libgpg-error/libgpg-error-1.10/pkgconfig.patch
similarity index 98%
rename from meta/recipes-support/libgpg-error/libgpg-error-1.9/pkgconfig.patch
rename to meta/recipes-support/libgpg-error/libgpg-error-1.10/pkgconfig.patch
index 49e47d8..2764012 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error-1.9/pkgconfig.patch
+++ b/meta/recipes-support/libgpg-error/libgpg-error-1.10/pkgconfig.patch
@@ -3,6 +3,8 @@
 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
 #
 
+Upstream-Status: Pending
+
 Index: libgpg-error-1.8/configure.ac
 ===================================================================
 --- libgpg-error-1.8.orig/configure.ac	2010-05-06 06:01:08.000000000 -0700
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.9.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.10.bb
similarity index 82%
rename from meta/recipes-support/libgpg-error/libgpg-error_1.9.bb
rename to meta/recipes-support/libgpg-error/libgpg-error_1.10.bb
index 560340b..6dea084 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.9.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.10.bb
@@ -13,10 +13,10 @@ SECTION = "libs"
 PR = "r0"
 
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \
-           file://pkgconfig.patch;"
+           file://pkgconfig.patch"
 
-SRC_URI[md5sum] = "521b98aa9395e7eaf0ef2236233a0796"
-SRC_URI[sha256sum] = "54d9326bfbd46c705963c507953f65a40576d04b374e131008dc5b732ff1e3c3"
+SRC_URI[md5sum] = "736a03daa9dc5873047d4eb4a9c22a16"
+SRC_URI[sha256sum] = "520629b4568b5c29b1991c8ffc267c8bdee5f223c7333c42a651b56f9b1c5431"
 
 # move libgpg-error-config into -dev package
 FILES_${PN} = "${libdir}/lib*.so.*"
-- 
1.7.1.1

[PATCH 06/37] jpeg: Upgrade to 8c (from 8b)

[Saul Wold]

From: Zhai Edwin <edwin.zhai@intel.com>

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
 .../{jpeg-8b => jpeg-8c}/debian-libjpeg7_7-1.diff  |    4 ++++
 meta/recipes-core/jpeg/{jpeg_8b.bb => jpeg_8c.bb}  |    8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)
 rename meta/recipes-core/jpeg/{jpeg-8b => jpeg-8c}/debian-libjpeg7_7-1.diff (98%)
 rename meta/recipes-core/jpeg/{jpeg_8b.bb => jpeg_8c.bb} (85%)

diff --git a/meta/recipes-core/jpeg/jpeg-8b/debian-libjpeg7_7-1.diff b/meta/recipes-core/jpeg/jpeg-8c/debian-libjpeg7_7-1.diff
similarity index 98%
rename from meta/recipes-core/jpeg/jpeg-8b/debian-libjpeg7_7-1.diff
rename to meta/recipes-core/jpeg/jpeg-8c/debian-libjpeg7_7-1.diff
index 2e4867a..3b8fa69 100755
--- a/meta/recipes-core/jpeg/jpeg-8b/debian-libjpeg7_7-1.diff
+++ b/meta/recipes-core/jpeg/jpeg-8c/debian-libjpeg7_7-1.diff
@@ -1,3 +1,7 @@
+This is a well-known debian patch used by many Linux distribution, but not
+accepted by upstream yet.
+Upstream-Status: Pending
+
 --- libjpeg7-7.orig/config.sub
 +++ libjpeg7-7/config.sub
 @@ -1,4 +1,10 @@
diff --git a/meta/recipes-core/jpeg/jpeg_8b.bb b/meta/recipes-core/jpeg/jpeg_8c.bb
similarity index 85%
rename from meta/recipes-core/jpeg/jpeg_8b.bb
rename to meta/recipes-core/jpeg/jpeg_8c.bb
index 93aa7be..ac00275 100644
--- a/meta/recipes-core/jpeg/jpeg_8b.bb
+++ b/meta/recipes-core/jpeg/jpeg_8c.bb
@@ -5,7 +5,7 @@ BUGTRACKER = ""
 
 LICENSE ="jpeg"
 LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=12;md5=78fa8dbac547bb5b2a0e6457a6cfe21d \
-                    file://jpeglib.h;endline=14;md5=dd06b5575519f735ec2565ed36ce62e7 \
+                    file://jpeglib.h;endline=14;md5=22f1e0f8fc71f6f7563146d3b210dbe5 \
                     file://djpeg.c;endline=13;md5=ca89254925da06fef47e4b6468233432"
 
 SECTION = "libs"
@@ -17,10 +17,10 @@ DEPENDS_virtclass-native = "libtool-native"
 PR = "r1"
 
 SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
-	   file://debian-libjpeg7_7-1.diff;patch=1"
+	   file://debian-libjpeg7_7-1.diff;"
 
-SRC_URI[md5sum] = "e022acbc5b36cd2cb70785f5b575661e"
-SRC_URI[sha256sum] = "36e6208edec591bae8f2fc370ea4f991447badb6377a125c211ffa7b503174a7"
+SRC_URI[md5sum] = "a2c10c04f396a9ce72894beb18b4e1f9"
+SRC_URI[sha256sum] = "edfc0b3e004b2fe58ffeeec89f96e3a3c28972c46725ec127d01edf8a1cc7c9a"
 
 inherit autotools 
 
-- 
1.7.1.1

[PATCH 07/37] modutils-initscripts: fix wrong order of module loading happening in udev

[Saul Wold]

From: =?UTF-8?q?Petr=20=C5=A0tetiar?= <ynezz@true.cz>

In the current state, udev init script is loaded as 3rd and modutils.sh as
20th, so udevadm called in udev init script loads all kernel modules in some
unpredictable order, not honoring in any way specified order of modules in
/etc/modules. This causes some troubles mainly in the first boot. So to fix
this we now move loading of the kernel modules just before we exec udev init
script. Example of the current state:

	Starting udev
	rtc-m48t86 rtc-m48t86: rtc core: registered m48t86 as rtc0
	rtc-m48t86 rtc-m48t86: battery ok
	ep93xx-rtc ep93xx-rtc: rtc core: registered ep93xx-rtc as rtc1

	root@ts72xx:~# cat /etc/modules
	rtc-ep93xx
	ohci-hcd
	ts72xx_sbcinfo
	rtc-m48t86

As you can guess, this is really wrong behaviour, because I've rtc1 as the
main time source for my system.

	root@ts72xx:~# cat /etc/default/hwclock
	HWCLOCKACCESS=yes
	HWCLOCKDEVICE=/dev/rtc1

Expected behaviour with this patch applied:

	Please wait: booting...
	ep93xx-rtc ep93xx-rtc: rtc core: registered ep93xx-rtc as rtc0
	usbcore: registered new device driver usb
	ohci_hcd: USB 1.1 'Open' Host Controller (OHCI) Driver
	...
	rtc-m48t86 rtc-m48t86: rtc core: registered m48t86 as rtc1
	rtc-m48t86 rtc-m48t86: battery ok
	Starting udev

Signed-off-by: Petr Štetiar <ynezz@true.cz>

(based on http://patches.openembedded.org/patch/1917/)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../modutils/modutils-initscripts.bb               |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-kernel/modutils/modutils-initscripts.bb b/meta/recipes-kernel/modutils/modutils-initscripts.bb
index 1665955..5ae34b4 100644
--- a/meta/recipes-kernel/modutils/modutils-initscripts.bb
+++ b/meta/recipes-kernel/modutils/modutils-initscripts.bb
@@ -4,10 +4,10 @@ LICENSE = "PD"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7bf87fc37976e93ec66ad84fac58c098"
 SRC_URI = "file://modutils.sh \
 	   file://PD.patch"
-PR = "r4"
+PR = "r5"
 
 INITSCRIPT_NAME = "modutils.sh"
-INITSCRIPT_PARAMS = "start 20 S ."
+INITSCRIPT_PARAMS = "start 2 S ."
 
 inherit update-rc.d
 
-- 
1.7.1.1

[PATCH 08/37] Control over when package init scripts are run

[Saul Wold]

From: Gary Thomas <gary@mlbassoc.com>

When a package is built, some installation scripts must be
performed on the target.  In the case of a complete image,
these scripts are run by a separate step at init time, but
only during the first boot (other package install scripts
can just be run when the package is installed on the target).

This patch lets the distribution (or user) decide when these
postponed install scripts should run.  The default is normally
near the end of init, but there may be times when it's beneficial
to run them earlier so the "when" can be overridden.

Signed-off-by: Gary Thomas <gary@mlbassoc.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/classes/rootfs_rpm.bbclass          |   11 ++++++++---
 meta/recipes-devtools/opkg/opkg.inc      |    4 ++++
 meta/recipes-devtools/opkg/opkg_0.1.8.bb |   13 ++++---------
 meta/recipes-devtools/opkg/opkg_svn.bb   |   13 ++++---------
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index aa1b339..3a11858 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -26,6 +26,11 @@ RPM_POSTPROCESS_COMMANDS = ""
 #
 #IMAGE_LOCALES="en-gb"
 
+# 
+# Allow distributions to alter when [postponed] package install scripts are run
+#
+POSTINSTALL_INITPOSITION ?= "98"
+
 rpmlibdir = "/var/lib/rpm"
 opkglibdir = "${localstatedir}/lib/opkg"
 
@@ -116,7 +121,7 @@ EOF
 	install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
 	# Stop $i getting expanded below...
 	i=\$i
-	cat > ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S98configure << EOF
+	cat > ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure << EOF
 #!/bin/sh
 for i in /etc/rpm-postinsts/*.sh; do
 	echo "Running postinst $i..."
@@ -127,9 +132,9 @@ for i in /etc/rpm-postinsts/*.sh; do
 		echo "ERROR: postinst $i failed."
 	fi
 done
-rm -f ${sysconfdir}/rcS.d/S98configure
+rm -f ${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure
 EOF
-	chmod 0755 ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S98configure
+	chmod 0755 ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure
 
 	install -d ${IMAGE_ROOTFS}/${sysconfdir}
 	echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version
diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
index c317491..50f1afc 100644
--- a/meta/recipes-devtools/opkg/opkg.inc
+++ b/meta/recipes-devtools/opkg/opkg.inc
@@ -34,3 +34,7 @@ BBCLASSEXTEND = "native nativesdk"
 
 PKGSUFFIX = ""
 PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
+
+# Define a variable to allow distros to run configure earlier.
+# (for example, to enable loading of ethernet kernel modules before networking starts)
+POSTINSTALL_INITPOSITION ?= "98"
diff --git a/meta/recipes-devtools/opkg/opkg_0.1.8.bb b/meta/recipes-devtools/opkg/opkg_0.1.8.bb
index 6815474..18cf042 100644
--- a/meta/recipes-devtools/opkg/opkg_0.1.8.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.1.8.bb
@@ -13,7 +13,7 @@ SRC_URI = "http://opkg.googlecode.com/files/opkg-${PV}.tar.gz \
            file://headerfix.patch \
 "
 
-PR = "r3"
+PR = "r4"
 
 PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}"
 
@@ -26,11 +26,6 @@ do_install_append() {
 	install -d ${D}${localstatedir}/lib/opkg
 }
 
-# Define a variable to allow distros to run configure earlier.
-# (for example, to enable loading of ethernet kernel modules before networking starts)
-OPKG_INIT_POSITION = "98"
-OPKG_INIT_POSITION_slugos = "41"
-
 pkg_postinst_${PN} () {
 #!/bin/sh
 if [ "x$D" != "x" ]; then
@@ -38,9 +33,9 @@ if [ "x$D" != "x" ]; then
 	# this happens at S98 where our good 'ole packages script used to run
 	echo "#!/bin/sh
 opkg-cl configure
-rm -f /${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure
-" > $D${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure
-	chmod 0755 $D${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure
+rm -f /${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure
+" > $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure
+	chmod 0755 $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure
 fi
 
 update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100
diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb
index 76ec838..d8af823 100644
--- a/meta/recipes-devtools/opkg/opkg_svn.bb
+++ b/meta/recipes-devtools/opkg/opkg_svn.bb
@@ -16,7 +16,7 @@ SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
 S = "${WORKDIR}/trunk"
 
 PV = "0.1.8+svnr${SRCPV}"
-PR = "r1"
+PR = "r2"
 
 PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}"
 
@@ -29,11 +29,6 @@ do_install_append() {
 	install -d ${D}${localstatedir}/lib/opkg
 }
 
-# Define a variable to allow distros to run configure earlier.
-# (for example, to enable loading of ethernet kernel modules before networking starts)
-OPKG_INIT_POSITION = "98"
-OPKG_INIT_POSITION_slugos = "41"
-
 pkg_postinst_${PN} () {
 #!/bin/sh
 if [ "x$D" != "x" ]; then
@@ -41,9 +36,9 @@ if [ "x$D" != "x" ]; then
 	# this happens at S98 where our good 'ole packages script used to run
 	echo "#!/bin/sh
 opkg-cl configure
-rm -f /${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure
-" > $D${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure
-	chmod 0755 $D${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure
+rm -f /${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure
+" > $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure
+	chmod 0755 $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure
 fi
 
 update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100
-- 
1.7.1.1

[PATCH 09/37] qemu: disable sdl for target build

[Saul Wold]

From: Saul Wold <sgw@linux.intel.com>

This allows qemu  to build for the target in the world build.
Not sure this would make sense to run on the target.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-devtools/qemu/qemu.inc |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 412bdfd..362e9f3 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -8,9 +8,13 @@ QEMU_TARGETS ?= "arm i386 mips mipsel mips64 mips64el ppc sh4 x86_64"
 
 require qemu-targets.inc
 
-EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls --enable-kvm --audio-drv-list=oss,alsa --audio-card-list=ac97,es1370"
+SDL ?= "--disable-sdl"
+SDL_virtclass-native ?= ""
+SDL_virtclass-nativesdk ?= ""
 
-#EXTRA_OECOF += "--disable-sdl"
+EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls --enable-kvm --audio-drv-list=oss,alsa --audio-card-list=ac97,es1370 ${SDL}"
+
+#EXTRA_OECONF += "--disable-sdl"
 
 inherit autotools
 
-- 
1.7.1.1

[PATCH 10/37] libxfixes: upgrade from 4.0.5 to the latest version 5.0

[Saul Wold]

From: Dexuan Cui <dexuan.cui@intel.com>

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
 .../{libxfixes_4.0.5.bb => libxfixes_5.0.bb}       |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libxfixes_4.0.5.bb => libxfixes_5.0.bb} (79%)

diff --git a/meta/recipes-graphics/xorg-lib/libxfixes_4.0.5.bb b/meta/recipes-graphics/xorg-lib/libxfixes_5.0.bb
similarity index 79%
rename from meta/recipes-graphics/xorg-lib/libxfixes_4.0.5.bb
rename to meta/recipes-graphics/xorg-lib/libxfixes_5.0.bb
index a69d5fd..0883cd1 100644
--- a/meta/recipes-graphics/xorg-lib/libxfixes_4.0.5.bb
+++ b/meta/recipes-graphics/xorg-lib/libxfixes_5.0.bb
@@ -19,5 +19,5 @@ XORG_PN = "libXfixes"
 
 BBCLASSEXTEND = "nativesdk"
 
-SRC_URI[md5sum] = "1b4b8386bd5d1751b2c7177223ad4629"
-SRC_URI[sha256sum] = "2e6cd020460e4ef5d5a1d9b5d21143e9f5e580036a79c7de26ae539d7bcb8d74"
+SRC_URI[md5sum] = "678071bd7f9f7467e2fc712d81022318"
+SRC_URI[sha256sum] = "537a2446129242737a35db40081be4bbcc126e56c03bf5f2b142b10a79cda2e3"
-- 
1.7.1.1

[PATCH 11/37] util-macros: upgrade from 1.11.0 to 1.13.0

[Saul Wold]

From: Dexuan Cui <dexuan.cui@intel.com>

removed xaw.patch since it's not used by any recipe now.

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
 .../xorg-util/util-macros/xaw.patch                |   14 --------------
 ...util-macros_1.11.0.bb => util-macros_1.13.0.bb} |    4 ++--
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-util/util-macros/xaw.patch
 rename meta/recipes-graphics/xorg-util/{util-macros_1.11.0.bb => util-macros_1.13.0.bb} (79%)

diff --git a/meta/recipes-graphics/xorg-util/util-macros/xaw.patch b/meta/recipes-graphics/xorg-util/util-macros/xaw.patch
deleted file mode 100644
index 8b39869..0000000
--- a/meta/recipes-graphics/xorg-util/util-macros/xaw.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: util-macros-1.2.1/xorg-macros.m4.in
-===================================================================
---- util-macros-1.2.1.orig/xorg-macros.m4.in	2009-01-15 13:49:56.000000000 +0000
-+++ util-macros-1.2.1/xorg-macros.m4.in	2009-01-15 13:52:22.000000000 +0000
-@@ -456,3 +456,9 @@
- fi
- AC_SUBST(CWARNFLAGS)
- ]) # XORG_CWARNFLAGS
-+
-+AC_DEFUN([XAW_CHECK_XPRINT_SUPPORT], [
-+PKG_CHECK_MODULES(TMP_XAW, xaw7)
-+$1_CFLAGS=$TMP_XAW_CFLAGS
-+$1_LIBS=$TMP_XAW_LIBS
-+])
diff --git a/meta/recipes-graphics/xorg-util/util-macros_1.11.0.bb b/meta/recipes-graphics/xorg-util/util-macros_1.13.0.bb
similarity index 79%
rename from meta/recipes-graphics/xorg-util/util-macros_1.11.0.bb
rename to meta/recipes-graphics/xorg-util/util-macros_1.13.0.bb
index 765a577..a708ed0 100644
--- a/meta/recipes-graphics/xorg-util/util-macros_1.11.0.bb
+++ b/meta/recipes-graphics/xorg-util/util-macros_1.13.0.bb
@@ -20,5 +20,5 @@ RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRC_URI[md5sum] = "8580021f3a9e242ab09d23d62e475d53"
-SRC_URI[sha256sum] = "212c3d14474d7cffdbc22437d4896211a5dce6b99b02b96229c9be7d963c90cf"
+SRC_URI[md5sum] = "31e9ddcbc1d8bc8c09ab180443974dd1"
+SRC_URI[sha256sum] = "7bff944fb120192e7fe1706e9c0b7e41666e7983ce3e2bdef0b7734392d9e695"
-- 
1.7.1.1

[PATCH 12/37] preferred-xorg-versions.inc: update libxfixes, util-macros, xorg-cf-files

[Saul Wold]

From: Dexuan Cui <dexuan.cui@intel.com>

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
 .../distro/include/preferred-xorg-versions.inc     |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 23eaace..da730e6 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -51,7 +51,7 @@ PREFERRED_VERSION_libxdmcp-nativesdk ?= "1.1.0"
 PREFERRED_VERSION_libxevie ?= "1.0.2"
 PREFERRED_VERSION_libxext ?= "1.2.0"
 PREFERRED_VERSION_libxext-nativesdk ?= "1.2.0"
-PREFERRED_VERSION_libxfixes ?= "4.0.5"
+PREFERRED_VERSION_libxfixes ?= "5.0"
 PREFERRED_VERSION_libxfont ?= "1.4.3"
 PREFERRED_VERSION_libxfont-native ?= "1.4.3"
 PREFERRED_VERSION_libxfontcache ?= "1.0.5"
@@ -92,8 +92,8 @@ PREFERRED_VERSION_renderproto-nativesdk ?= "0.11.1"
 PREFERRED_VERSION_resourceproto ?= "1.1.1"
 PREFERRED_VERSION_scrnsaverproto ?= "1.2.1"
 PREFERRED_VERSION_trapproto ?= "3.4.3"
-PREFERRED_VERSION_util-macros ?= "1.11.0"
-PREFERRED_VERSION_util-macros-native ?= "1.11.0"
+PREFERRED_VERSION_util-macros ?= "1.13.0"
+PREFERRED_VERSION_util-macros-native ?= "1.13.0"
 PREFERRED_VERSION_videoproto ?= "2.3.1"
 PREFERRED_VERSION_windowswmproto ?= "1.0.4"
 PREFERRED_VERSION_x11perf ?= "1.5.3"
@@ -119,7 +119,7 @@ PREFERRED_VERSION_xhost ?= "1.0.4"
 PREFERRED_VERSION_xinit ?= "1.3.0"
 PREFERRED_VERSION_xineramaproto ?= "1.2.1"
 PREFERRED_VERSION_xmodmap ?= "1.0.5"
-PREFERRED_VERSION_xorg-cf-files ?= "1.0.3"
+PREFERRED_VERSION_xorg-cf-files ?= "1.0.4"
 PREFERRED_VERSION_xprop ?= "1.2.0"
 PREFERRED_VERSION_xproto ?= "7.0.21"
 PREFERRED_VERSION_xproto-native ?= "7.0.21"
-- 
1.7.1.1

[PATCH 13/37] mdadm: upgrade from 3.1.4 to the latest version 3.2.1

[Saul Wold]

From: Dexuan Cui <dexuan.cui@intel.com>

removed fix-z-now.patch since 3.2.1 has integrated it.

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
 meta/recipes-extended/mdadm/files/fix-z-now.patch  |   15 ---------------
 .../mdadm/{mdadm_3.1.4.bb => mdadm_3.2.1.bb}       |    9 ++++-----
 2 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 meta/recipes-extended/mdadm/files/fix-z-now.patch
 rename meta/recipes-extended/mdadm/{mdadm_3.1.4.bb => mdadm_3.2.1.bb} (78%)

diff --git a/meta/recipes-extended/mdadm/files/fix-z-now.patch b/meta/recipes-extended/mdadm/files/fix-z-now.patch
deleted file mode 100644
index 3cd606b..0000000
--- a/meta/recipes-extended/mdadm/files/fix-z-now.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix -z now is really a LD option, not a gcc option so use -Wl to pass it to LD
-
-Created-by: Saul Wold <saul.wold@intel.com>
-
---- Makefile.orig	2010-08-31 13:52:46.277764099 -0700
-+++ Makefile	2010-08-31 14:02:28.218014078 -0700
-@@ -167,7 +167,7 @@
- 
- # use '-z now' to guarantee no dynamic linker interactions with the monitor thread
- mdmon : $(MON_OBJS)
--	$(CC) $(LDFLAGS) $(MON_LDFLAGS) -z now -o mdmon $(MON_OBJS) $(LDLIBS)
-+	$(CC) $(LDFLAGS) $(MON_LDFLAGS) -Wl,-z,now -o mdmon $(MON_OBJS) $(LDLIBS)
- msg.o: msg.c msg.h
- 
- test_stripe : restripe.c mdadm.h
diff --git a/meta/recipes-extended/mdadm/mdadm_3.1.4.bb b/meta/recipes-extended/mdadm/mdadm_3.2.1.bb
similarity index 78%
rename from meta/recipes-extended/mdadm/mdadm_3.1.4.bb
rename to meta/recipes-extended/mdadm/mdadm_3.2.1.bb
index ef62a3f..937abad 100644
--- a/meta/recipes-extended/mdadm/mdadm_3.1.4.bb
+++ b/meta/recipes-extended/mdadm/mdadm_3.2.1.bb
@@ -8,13 +8,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
                     file://mdmon.c;beginline=4;endline=18;md5=af7d8444d9c4d3e5c7caac0d9d34039d \
                     file://mdadm.h;beglinlne=4;endline=22;md5=462bc9936ac0d3da110191a3f9994161"
 
-PR = "r1"
+PR = "r0"
 
-SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2 \
-	   file://fix-z-now.patch;striplevel=0"
+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2"
 
-SRC_URI[md5sum] = "0e7dcb5cc4192ae3abd9956bac475576"
-SRC_URI[sha256sum] = "849ad0ad4ad3c1d2d8806a16b30e1f59ab2daf313cb103807207f7cba889ea63"
+SRC_URI[md5sum] = "d1e2549202bd79d9e99f1498d1109530"
+SRC_URI[sha256sum] = "7f68f149c6c0e8893d0b9220ac255b46af08e6a6b81223cab57ed54d628ae125"
 
 CFLAGS += "-fno-strict-aliasing"
 
-- 
1.7.1.1

[PATCH 14/37] liburcu: upgrade from 0.5.2 to 0.5.4

[Saul Wold]

From: Dexuan Cui <dexuan.cui@intel.com>

Add arm into COMPATIBLE_HOST since liburcu started to support
pre-ARMv7 from 0.5.3 on.

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
 .../liburcu/{liburcu_0.5.2.bb => liburcu_0.5.4.bb} |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)
 rename meta/recipes-support/liburcu/{liburcu_0.5.2.bb => liburcu_0.5.4.bb} (61%)

diff --git a/meta/recipes-support/liburcu/liburcu_0.5.2.bb b/meta/recipes-support/liburcu/liburcu_0.5.4.bb
similarity index 61%
rename from meta/recipes-support/liburcu/liburcu_0.5.2.bb
rename to meta/recipes-support/liburcu/liburcu_0.5.4.bb
index fa9ddb3..8e17e5d 100644
--- a/meta/recipes-support/liburcu/liburcu_0.5.2.bb
+++ b/meta/recipes-support/liburcu/liburcu_0.5.4.bb
@@ -11,17 +11,14 @@ PR = "r0"
 
 SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2"
 
-SRC_URI[md5sum] = "a2978395806eed5d9a2de1e22efe70e0"
-SRC_URI[sha256sum] = "2f22966fe4b00ef547976a31c1c6a7c7bea3449ffa838806d9610e7424e184dd"
+SRC_URI[md5sum] = "04147d24749be75200173859839207f7"
+SRC_URI[sha256sum] = "02aedbb16c16bd034e246d5c9637a9232be559c66fc2fe4eb28948e234bd89f1"
 
 S = "${WORKDIR}/userspace-rcu-${PV}"
 
 inherit autotools
 
 # liburcu, which is only used by lttng-ust, may not build on other
-# platforms, e.g., on ARM, liburcu is only supported on ARMv7l while poky
-# only supports armv4/armv4t/armv5te. 1 more example: liburcu doesn't support
-# MIPS now.
-# So here let us first suppport x86/powerpc platforms now.
-COMPATIBLE_HOST = '(x86_64.*|i.86.*|powerpc.*)-linux'
+# platforms, like MIPS.
+COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux'
 
-- 
1.7.1.1

[PATCH 15/37] lttng-ust: upgrade from 0.11 to the latest version 0.12

[Saul Wold]

From: Dexuan Cui <dexuan.cui@intel.com>

Updated LIC_FILES_CHKSUM as a new Copyright holder was added.
Removed the patch since 0.12 has integrated that.
Added arm into COMPATIBLE_HOST as 0.12 can build on arm now.

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
 ...remove_ppc_specific_time_reading_function.patch |   85 --------------------
 meta/recipes-kernel/lttng/lttng-ust_0.11.bb        |   32 --------
 meta/recipes-kernel/lttng/lttng-ust_0.12.bb        |   28 +++++++
 3 files changed, 28 insertions(+), 117 deletions(-)
 delete mode 100644 meta/recipes-kernel/lttng/lttng-ust-0.11/remove_ppc_specific_time_reading_function.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-ust_0.11.bb
 create mode 100644 meta/recipes-kernel/lttng/lttng-ust_0.12.bb

diff --git a/meta/recipes-kernel/lttng/lttng-ust-0.11/remove_ppc_specific_time_reading_function.patch b/meta/recipes-kernel/lttng/lttng-ust-0.11/remove_ppc_specific_time_reading_function.patch
deleted file mode 100644
index c5487fd..0000000
--- a/meta/recipes-kernel/lttng/lttng-ust-0.11/remove_ppc_specific_time_reading_function.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Dexuan Cui <dexuan.cui@intel.com>: I got the following patch from lttng dev
-mailing list:
-http://lists.casi.polymtl.ca/pipermail/ltt-dev/2011-February/003903.html
-The patch looks good and I think it would be in next release. At present,
-let's add it into SRC_URI.
-
------------------------------------------------------------------
-The PPC version of the trace_clock_read64 was using the TB register
-which is not constant accross implementations. The currently
-measured time base on PPC was not accurate.
-So, for now, we rely on the CLOCK_MONOTONIC.
-
-This patch remove a bunch of #ifdef for x86 and PPC, since we now rely on
-the same base clock. It also fix the build on PPC that was currently broken
-
-Signed-off-by: Yannick Brosseau <yannick.brosseau@gmail.com>
------------------------------------------------------------------
-
---- a/include/ust/clock.h
-+++ b/include/ust/clock.h
-@@ -39,7 +39,6 @@
-    precision and monotonicity.
- */
- 
--#if __i386__ || __x86_64__
- /* Only available for x86 arch */
- #define CLOCK_TRACE_FREQ  14
- #define CLOCK_TRACE  15
-@@ -47,36 +46,10 @@
- 	struct timespec ts;
- 	u64 lttng_ts;
- };
--#endif /* __i386__ || __x86_64__ */
- 
- extern int ust_clock_source;
- 
- /* Choosing correct trace clock */
--#if __PPC__
--static __inline__ u64 trace_clock_read64(void)
--{
--	unsigned long tb_l;
--	unsigned long tb_h;
--	unsigned long tb_h2;
--	u64 tb;
--
--	__asm__ (
--		"1:\n\t"
--		"mftbu %[rhigh]\n\t"
--		"mftb %[rlow]\n\t"
--		"mftbu %[rhigh2]\n\t"
--		"cmpw %[rhigh],%[rhigh2]\n\t"
--		"bne 1b\n\t"
--		: [rhigh] "=r" (tb_h), [rhigh2] "=r" (tb_h2), [rlow] "=r" (tb_l));
--
--	tb = tb_h;
--	tb <<= 32;
--	tb |= tb_l;
--
--	return tb;
--}
--
--#else	/* !__PPC__ */
- 
- static __inline__ u64 trace_clock_read64(void)
- {
-@@ -101,17 +74,17 @@
- 	return retval;
- }
- 
--#endif /* __PPC__ */
--
- static __inline__ u64 trace_clock_frequency(void)
- {
- 	struct timespec ts;
- 	union lttng_timespec *lts = (union lttng_timespec *) &ts;
- 
-+#if __i386__ || __x86_64__
- 	if (likely(ust_clock_source == CLOCK_TRACE)) {
- 		clock_gettime(CLOCK_TRACE_FREQ, &ts);
- 		return lts->lttng_ts;
- 	}
-+#endif
- 	return 1000000000LL;
- }
- 
diff --git a/meta/recipes-kernel/lttng/lttng-ust_0.11.bb b/meta/recipes-kernel/lttng/lttng-ust_0.11.bb
deleted file mode 100644
index 9d2063a..0000000
--- a/meta/recipes-kernel/lttng/lttng-ust_0.11.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-SUMMARY = "Linux Trace Toolkit Userspace Tracer"
-DESCRIPTION = "The LTTng Userspace Tracer (UST) is a library accompanied by a set of tools to trace userspace code"
-HOMEPAGE = "http://lttng.org/ust"
-BUGTRACKER = "n/a"
-
-LICENSE = "LGPLv2.1+ & BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e647752e045a8c45b6f583771bd561ef \
-                    file://ustctl/ustctl.c;endline=16;md5=eceeaab8a5574f24d62f7950b9d1adf4 \
-                    file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44"
-
-DEPENDS = "liburcu"
-
-PR = "r1"
-
-SRC_URI = "http://lttng.org/files/ust/releases/ust-${PV}.tar.gz \
-           file://remove_ppc_specific_time_reading_function.patch \
-           "
-
-SRC_URI[md5sum] = "0a23fa60df4da3fb5188e314001eb49c"
-SRC_URI[sha256sum] = "af8f699019ae260103bb401b6738d5e417e79732a509859b42a52e9a0f5edb35"
-
-S = "${WORKDIR}/ust-${PV}"
-
-inherit autotools
-
-# Due to liburcu not building on ARM or MIPS currently this recipe needs to
-# be limited also.
-# So here let us first suppport x86/powerpc platforms now.
-COMPATIBLE_HOST = '(x86_64.*|i.86.*|powerpc.*)-linux'
-
-
-
diff --git a/meta/recipes-kernel/lttng/lttng-ust_0.12.bb b/meta/recipes-kernel/lttng/lttng-ust_0.12.bb
new file mode 100644
index 0000000..7dadc04
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-ust_0.12.bb
@@ -0,0 +1,28 @@
+SUMMARY = "Linux Trace Toolkit Userspace Tracer"
+DESCRIPTION = "The LTTng Userspace Tracer (UST) is a library accompanied by a set of tools to trace userspace code"
+HOMEPAGE = "http://lttng.org/ust"
+BUGTRACKER = "n/a"
+
+LICENSE = "LGPLv2.1+ & BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e647752e045a8c45b6f583771bd561ef \
+                    file://ustctl/ustctl.c;endline=16;md5=b50c6fa0307175bb1ce0db49d752c03b \
+                    file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44"
+
+DEPENDS = "liburcu"
+
+PR = "r0"
+
+SRC_URI = "http://lttng.org/files/ust/releases/ust-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "fae6e324a56016658c5b83ec14ba0043"
+SRC_URI[sha256sum] = "215b05f47d0c9e3a2934926a7d14fa9c67025db917c3a1f641df40b08314ab0c"
+
+S = "${WORKDIR}/ust-${PV}"
+
+inherit autotools
+
+# Due to liburcu not building on MIPS currently this recipe needs to
+# be limited also.
+# So here let us first suppport x86/arm/powerpc platforms now.
+COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux'
+
-- 
1.7.1.1

[PATCH 16/37] task-poky-tools.bb, task-sdk-gmae.inc: enable lttng-ust for ARM

[Saul Wold]

From: Dexuan Cui <dexuan.cui@intel.com>

lttng-ust can build on ARM from 0.12 on.
Merged with rebranding

Fixes [YOCTO #856]

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-core/tasks/task-core-tools.bb         |    8 ++++----
 meta/recipes-gnome/tasks/task-core-sdk-gmae.bb     |    4 ++--
 .../tasks/task-core-standalone-gmae-sdk-target.bb  |    4 ++--
 meta/recipes-gnome/tasks/task-sdk-gmae.inc         |    1 +
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/meta/recipes-core/tasks/task-core-tools.bb b/meta/recipes-core/tasks/task-core-tools.bb
index 958dff1..9b2a4ce 100644
--- a/meta/recipes-core/tasks/task-core-tools.bb
+++ b/meta/recipes-core/tasks/task-core-tools.bb
@@ -2,11 +2,11 @@
 # Copyright (C) 2008 OpenedHand Ltd.
 #
 
-DESCRIPTION = "Tools tasks for Poky"
+DESCRIPTION = "Tools tasks for OE-Core"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r8"
+PR = "r9"
 
 PACKAGES = "\
     task-core-tools-debug \
@@ -57,9 +57,9 @@ RRECOMMENDS_task-core-tools-profile = "\
 #    exmap-server
 
 # At present we only build lttng-ust on
-# qemux86/qemux86-64/qemuppc/emenlow/atom-pc since upstream liburcu
+# qemux86/qemux86-64/qemuppc/qemuarm/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.
+# MIPS.
 RDEPENDS_task-core-tools-profile_append_qemux86 = " valgrind lttng-ust systemtap"
 RDEPENDS_task-core-tools-profile_append_qemux86-64 = " lttng-ust systemtap"
 RDEPENDS_task-core-tools-profile_append_qemuppc = " lttng-ust systemtap"
diff --git a/meta/recipes-gnome/tasks/task-core-sdk-gmae.bb b/meta/recipes-gnome/tasks/task-core-sdk-gmae.bb
index 6cb1410..d56aa07 100644
--- a/meta/recipes-gnome/tasks/task-core-sdk-gmae.bb
+++ b/meta/recipes-gnome/tasks/task-core-sdk-gmae.bb
@@ -2,11 +2,11 @@
 # Copyright (C) 2007 OpenedHand Ltd.
 #
 
-DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OpenedHand Poky"
+DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OE-Core"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r10"
+PR = "r11"
 
 ALLOW_EMPTY = "1"
 
diff --git a/meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb b/meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb
index 32e60a8..42d4148 100644
--- a/meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb
+++ b/meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb
@@ -2,11 +2,11 @@
 # Copyright (C) 2007 OpenedHand Ltd.
 #
 
-DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OpenedHand Poky"
+DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OE-Core"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r12"
+PR = "r13"
 
 ALLOW_EMPTY = "1"
 
diff --git a/meta/recipes-gnome/tasks/task-sdk-gmae.inc b/meta/recipes-gnome/tasks/task-sdk-gmae.inc
index 0ab0b6e..2071089 100644
--- a/meta/recipes-gnome/tasks/task-sdk-gmae.inc
+++ b/meta/recipes-gnome/tasks/task-sdk-gmae.inc
@@ -35,5 +35,6 @@ SDK-EXTRAS ?= ""
 SDK-EXTRAS_qemux86 ?= " valgrind lttng-ust-dev"
 SDK-EXTRAS_qemux86-64 ?= " lttng-ust-dev"
 SDK-EXTRAS_qemuppc ?= " lttng-ust-dev"
+SDK-EXTRAS_qemuarm ?= " lttng-ust-dev"
 SDK-EXTRAS_emenlow ?= " lttng-ust-dev"
 SDK-EXTRAS_atom-pc ?= " lttng-ust-dev"
-- 
1.7.1.1

[PATCH 17/37] lttng-viewer: upgrade from 0.12.36 to the latest version 0.12.38

[Saul Wold]

From: Dexuan Cui <dexuan.cui@intel.com>

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
 ...g-viewer_0.12.36.bb => lttng-viewer_0.12.38.bb} |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-kernel/lttng/{lttng-viewer_0.12.36.bb => lttng-viewer_0.12.38.bb} (85%)

diff --git a/meta/recipes-kernel/lttng/lttng-viewer_0.12.36.bb b/meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb
similarity index 85%
rename from meta/recipes-kernel/lttng/lttng-viewer_0.12.36.bb
rename to meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb
index fc13210..b8f2f2c 100644
--- a/meta/recipes-kernel/lttng/lttng-viewer_0.12.36.bb
+++ b/meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb
@@ -14,12 +14,12 @@ DEPENDS = "gtk+ pango popt"
 
 SECTION = "devel"
 
-ALTNAME = "lttv-${PV}-18112010"
+ALTNAME = "lttv-${PV}-21032011"
 
 SRC_URI = "http://lttng.org/files/packages/${ALTNAME}.tar.gz"
 
-SRC_URI[md5sum] = "967f7c9c843a43e2ec2ef9216edabc70"
-SRC_URI[sha256sum] = "a7d14ae84f9bb123298840922730d3121fa073dc036dccac63083d9686adeacd"
+SRC_URI[md5sum] = "071bf3dd13e7562c08ee8f8971cfc76d"
+SRC_URI[sha256sum] = "cf87ffcf5d266b18979418e610a180a0b4214de41677f0be867885e15b2f7647"
 S = "${WORKDIR}/${ALTNAME}"
 
 inherit autotools
-- 
1.7.1.1

[PATCH 18/37] distro_tracking_fields.inc: update the info for the following recipes

[Saul Wold]

From: Dexuan Cui <dexuan.cui@intel.com>

powertop
latencytop
libxfixes
util-macros
mdadm
lttng-control
liburcu
lttng-ust
lttng-viewer

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
 .../conf/distro/include/distro_tracking_fields.inc |   65 ++++++++++----------
 1 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 7663ffa..4598f3c 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -976,13 +976,13 @@ RECIPE_MAINTAINER_pn-quota = "Dongxiao Xu <dongxiao.xu@intel.com>"
 
 RECIPE_STATUS_pn-mdadm = "green"
 RECIPE_DEPENDENCY_CHECK_pn-mdadm = "not done"
-RECIPE_LATEST_VERSION_pn-mdadm = "3.1.4"
+RECIPE_LATEST_VERSION_pn-mdadm = "3.2.1"
 RECIPE_NO_OF_PATCHES_pn-mdadm = "0"
 RECIPE_INTEL_SECTION_pn-mdadm = "base utils"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-mdadm = "25 days"
-RECIPE_LATEST_RELEASE_DATE_pn-mdadm = "Aug 31, 2010"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-mdadm = "1+ months"
+RECIPE_LATEST_RELEASE_DATE_pn-mdadm = "Mar 28, 2011"
 RECIPE_COMMENTS_pn-mdadm = ""
-RECIPE_LAST_UPDATE_pn-mdadm = "Aug 31, 2010"
+RECIPE_LAST_UPDATE_pn-mdadm = "Apr 20, 2011"
 RECIPE_MAINTAINER_pn-mdadm = "Dexuan Cui <dexuan.cui@intel.com>"
 
 RECIPE_STATUS_pn-screen = "green"
@@ -2710,13 +2710,14 @@ RECIPE_MAINTAINER_pn-oprofile = "Dexuan Cui <dexuan.cui@intel.com>"
 RECIPE_STATUS_pn-powertop = "green"
 DISTRO_PN_ALIAS_pn-powertop ="Meego=powertop Fedora=powertop Debian=powertop OpenSuSE=powertop Mandriva=powertop"
 RECIPE_DEPENDENCY_CHECK_pn-powertop = "not done"
-RECIPE_LATEST_VERSION_pn-powertop = "1.13"
-RECIPE_MANUAL_CHECK_DATE_pn-powertop = "Jan 28, 2011"
+RECIPE_LATEST_VERSION_pn-powertop = "1.97"
+RECIPE_MANUAL_CHECK_DATE_pn-powertop = "Apr 20, 2011"
+RECIPE_NO_UPDATE_REASON_pn-powertop = "Do not upgrade to version 1.97 since it's a beta release of the comming PowerTOP 2.0"
 RECIPE_NO_OF_PATCHES_pn-powertop = "1"
 RECIPE_PATCH_pn-powertop+stub_out_the_ncurses_calls_in_dump_mode = "stub out the ncurses calls in dump mode; this fixes a segfault"
 RECIPE_INTEL_SECTION_pn-powertop = "sdk-tools"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-powertop = "11 months"
-RECIPE_LATEST_RELEASE_DATE_pn-powertop = "07/2010"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-powertop = "3 days"
+RECIPE_LATEST_RELEASE_DATE_pn-powertop = "Jan 5, 2011"
 RECIPE_COMMENTS_pn-powertop = ""
 RECIPE_LAST_UPDATE_pn-powertop = "Aug 27, 2010"
 RECIPE_MAINTAINER_pn-powertop = "Dexuan Cui <dexuan.cui@intel.com>"
@@ -2725,12 +2726,12 @@ RECIPE_STATUS_pn-latencytop = "green"
 DISTRO_PN_ALIAS_pn-latencytop = "Meego=latencytop Fedora=latencytop Debian=latencytop OpenSuSE=latencytop"
 RECIPE_DEPENDENCY_CHECK_pn-latencytop = "not done"
 RECIPE_LATEST_VERSION_pn-latencytop = "0.5"
-RECIPE_MANUAL_CHECK_DATE_pn-latencytop = "Jan 28, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-latencytop = "Apr 20, 2011"
 RECIPE_NO_OF_PATCHES_pn-latencytop = "1"
 RECIPE_PATCH_pn-latencytop+latencytop-makefile = "-lncursesw ==> -lncurses; gcc ==> CC ?= gcc, and use $(CC); install:mkdir -p $(DESTDIR)/$(SBINDIR)"
 RECIPE_INTEL_SECTION_pn-latencytop = "sdk-tools"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-latencytop = "1 year"
-RECIPE_LATEST_RELEASE_DATE_pn-latencytop = "04/2009"
+RECIPE_LATEST_RELEASE_DATE_pn-latencytop = "Apr 28, 2009"
 RECIPE_COMMENTS_pn-latencytop = ""
 RECIPE_LAST_UPDATE_pn-latencytop = "Jul 22, 2010"
 RECIPE_MAINTAINER_pn-latencytop = "Dexuan Cui <dexuan.cui@intel.com>"
@@ -2754,31 +2755,32 @@ RECIPE_MAINTAINER_pn-tcf-agent = "Dexuan Cui <dexuan.cui@intel.com>"
 RECIPE_STATUS_pn-liburcu = "green"
 DISTRO_PN_ALIAS_pn-liburcu = "Fedora=userspace-rcu Ubuntu=liburcu0"
 RECIPE_DEPENDENCY_CHECK_pn-liburcu = "not done"
-RECIPE_LATEST_VERSION_pn-liburcu = "0.5.2"
+RECIPE_LATEST_VERSION_pn-liburcu = "0.5.4"
 RECIPE_NO_OF_PATCHES_pn-liburcu = "0"
 RECIPE_INTEL_SECTION_pn-liburcu = "libs"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-liburcu = "29 minutes"
-RECIPE_LATEST_RELEASE_DATE_pn-liburcu = "Nov 18, 2010"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-liburcu = "20 hours"
+RECIPE_LATEST_RELEASE_DATE_pn-liburcu = "Mar 4, 2011"
 RECIPE_COMMENTS_pn-liburcu = ""
-RECIPE_LAST_UPDATE_pn-liburcu = "Jan 28, 2011"
+RECIPE_LAST_UPDATE_pn-liburcu = "Apr 20, 2011"
 RECIPE_MAINTAINER_pn-liburcu = "Dexuan Cui <dexuan.cui@intel.com>"
 
 RECIPE_STATUS_pn-lttng-ust = "green"
 DISTRO_PN_ALIAS_pn-lttng-ust = "OSPDT upstream=http://lttng.org/"
 RECIPE_DEPENDENCY_CHECK_pn-lttng-ust = "not done"
-RECIPE_LATEST_VERSION_pn-lttng-ust = "0.11"
+RECIPE_LATEST_VERSION_pn-lttng-ust = "0.12"
 RECIPE_NO_OF_PATCHES_pn-lttng-ust = "0"
 RECIPE_INTEL_SECTION_pn-lttng-ust = "sdk-tools"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-lttng-ust = "12+ hours"
-RECIPE_LATEST_RELEASE_DATE_pn-lttng-ust = "Jan 14, 2011"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-lttng-ust = "2 months"
+RECIPE_LATEST_RELEASE_DATE_pn-lttng-ust = "Mar 15, 2011"
 RECIPE_COMMENTS_pn-lttng-ust = ""
-RECIPE_LAST_UPDATE_pn-lttng-ust = "Jan 28, 2011"
+RECIPE_LAST_UPDATE_pn-lttng-ust = "Apr 20, 2011"
 RECIPE_MAINTAINER_pn-lttng-ust = "Dexuan Cui <dexuan.cui@intel.com>"
 
 RECIPE_STATUS_pn-lttng-control = "green"
 DISTRO_PN_ALIAS_pn-lttng-control = "OSPDT upstream=http://lttng.org/"
 RECIPE_DEPENDENCY_CHECK_pn-lttng-control = "not done"
 RECIPE_LATEST_VERSION_pn-lttng-control = "0.88-09242010"
+RECIPE_NO_UPDATE_REASON_pn-lttng-control = "0.88-09242010 has been the latest version."
 RECIPE_NO_OF_PATCHES_pn-lttng-control = "0"
 RECIPE_INTEL_SECTION_pn-lttng-control = "sdk-tools"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-lttng-control = "3 months"
@@ -2790,13 +2792,14 @@ RECIPE_MAINTAINER_pn-lttng-control = "Dexuan Cui <dexuan.cui@intel.com>"
 RECIPE_STATUS_pn-lttng-viewer = "green"
 DISTRO_PN_ALIAS_pn-lttng-viewer = "OSPDT upstream=http://lttng.org/"
 RECIPE_DEPENDENCY_CHECK_pn-lttng-viewer = "not done"
-RECIPE_LATEST_VERSION_pn-lttng-viewer = "0.12.36-18112010"
+RECIPE_LATEST_VERSION_pn-lttng-viewer = "0.12.38-21032011"
+RECIPE_NO_UPDATE_REASON_pn-lttng-viewer = "0.12.38-21032011 has been the latest version."
 RECIPE_NO_OF_PATCHES_pn-lttng-viewer = "0"
 RECIPE_INTEL_SECTION_pn-lttng-viewer = "sdk-tools"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-lttng-viewer = "3 months"
-RECIPE_LATEST_RELEASE_DATE_pn-lttng-viewer = "Nov 18, 2010"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-lttng-viewer = "1 month"
+RECIPE_LATEST_RELEASE_DATE_pn-lttng-viewer = "Mar 21, 2011"
 RECIPE_COMMENTS_pn-lttng-viewer = ""
-RECIPE_LAST_UPDATE_pn-lttng-viewer = "Jan 28, 2011"
+RECIPE_LAST_UPDATE_pn-lttng-viewer = "Apr 20, 2011"
 RECIPE_MAINTAINER_pn-lttng-viewer = "Dexuan Cui <dexuan.cui@intel.com>"
 
 RECIPE_STATUS_pn-blktrace = "red"
@@ -4340,13 +4343,13 @@ RECIPE_MAINTAINER_pn-libxext = "Dexuan Cui <dexuan.cui@intel.com>"
 
 RECIPE_STATUS_pn-libxfixes = "green"
 RECIPE_DEPENDENCY_CHECK_pn-libxfixes = "not done"
-RECIPE_LATEST_VERSION_pn-libxfixes = "4.0.4"
+RECIPE_LATEST_VERSION_pn-libxfixes = "5.0"
 RECIPE_NO_OF_PATCHES_pn-libxfixes = "0"
 RECIPE_INTEL_SECTION_pn-libxfixes = "x11/libs"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libxfixes = "3 years"
-RECIPE_LATEST_RELEASE_DATE_pn-libxfixes = "10/2009"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libxfixes = "9 months"
+RECIPE_LATEST_RELEASE_DATE_pn-libxfixes = "Mar 8, 2011"
 RECIPE_COMMENTS_pn-libxfixes = ""
-RECIPE_LAST_UPDATE_pn-libxfixes = "Nov 24, 2010"
+RECIPE_LAST_UPDATE_pn-libxfixes = "Apr 20, 2011"
 RECIPE_MAINTAINER_pn-libxfixes = "Dexuan Cui <dexuan.cui@intel.com>"
 
 RECIPE_STATUS_pn-libxft = "green"
@@ -4431,14 +4434,12 @@ RECIPE_MAINTAINER_pn-xkeyboard-config = "Dexuan Cui <dexuan.cui@intel.com>"
 RECIPE_STATUS_pn-util-macros = "green"
 DISTRO_PN_ALIAS_pn-util-macros = "Meego=xorg-x11-util-macros Fedora=xorg-x11-util-macros Mandriva=x11-util-macros"
 RECIPE_DEPENDENCY_CHECK_pn-util-macros = "not done"
-RECIPE_LATEST_VERSION_pn-util-macros = "1.10.0"
-RECIPE_NO_OF_PATCHES_pn-util-macros = "1"
-RECIPE_PATCH_pn-util-macros+unbreak_cross_compile = "the patch isn't needed any longer since the upstream has fixed the cross-compile issue, so is removed from the recipe file"
+RECIPE_LATEST_VERSION_pn-util-macros = "1.13.0"
 RECIPE_INTEL_SECTION_pn-util-macros = "x11/utils"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-util-macros = "2 days"
-RECIPE_LATEST_RELEASE_DATE_pn-util-macros = "06/2010"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-util-macros = "17 days"
+RECIPE_LATEST_RELEASE_DATE_pn-util-macros = "Mar 14, 2011"
 RECIPE_COMMENTS_pn-util-macros = ""
-RECIPE_LAST_UPDATE_pn-util-macros = "Nov 24, 2010"
+RECIPE_LAST_UPDATE_pn-util-macros = "Apr 20, 2011"
 RECIPE_MAINTAINER_pn-util-macros = "Dexuan Cui <dexuan.cui@intel.com>"
 
 RECIPE_STATUS_pn-fontconfig = "green"
-- 
1.7.1.1

[PATCH 19/37] puzzles: Upgrade to svn r9151 (from r9084)

[Saul Wold]

From: Zhai Edwin <edwin.zhai@intel.com>

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
 .../puzzles/files/oh-puzzles-owl-menu.patch        |    5 +++++
 .../puzzles/{puzzles_r9084.bb => puzzles_r9151.bb} |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)
 rename meta/recipes-sato/puzzles/{puzzles_r9084.bb => puzzles_r9151.bb} (94%)

diff --git a/meta/recipes-sato/puzzles/files/oh-puzzles-owl-menu.patch b/meta/recipes-sato/puzzles/files/oh-puzzles-owl-menu.patch
index 61da919..7e2c3ab 100644
--- a/meta/recipes-sato/puzzles/files/oh-puzzles-owl-menu.patch
+++ b/meta/recipes-sato/puzzles/files/oh-puzzles-owl-menu.patch
@@ -1,3 +1,8 @@
+This patch enable owl menu, which is hidden in the title bar to save space on
+small screen. It has not been used for a long time, rebase needed.
+
+Upstream-Status: Inappropriate [enable feature]
+
 Index: src/gtk.c
 ===================================================================
 --- src/gtk.c	(revision 22)
diff --git a/meta/recipes-sato/puzzles/puzzles_r9084.bb b/meta/recipes-sato/puzzles/puzzles_r9151.bb
similarity index 94%
rename from meta/recipes-sato/puzzles/puzzles_r9084.bb
rename to meta/recipes-sato/puzzles/puzzles_r9151.bb
index fbd0e37..5cd8bb9 100644
--- a/meta/recipes-sato/puzzles/puzzles_r9084.bb
+++ b/meta/recipes-sato/puzzles/puzzles_r9151.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=9928b60f3b78be315b7ab699c1b03ff5"
 
 SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar.gz"
 
-# Checksums seem to be changing regularly right now, need to verify with upstream
+# Upstream updates puzzles.tar.gz for the new release, so checksums seem to be changing regularly right now
 #SRC_URI[md5sum] = "e8b4c7e2341264789f3cd6733857bf1c"
 #SRC_URI[sha256sum] = "69f37e497e63b2f7ab44e7bbd50aee078269c16dbc2d78ec1b00257678f2cbd2"
 #SRC_URI = "svn://ixion.tartarus.org/main;module=puzzles;rev=${MOD_PV}"
-- 
1.7.1.1

[PATCH 20/37] linux-tools.inc: turn off newt and dwarf for perf

[Saul Wold]

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

Turn these off for now to avoid the host infection issues for perf.

Fixes yocto [BUGID #994].

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 meta/recipes-kernel/linux/linux-tools.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-tools.inc b/meta/recipes-kernel/linux/linux-tools.inc
index 2ac74a5..d64c9be 100644
--- a/meta/recipes-kernel/linux/linux-tools.inc
+++ b/meta/recipes-kernel/linux/linux-tools.inc
@@ -2,11 +2,11 @@
 # perf functionality from their tree.
 
 do_compile_perf() {
-	oe_runmake -C ${S}/tools/perf CC="${CC}" LD="${LD}" prefix=${prefix}
+	oe_runmake -C ${S}/tools/perf CC="${CC}" LD="${LD}" prefix=${prefix} NO_NEWT=1 NO_DWARF=1
 }
 
 do_install_perf() {
-	oe_runmake -C ${S}/tools/perf CC="${CC}" LD="${LD}" prefix=${prefix} DESTDIR=${D} install
+	oe_runmake -C ${S}/tools/perf CC="${CC}" LD="${LD}" prefix=${prefix} DESTDIR=${D} install NO_NEWT=1 NO_DWARF=1
 }
 
 
-- 
1.7.1.1

[PATCH 21/37] ofono: add bluez4 to DEPENDS list

[Saul Wold]

From: Saul Wold <sgw@linux.intel.com>

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-connectivity/ofono/ofono.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
index 9089670..ee3bc3e 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
 
 inherit autotools pkgconfig update-rc.d
 
-DEPENDS  = "dbus glib-2.0 udev"
+DEPENDS  = "dbus glib-2.0 udev bluez4"
 
 INITSCRIPT_NAME = "ofono"
 INITSCRIPT_PARAMS = "defaults 22"
-- 
1.7.1.1

[PATCH 22/37] mpfr: upgrade from 3.0.0 to 3.0.1

[Saul Wold]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../mpfr/{mpfr_3.0.0.bb => mpfr_3.0.1.bb}          |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/mpfr/{mpfr_3.0.0.bb => mpfr_3.0.1.bb} (70%)

diff --git a/meta/recipes-support/mpfr/mpfr_3.0.0.bb b/meta/recipes-support/mpfr/mpfr_3.0.1.bb
similarity index 70%
rename from meta/recipes-support/mpfr/mpfr_3.0.0.bb
rename to meta/recipes-support/mpfr/mpfr_3.0.1.bb
index 846cdc0..9079e4b 100644
--- a/meta/recipes-support/mpfr/mpfr_3.0.0.bb
+++ b/meta/recipes-support/mpfr/mpfr_3.0.1.bb
@@ -7,8 +7,8 @@ PR = "r0"
 
 SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2"
 
-SRC_URI[md5sum] = "f45bac3584922c8004a10060ab1a8f9f"
-SRC_URI[sha256sum] = "8f4e5f9c53536cb798a30455ac429b1f9fc75a0f8af32d6e0ac31ebf1024821f"
+SRC_URI[md5sum] = "bfbecb2eacb6d48432ead5cfc3f7390a"
+SRC_URI[sha256sum] = "e1977099bb494319c0f0c1f85759050c418a56884e9c6cef1c540b9b13e38e7f"
 S = "${WORKDIR}/mpfr-${PV}"
 
 BBCLASSEXTEND = "native nativesdk"
-- 
1.7.1.1

[PATCH 23/37] python-gst: upgrade from 0.10.19 to 0.10.21

[Saul Wold]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../python/python-gst/python-path.patch            |    2 ++
 ...python-gst_0.10.19.bb => python-gst_0.10.21.bb} |    6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/python/{python-gst_0.10.19.bb => python-gst_0.10.21.bb} (82%)

diff --git a/meta/recipes-devtools/python/python-gst/python-path.patch b/meta/recipes-devtools/python/python-gst/python-path.patch
index 00bab2c..21b5bbf 100644
--- a/meta/recipes-devtools/python/python-gst/python-path.patch
+++ b/meta/recipes-devtools/python/python-gst/python-path.patch
@@ -1,3 +1,5 @@
+Upstream-Status:Pending
+
 Index: gst-python-0.10.19/acinclude.m4
 ===================================================================
 --- gst-python-0.10.19.orig/acinclude.m4	2010-04-21 15:23:44.000000000 -0700
diff --git a/meta/recipes-devtools/python/python-gst_0.10.19.bb b/meta/recipes-devtools/python/python-gst_0.10.21.bb
similarity index 82%
rename from meta/recipes-devtools/python/python-gst_0.10.19.bb
rename to meta/recipes-devtools/python/python-gst_0.10.21.bb
index 22d6339..dd1ad5f 100644
--- a/meta/recipes-devtools/python/python-gst_0.10.19.bb
+++ b/meta/recipes-devtools/python/python-gst_0.10.21.bb
@@ -3,13 +3,13 @@ SECTION = "devel/python"
 LICENSE = "LGPLv2.1"
 DEPENDS = "gstreamer gst-plugins-base python-pygobject"
 RDEPENDS_${PN} += "python-pygtk"
-PR = "r1"
+PR = "r0"
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \
            file://python-path.patch"
 
-SRC_URI[md5sum] = "ddcef7d00bd88b0591cd6d910c36ec4b"
-SRC_URI[sha256sum] = "956f81a8c15daa3f17e688a0dc5a5d18a3118141066952d3b201a6ac0c52b415"
+SRC_URI[md5sum] = "31340ae3e877797a10d088a226d74b16"
+SRC_URI[sha256sum] = "d5962132c84b88b54d0f63832b8dfcc383a7805827da5abc2d1d215ba86a6f92"
 S = "${WORKDIR}/gst-python-${PV}"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=39ff67e932b7bdfa9b78bad67151690b"
-- 
1.7.1.1

[PATCH 24/37] git: upgrade from 1.7.3.4 to 1.7.4.3

[Saul Wold]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 meta/recipes-devtools/git/files/autotools.patch    |    2 ++
 .../git/{git_1.7.3.4.bb => git_1.7.4.3.bb}         |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/git/{git_1.7.3.4.bb => git_1.7.4.3.bb} (59%)

diff --git a/meta/recipes-devtools/git/files/autotools.patch b/meta/recipes-devtools/git/files/autotools.patch
index 1c69c22..cb21193 100644
--- a/meta/recipes-devtools/git/files/autotools.patch
+++ b/meta/recipes-devtools/git/files/autotools.patch
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [configuration]
+
 Index: git-1.7.2.1/configure.ac
 ===================================================================
 --- git-1.7.2.1.orig/configure.ac	2010-07-28 18:03:43.000000000 +0100
diff --git a/meta/recipes-devtools/git/git_1.7.3.4.bb b/meta/recipes-devtools/git/git_1.7.4.3.bb
similarity index 59%
rename from meta/recipes-devtools/git/git_1.7.3.4.bb
rename to meta/recipes-devtools/git/git_1.7.4.3.bb
index 2765ef7..603d2fd 100644
--- a/meta/recipes-devtools/git/git_1.7.3.4.bb
+++ b/meta/recipes-devtools/git/git_1.7.4.3.bb
@@ -6,5 +6,5 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \
                  ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
                  "
 
-SRC_URI[md5sum] = "3a2602016f98c529cda7b9fad1a6e216"
-SRC_URI[sha256sum] = "3e5e2b6547ee4aae82b4c5f589ff084996e9e6e0e2b52c92365e6baa1e4a0171"
+SRC_URI[md5sum] = "da6c8f4967393342a4397b955db72cb1"
+SRC_URI[sha256sum] = "44b3ebc87d83b34468718fb6fa424420877e1f66c190389d693d090662a3556d"
-- 
1.7.1.1

[PATCH 25/37] python-pycairo: fix installation path of __init__.py

[Saul Wold]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

This fixes Bug [YOCTO #477]

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../python/python-pycairo_1.8.10.bb                |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-devtools/python/python-pycairo_1.8.10.bb b/meta/recipes-devtools/python/python-pycairo_1.8.10.bb
index 7d73dc2..24b3ff2 100644
--- a/meta/recipes-devtools/python/python-pycairo_1.8.10.bb
+++ b/meta/recipes-devtools/python/python-pycairo_1.8.10.bb
@@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1 & MPLv1.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f2e071ab72978431b294a0d696327421"
 # cairo >= 1.8.8
 DEPENDS = "cairo"
-PR = "ml0"
+PR = "r1"
 
 SRC_URI = "http://cairographics.org/releases/py2cairo-${PV}.tar.gz"
 
@@ -16,6 +16,12 @@ S = "${WORKDIR}/pycairo-${PV}"
 
 inherit distutils pkgconfig
 
+do_compile_prepend() {
+#fix the installation path of __init__.py
+#It was going in the sysroot instead of target install location
+	sed -i -e "s#dsy.get_python_lib()#'${D}${PYTHON_SITEPACKAGES_DIR}'#" ${S}/setup.py
+}
+
 do_install_append () {
 	install -d ${D}${includedir}
 	install -d ${D}${libdir}
-- 
1.7.1.1

[PATCH 26/37] perl-5.12.2: use of PERLHOSTLIB var fix

[Saul Wold]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

PERLHOSTLIB var is used to build target perl. It let perl use the native
perl .so module files at the time of compilation of target perl.

These changes to perl make the PERLHOSTLIB variable also useful for
building perl modules to use native .so perl module.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../libperl-5.8.3-create-libperl-soname.patch      |   11 -----------
 .../perl/perl-5.12.2/09_fix_installperl.patch      |    2 ++
 .../Configure-multilib.patch                       |    2 ++
 .../perl/perl-5.12.2/Makefile.SH.patch             |    2 ++
 .../perl/perl-5.12.2/Makefile.patch                |    2 ++
 .../perl/perl-5.12.2/asm-pageh-fix.patch           |    2 ++
 .../perl/perl-5.12.2/cross-generate_uudmap.patch   |    2 ++
 .../perl/perl-5.12.2/debian/arm_optim.diff         |    2 ++
 .../debian/arm_thread_stress_timeout.diff          |    2 ++
 .../perl/perl-5.12.2/debian/cpan_config_path.diff  |    2 ++
 .../perl-5.12.2/debian/cpan_definstalldirs.diff    |    2 ++
 .../perl-5.12.2/debian/cpanplus_config_path.diff   |    2 ++
 .../debian/cpanplus_definstalldirs.diff            |    2 ++
 .../perl/perl-5.12.2/debian/db_file_ver.diff       |    2 ++
 .../perl-5.12.2/debian/deprecate-with-apt.diff     |    2 ++
 .../debian/devel-ppport-ia64-optim.diff            |    2 ++
 .../perl-5.12.2/debian/disable-zlib-bundling.diff  |    2 ++
 .../perl/perl-5.12.2/debian/doc_info.diff          |    2 ++
 .../perl/perl-5.12.2/debian/enc2xs_inc.diff        |    2 ++
 .../perl/perl-5.12.2/debian/errno_ver.diff         |    2 ++
 .../perl/perl-5.12.2/debian/extutils_hacks.diff    |    2 ++
 .../perl/perl-5.12.2/debian/fakeroot.diff          |    2 ++
 .../perl-5.12.2/debian/fixes/autodie-flock.diff    |    2 ++
 .../debian/fixes/concat-stack-corruption.diff      |    2 ++
 .../debian/fixes/cpanplus-without-home.diff        |    2 ++
 .../perl-5.12.2/debian/fixes/h2ph-gcc-4.5.diff     |    2 ++
 .../perl-5.12.2/debian/fixes/hurd-ccflags.diff     |    2 ++
 .../perl-5.12.2/debian/fixes/lc-numeric-docs.diff  |    2 ++
 .../debian/fixes/lc-numeric-sprintf.diff           |    2 ++
 .../perl-5.12.2/debian/fixes/net_smtp_docs.diff    |    2 ++
 .../perl/perl-5.12.2/debian/fixes/processPL.diff   |    2 ++
 .../perl/perl-5.12.2/debian/instmodsh_doc.diff     |    2 ++
 .../perl/perl-5.12.2/debian/ld_run_path.diff       |    2 ++
 .../perl-5.12.2/debian/libnet_config_path.diff     |    2 ++
 .../perl-5.12.2/debian/m68k_thread_stress.diff     |    2 ++
 .../perl/perl-5.12.2/debian/mod_paths.diff         |    2 ++
 .../debian/module_build_man_extensions.diff        |    2 ++
 .../perl/perl-5.12.2/debian/perlivp.diff           |    2 ++
 .../perl/perl-5.12.2/debian/prune_libs.diff        |    2 ++
 .../debian/squelch-locale-warnings.diff            |    2 ++
 .../perl/perl-5.12.2/generate-sh.patch             |    2 ++
 .../perl/perl-5.12.2/installperl.patch             |    2 ++
 .../{files => perl-5.12.2}/letgcc-find-errno.patch |    2 ++
 .../perl/perl-5.12.2/native-nopacklist.patch       |    2 ++
 .../perl/perl-5.12.2/native-perlinc.patch          |    2 ++
 .../perl/perl-5.12.2/native-ssp.patch              |    2 ++
 .../perl/perl-5.12.2/parallel_build_fix_1.patch    |    2 ++
 .../perl/perl-5.12.2/parallel_build_fix_2.patch    |    2 ++
 .../perl/perl-5.12.2/parallel_build_fix_3.patch    |    2 ++
 .../perl/perl-5.12.2/parallel_build_fix_4.patch    |    2 ++
 .../perl/perl-5.12.2/parallel_build_fix_5.patch    |    2 ++
 .../perl/perl-5.12.2/parallel_build_fix_6.patch    |    2 ++
 .../perl/perl-5.12.2/perl-configpm-switch.patch    |    2 ++
 .../perl/perl-5.12.2/perl-dynloader.patch          |   12 ++++++++++--
 .../perl/perl-5.12.2/perl-enable-gdbm.patch        |    2 ++
 .../perl/perl-5.12.2/perl-moreconfig.patch         |    2 ++
 meta/recipes-devtools/perl/perl_5.12.2.bb          |    2 +-
 57 files changed, 119 insertions(+), 14 deletions(-)
 delete mode 100644 meta/recipes-devtools/perl/files/libperl-5.8.3-create-libperl-soname.patch
 rename meta/recipes-devtools/perl/{files => perl-5.12.2}/Configure-multilib.patch (96%)
 rename meta/recipes-devtools/perl/{files => perl-5.12.2}/letgcc-find-errno.patch (96%)

diff --git a/meta/recipes-devtools/perl/files/libperl-5.8.3-create-libperl-soname.patch b/meta/recipes-devtools/perl/files/libperl-5.8.3-create-libperl-soname.patch
deleted file mode 100644
index 6b34ec2..0000000
--- a/meta/recipes-devtools/perl/files/libperl-5.8.3-create-libperl-soname.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.SH.orig	2003-07-10 14:59:04.000000000 -0700
-+++ Makefile.SH	2003-07-10 15:14:08.000000000 -0700
-@@ -494,7 +494,7 @@
- 	case "$useshrplib" in
- 	true)
- 		$spitshell >>Makefile <<'!NO!SUBS!'
--	$(LD) -o $@ $(SHRPLDFLAGS) perl$(OBJ_EXT) $(obj) $(libs)
-+	$(LD) -o $@ $(SHRPLDFLAGS) perl$(OBJ_EXT) $(obj) $(libs) -soname libperl.so.5
- !NO!SUBS!
- 		case "$osname" in
- 		aix)
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/09_fix_installperl.patch b/meta/recipes-devtools/perl/perl-5.12.2/09_fix_installperl.patch
index 6f2531b..cfe0047 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/09_fix_installperl.patch
+++ b/meta/recipes-devtools/perl/perl-5.12.2/09_fix_installperl.patch
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [embedded specific]
+
 Correctly identify arch-specific modules in ext/ where the .pm files
 are under lib.
 
diff --git a/meta/recipes-devtools/perl/files/Configure-multilib.patch b/meta/recipes-devtools/perl/perl-5.12.2/Configure-multilib.patch
similarity index 96%
rename from meta/recipes-devtools/perl/files/Configure-multilib.patch
rename to meta/recipes-devtools/perl/perl-5.12.2/Configure-multilib.patch
index b561b6a..6a4125b 100644
--- a/meta/recipes-devtools/perl/files/Configure-multilib.patch
+++ b/meta/recipes-devtools/perl/perl-5.12.2/Configure-multilib.patch
@@ -1,3 +1,5 @@
+Upstream-Status:Pending
+
 Index: perl-5.12.2/Configure
 ===================================================================
 --- perl-5.12.2.orig/Configure
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/Makefile.SH.patch b/meta/recipes-devtools/perl/perl-5.12.2/Makefile.SH.patch
index 39e5fee..72f1b8f 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/Makefile.SH.patch
+++ b/meta/recipes-devtools/perl/perl-5.12.2/Makefile.SH.patch
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [embedded specific]
+
 Index: perl-5.12.2/Makefile.SH
 ===================================================================
 --- perl-5.12.2.orig/Makefile.SH
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/Makefile.patch b/meta/recipes-devtools/perl/perl-5.12.2/Makefile.patch
index e7226ff..2c374ed 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/Makefile.patch
+++ b/meta/recipes-devtools/perl/perl-5.12.2/Makefile.patch
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [embedded specific]
+
 Index: perl-5.12.2/Cross/Makefile
 ===================================================================
 --- perl-5.12.2.orig/Cross/Makefile
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/asm-pageh-fix.patch b/meta/recipes-devtools/perl/perl-5.12.2/asm-pageh-fix.patch
index c972108..251beb9 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/asm-pageh-fix.patch
+++ b/meta/recipes-devtools/perl/perl-5.12.2/asm-pageh-fix.patch
@@ -1,3 +1,5 @@
+Upstream-Status:Pending
+
 Perl inclues asm/page.h in order to get the definition for getpagesize which
 has been definied in unistd.h since glibc 2.1. Some recent version of linux
 libc headers removed the asm/page.h resulting in failures here for some
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/cross-generate_uudmap.patch b/meta/recipes-devtools/perl/perl-5.12.2/cross-generate_uudmap.patch
index f6218c1..d59ad8d 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/cross-generate_uudmap.patch
+++ b/meta/recipes-devtools/perl/perl-5.12.2/cross-generate_uudmap.patch
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [embedded specific]
+
 Index: perl-5.10.1/Makefile.SH
 ===================================================================
 --- perl-5.10.1.orig/Makefile.SH	2010-02-12 19:06:17.000000000 +0300
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/arm_optim.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/arm_optim.diff
index 383df6b..c86ddc9 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/arm_optim.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/arm_optim.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 From: Niko Tyni <ntyni@debian.org>
 Description: Downgrade the optimization of sv.c on arm due to a gcc-4.4 bug
 Bug-Debian: http://bugs.debian.org/580334
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/arm_thread_stress_timeout.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/arm_thread_stress_timeout.diff
index 34b8a2c..c4b4c13 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/arm_thread_stress_timeout.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/arm_thread_stress_timeout.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 Subject: Raise the timeout of ext/threads/shared/t/stress.t to accommodate slower build hosts
 Bug-Debian: http://bugs.debian.org/501970
 
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/cpan_config_path.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/cpan_config_path.diff
index 799d15e..4a349b4 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/cpan_config_path.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/cpan_config_path.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 Subject: Set location of CPAN::Config to /etc/perl as /usr may not be writable.
 
 
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/cpan_definstalldirs.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/cpan_definstalldirs.diff
index f64af15..3e3e53f 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/cpan_definstalldirs.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/cpan_definstalldirs.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 Subject: Provide a sensible INSTALLDIRS default for modules installed from CPAN.
 
 Some modules which are included in core set INSTALLDIRS => 'perl'
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/cpanplus_config_path.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/cpanplus_config_path.diff
index 6956218..6510119 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/cpanplus_config_path.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/cpanplus_config_path.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 From: Niko Tyni <ntyni@debian.org>
 Subject: Save local versions of CPANPLUS::Config::System into /etc/perl.
     
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/cpanplus_definstalldirs.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/cpanplus_definstalldirs.diff
index 3a1e209..2ec063c 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/cpanplus_definstalldirs.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/cpanplus_definstalldirs.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 From: Niko Tyni <ntyni@debian.org>
 Subject: Configure CPANPLUS to use the site directories by default.
 Closes: 533707
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/db_file_ver.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/db_file_ver.diff
index 8d0e61b..a974d08 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/db_file_ver.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/db_file_ver.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 Subject: Remove overly restrictive DB_File version check.
 Bug-Debian: http://bugs.debian.org/340047
 
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/deprecate-with-apt.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/deprecate-with-apt.diff
index a515035..e580466 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/deprecate-with-apt.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/deprecate-with-apt.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 From: Niko Tyni <ntyni@debian.org>
 Subject: Point users to Debian packages of deprecated core modules
 Bug-Debian: http://bugs.debian.org/580034
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/devel-ppport-ia64-optim.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/devel-ppport-ia64-optim.diff
index 9e4d9cf..c656010 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/devel-ppport-ia64-optim.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/devel-ppport-ia64-optim.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 From: Niko Tyni <ntyni@debian.org>
 Subject: Work around an ICE on ia64
 Closes: 548943
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/disable-zlib-bundling.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/disable-zlib-bundling.diff
index f540067..e036dc5 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/disable-zlib-bundling.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/disable-zlib-bundling.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 From: Niko Tyni <ntyni@debian.org>
 Subject: Disable zlib bundling in Compress::Raw::Zlib
 
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/doc_info.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/doc_info.diff
index ec7eba9..2f5d9a4 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/doc_info.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/doc_info.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 Subject: Replace generic man(1) instructions with Debian-specific information.
 
 Indicate that the user needs to install the perl-doc package.
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/enc2xs_inc.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/enc2xs_inc.diff
index 227dc10..e96d53d 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/enc2xs_inc.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/enc2xs_inc.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 Subject: Tweak enc2xs to follow symlinks and ignore missing @INC directories.
 Bug-Debian: http://bugs.debian.org/290336
 
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/errno_ver.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/errno_ver.diff
index f437008..b28b4bc 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/errno_ver.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/errno_ver.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 Subject: Remove Errno version check due to upgrade problems with long-running processes.
 Bug-Debian: http://bugs.debian.org/343351
 
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/extutils_hacks.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/extutils_hacks.diff
index 9134cac..1fb635d 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/extutils_hacks.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/extutils_hacks.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 Subject: Various debian-specific ExtUtils changes
 
  * Respect umask during installation, and set as appropriate for each of
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/fakeroot.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/fakeroot.diff
index e3430ce..380955b 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/fakeroot.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/fakeroot.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 Subject: Postpone LD_LIBRARY_PATH evaluation to the binary targets.
 
 Modify the setting of LD_LIBRARY_PATH to append pre-existing values at the
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/autodie-flock.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/autodie-flock.diff
index f8908ac..1e2c1ad 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/autodie-flock.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/autodie-flock.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 From: Niko Tyni <ntyni@debian.org>
 Subject: Allow for flock returning EAGAIN instead of EWOULDBLOCK on linux/parisc
 Bug-Debian: http://bugs.debian.org/543731
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/concat-stack-corruption.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/concat-stack-corruption.diff
index 6feb840..ef21261 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/concat-stack-corruption.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/concat-stack-corruption.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 From: Niko Tyni <ntyni@debian.org>
 Subject: Fix stack pointer corruption in pp_concat() with 'use encoding'
 Bug-Debian: http://bugs.debian.org/596105
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/cpanplus-without-home.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/cpanplus-without-home.diff
index 5f85894..798b7c2 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/cpanplus-without-home.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/cpanplus-without-home.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 From: Niko Tyni <ntyni@debian.org>
 Subject: Fix CPANPLUS test failures when HOME doesn't exist
 Bug: http://rt.cpan.org/Public/Bug/Display.html?id=52988
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/h2ph-gcc-4.5.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/h2ph-gcc-4.5.diff
index c2baf2f..49d797c 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/h2ph-gcc-4.5.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/h2ph-gcc-4.5.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 Author: Robin Barker <rmbarker@cpan.org>
 Subject: h2ph fix for gcc 4.5
 Bug-Debian: http://bugs.debian.org/599933
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/hurd-ccflags.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/hurd-ccflags.diff
index b9ea677..d7b43e9 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/hurd-ccflags.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/hurd-ccflags.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 Author: Samuel Thibault <sthibault@debian.org>
 Subject: Make hints/gnu.sh append to $ccflags rather than overriding them
 Bug-Debian: http://bugs.debian.org/587901
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/lc-numeric-docs.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/lc-numeric-docs.diff
index bb5c0e8..ece4989 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/lc-numeric-docs.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/lc-numeric-docs.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 From: Niko Tyni <ntyni@debian.org>
 Subject: LC_NUMERIC documentation fixes
 Bug-Debian: http://bugs.debian.org/379329
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/lc-numeric-sprintf.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/lc-numeric-sprintf.diff
index 6a39820..b150e72 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/lc-numeric-sprintf.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/lc-numeric-sprintf.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 From: Niko Tyni <ntyni@debian.org>
 Subject: Fix sprintf not to ignore LC_NUMERIC with constants
 Bug-Debian: http://bugs.debian.org/601549
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/net_smtp_docs.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/net_smtp_docs.diff
index 6dc9712..f7b5e42 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/net_smtp_docs.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/net_smtp_docs.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 Subject: Document the Net::SMTP 'Port' option
 Bug-Debian: http://bugs.debian.org/100195
 Bug: http://rt.cpan.org/Public/Bug/Display.html?id=36038
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/processPL.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/processPL.diff
index 5a444e3..3b645d1 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/processPL.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/processPL.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 Subject: Always use PERLRUNINST when building perl modules.
 Bug-Debian: http://bugs.debian.org/357264
 Bug: http://rt.cpan.org/Public/Bug/Display.html?id=17224
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/instmodsh_doc.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/instmodsh_doc.diff
index 5670863..cfc57fa 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/instmodsh_doc.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/instmodsh_doc.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 Subject: Debian policy doesn't install .packlist files for core or vendor.
 
 
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/ld_run_path.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/ld_run_path.diff
index ffcfab9..ced1e8f 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/ld_run_path.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/ld_run_path.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 Subject: Remove standard libs from LD_RUN_PATH as per Debian policy.
 
 
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/libnet_config_path.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/libnet_config_path.diff
index 41bca97..ef0f369 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/libnet_config_path.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/libnet_config_path.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 Subject: Set location of libnet.cfg to /etc/perl/Net as /usr may not be writable.
 
 
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/m68k_thread_stress.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/m68k_thread_stress.diff
index cda6089..d27a677 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/m68k_thread_stress.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/m68k_thread_stress.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 Subject: Disable some threads tests on m68k for now due to missing TLS.
 Closes: #495826, #517938
 
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/mod_paths.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/mod_paths.diff
index bfa4721..96fe4df 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/mod_paths.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/mod_paths.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 Subject: Tweak @INC ordering for Debian
 
 Our order is:
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/module_build_man_extensions.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/module_build_man_extensions.diff
index 320a90d..bc7fd9e 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/module_build_man_extensions.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/module_build_man_extensions.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 Subject: Adjust Module::Build manual page extensions for the Debian Perl policy
 Bug-Debian: http://bugs.debian.org/479460
 
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/perlivp.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/perlivp.diff
index c63c1e8..ebe942c 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/perlivp.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/perlivp.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 From: Niko Tyni <ntyni@debian.org>
 Subject: Make perlivp skip include directories in /usr/local
 Closes: 510895
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/prune_libs.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/prune_libs.diff
index 4d73717..0f49895 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/prune_libs.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/prune_libs.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 Subject: Prune the list of libraries wanted to what we actually need.
 Bug-Debian: http://bugs.debian.org/128355
 
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/squelch-locale-warnings.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/squelch-locale-warnings.diff
index 091dec4..68c1a35 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/debian/squelch-locale-warnings.diff
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/squelch-locale-warnings.diff
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 From: Niko Tyni <ntyni@debian.org>
 Subject: Squelch locale warnings in Debian package maintainer scripts
 Bug-Debian: http://bugs.debian.org/508764
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/generate-sh.patch b/meta/recipes-devtools/perl/perl-5.12.2/generate-sh.patch
index ceb7419..47f91c5 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/generate-sh.patch
+++ b/meta/recipes-devtools/perl/perl-5.12.2/generate-sh.patch
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [embedded specific]
+
 Use the ld flags from the supplied configuration file. For sh we need the
 flags that specify to build PIC code so that the shared libraries work.
 
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/installperl.patch b/meta/recipes-devtools/perl/perl-5.12.2/installperl.patch
index d20961c..276eb3d 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/installperl.patch
+++ b/meta/recipes-devtools/perl/perl-5.12.2/installperl.patch
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [embedded specific]
+
 Index: perl-5.12.2/installperl
 ===================================================================
 --- perl-5.12.2.orig/installperl
diff --git a/meta/recipes-devtools/perl/files/letgcc-find-errno.patch b/meta/recipes-devtools/perl/perl-5.12.2/letgcc-find-errno.patch
similarity index 96%
rename from meta/recipes-devtools/perl/files/letgcc-find-errno.patch
rename to meta/recipes-devtools/perl/perl-5.12.2/letgcc-find-errno.patch
index 47f972d..268cb53 100644
--- a/meta/recipes-devtools/perl/files/letgcc-find-errno.patch
+++ b/meta/recipes-devtools/perl/perl-5.12.2/letgcc-find-errno.patch
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [embedded specific]
+
 This removes all the logic that perl uses to locate an appropriate
 errno.h for the target. Instead we simple create a file that does
 
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/native-nopacklist.patch b/meta/recipes-devtools/perl/perl-5.12.2/native-nopacklist.patch
index 92b02d4..8d5b819 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/native-nopacklist.patch
+++ b/meta/recipes-devtools/perl/perl-5.12.2/native-nopacklist.patch
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [debian patch]
+
 Part of 52_debian_extutils_hacks.patch just to exclude the installation of .packlist files
 
 Index: perl-5.12.2/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/native-perlinc.patch b/meta/recipes-devtools/perl/perl-5.12.2/native-perlinc.patch
index bf145ba..ffaf326 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/native-perlinc.patch
+++ b/meta/recipes-devtools/perl/perl-5.12.2/native-perlinc.patch
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [embedded specific]
+
 Index: perl-5.8.8/lib/ExtUtils/MM_Unix.pm
 ===================================================================
 --- perl-5.12.2.orig/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm	2008-10-31 22:01:35.000000000 +0000
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/native-ssp.patch b/meta/recipes-devtools/perl/perl-5.12.2/native-ssp.patch
index 1c825f5..e1e6f08 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/native-ssp.patch
+++ b/meta/recipes-devtools/perl/perl-5.12.2/native-ssp.patch
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [embedded specific]
+
 Fix for compiling with ssp enabled gcc:
 See http://bugs.openembedded.net/show_bug.cgi?id=1980
 
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_1.patch b/meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_1.patch
index 63e6410..d5a6295 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_1.patch
+++ b/meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_1.patch
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [Backport]
+
 Imported from perl git tree by Nitin A Kamble <nitin.a.kamble@intel.com>
 2011-02-23
 
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_2.patch b/meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_2.patch
index 6c536dd..a3432ab 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_2.patch
+++ b/meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_2.patch
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [Backport]
+
 Imported from perl git tree by Nitin A Kamble <nitin.a.kamble@intel.com>
 2011-02-23
 
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_3.patch b/meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_3.patch
index a74a45d..26af1f1 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_3.patch
+++ b/meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_3.patch
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [Backport]
+
 Imported from perl git tree by Nitin A Kamble <nitin.a.kamble@intel.com>
 2011-02-23
 
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_4.patch b/meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_4.patch
index 1a047bc..98bf074 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_4.patch
+++ b/meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_4.patch
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [Backport]
+
 commit 43c0c913165d6abe1bc0cb45a784eb1c32c3700b
 Author: Nicholas Clark <nick@ccl4.org>
 Date:   Mon Feb 14 09:06:42 2011 +0000
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_5.patch b/meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_5.patch
index abc1922..70f7104 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_5.patch
+++ b/meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_5.patch
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [Backport]
+
 Rebased by Nitin A Kamble <nitin.a.kamble@intel.com> on 3/11/2011
 
 commit 5e4c4c91bd52a48de59520d5e9b4e3478e49c613
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_6.patch b/meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_6.patch
index 0520c30..cacf9fa 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_6.patch
+++ b/meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_6.patch
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [Backport]
+
 Rebased by Nitin A Kamble <nitin.a.kamble@intel.com> on 3/11/2011
 
 commit 7353f64c5bca6e7102582a1e0017c850930249c3
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/perl-configpm-switch.patch b/meta/recipes-devtools/perl/perl-5.12.2/perl-configpm-switch.patch
index ac519a0..9e9f342 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/perl-configpm-switch.patch
+++ b/meta/recipes-devtools/perl/perl-5.12.2/perl-configpm-switch.patch
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [native]
+
 This patch is used for perl-native only. It enables the switching of
 configuration files between Config_heavy.pl and
 Config_heavy-target.pl by setting the environment variables
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/perl-dynloader.patch b/meta/recipes-devtools/perl/perl-5.12.2/perl-dynloader.patch
index 061a823..21d8bb9 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/perl-dynloader.patch
+++ b/meta/recipes-devtools/perl/perl-5.12.2/perl-dynloader.patch
@@ -1,11 +1,15 @@
+Upstream-Status:Inappropriate [embedded specific]
+
 Allow the location that .so files are searched for for dynamic
 loading to be changed via an environment variable. This is to allow
 us to load .so's from the host system while building for the target
 system.
 
+Update by Nitin A Kamble <nitin.a.kamble@intel.com> 2011/04/21
+
 --- perl-5.12.2/dist/XSLoader/XSLoader_pm.PL	2007/04/20 09:03:08	1.1
 +++ perl-5.12.2/dist/XSLoader/XSLoader_pm.PL	2007/04/20 09:03:08
-@@ -65,6 +65,15 @@
+@@ -65,6 +65,19 @@
  print OUT <<'EOT';
      my $modpname = join('/',@modparts);
      my $modlibname = (caller())[1];
@@ -15,7 +19,11 @@ system.
 +    {
 +        my $hostlib = $ENV{PERLHOSTLIB};
 +        print STDERR "*** Module name IN: $modlibname\n";
-+        $modlibname =~ s#(?<!/)(\.\./)*lib/#$hostlib#g;
++        ($p1, $p2, $p3, $p4, $p5) = $modlibname =~ m/(^(.*lib\/)?)((perl\/[0-9\.]*\/)?)(.*)$/;
++        print STDERR "*** p1: $p1  p3: $p3  p5: $p5\n";
++        if ( $p1 ne "" ) {
++            $modlibname = $hostlib.$p5;
++        }
 +        print STDERR "*** Module name OUT: $modlibname\n";
 +    }
      my $c = @modparts;
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/perl-enable-gdbm.patch b/meta/recipes-devtools/perl/perl-5.12.2/perl-enable-gdbm.patch
index c0874c3..aa83fca 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/perl-enable-gdbm.patch
+++ b/meta/recipes-devtools/perl/perl-5.12.2/perl-enable-gdbm.patch
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [embedded specific]
+
 Index: perl-5.8.8/config_h.SH
 ===================================================================
 --- perl-5.8.8.orig/config_h.SH	2005-11-01 02:13:05.000000000 +0800
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/perl-moreconfig.patch b/meta/recipes-devtools/perl/perl-5.12.2/perl-moreconfig.patch
index 590c725..59ce85a 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/perl-moreconfig.patch
+++ b/meta/recipes-devtools/perl/perl-5.12.2/perl-moreconfig.patch
@@ -1,3 +1,5 @@
+Upstream-Status:Inappropriate [embedded specific]
+
 We need ld in the fake config library, but it's not included by default. So
 expand the number of items included. While this works it indicates that the
 rest of the config items are not being picked up and/or are being picked up
diff --git a/meta/recipes-devtools/perl/perl_5.12.2.bb b/meta/recipes-devtools/perl/perl_5.12.2.bb
index 184e1e7..9ce8156 100644
--- a/meta/recipes-devtools/perl/perl_5.12.2.bb
+++ b/meta/recipes-devtools/perl/perl_5.12.2.bb
@@ -8,7 +8,7 @@ PRIORITY = "optional"
 # We need gnugrep (for -I)
 DEPENDS = "virtual/db perl-native-${PV} grep-native"
 DEPENDS += "gdbm zlib"
-PR = "r3"
+PR = "r4"
 
 # 5.10.1 has Module::Build built-in
 PROVIDES += "libmodule-build-perl"
-- 
1.7.1.1

[PATCH 27/37] cpan.bbclass: export PERLHOSTLIB for perl modules

[Saul Wold]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

This makes sure that native perl .so can get loaded at the buildtime, and
avoids following kind of errors while building perl modules:

Nitin A Kamble <nitin.a.kamble@intel.com> 2011/04/20

+ perl Makefile.PL
EXPATLIBPATH=/disk0/pokybuild/build0/tmp/sysroots/qemux86/usr/lib
EXPATINCPATH=/disk0/pokybuild/build0/tmp/sysroots/qemux86/usr/include
*** Module name IN:
/disk0/pokybuild/build0/tmp/sysroots/qemux86/usr/lib/perl/5.12.2/Cwd.pm
*** Module name OUT:
/disk0/pokybuild/build0/tmp/sysroots/qemux86/usr/lib/perl/5.12.2/Cwd.pm
*** Module name IN:
/disk0/pokybuild/build0/tmp/sysroots/qemux86/usr/lib/perl/5.12.2/Fcntl.pm
*** Module name OUT:
/disk0/pokybuild/build0/tmp/sysroots/qemux86/usr/lib/perl/5.12.2/Fcntl.pm
Can't load
'/disk0/pokybuild/build0/tmp/sysroots/qemux86/usr/lib/perl/5.12.2/auto/Fcntl/Fcntl.so'
for module Fcntl:
/disk0/pokybuild/build0/tmp/sysroots/qemux86/usr/lib/perl/5.12.2/auto/Fcntl/Fcntl.so:
wrong ELF class: ELFCLASS32 at
/disk0/pokybuild/build0/tmp/sysroots/qemux86/usr/lib/perl/5.12.2/XSLoader.pm
line 79.
 at
/disk0/pokybuild/build0/tmp/sysroots/qemux86/usr/lib/perl/5.12.2/Fcntl.pm
line 215
BEGIN failed--compilation aborted at
/disk0/pokybuild/build0/tmp/sysroots/qemux86/usr/lib/perl/5.12.2/Fcntl.pm
line 216.
Compilation failed in require at
/disk0/pokybuild/build0/tmp/sysroots/qemux86/usr/lib/perl/5.12.2/File/Temp.pm
line 146.
BEGIN failed--compilation aborted at
/disk0/pokybuild/build0/tmp/sysroots/qemux86/usr/lib/perl/5.12.2/File/Temp.pm
line 146.
Compilation failed in require at inc/Devel/CheckLib.pm line 12.
BEGIN failed--compilation aborted at inc/Devel/CheckLib.pm line 12.
Compilation failed in require at Makefile.PL line 5.
BEGIN failed--compilation aborted at Makefile.PL line 5.
ERROR: Function 'do_configure' failed (see
/disk0/pokybuild/build0/tmp/work/i586-poky-linux/libxml-parser-perl-2.40-r0/temp/log.do_configure.16956
for further information)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 meta/classes/cpan.bbclass |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/classes/cpan.bbclass b/meta/classes/cpan.bbclass
index 1cfd022..9b8431b 100644
--- a/meta/classes/cpan.bbclass
+++ b/meta/classes/cpan.bbclass
@@ -13,6 +13,7 @@ export PERLCONFIGTARGET = "${@is_target(d)}"
 export PERL_INC = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}/CORE"
 export PERL_LIB = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}"
 export PERL_ARCHLIB = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}"
+export PERLHOSTLIB = "${STAGING_LIBDIR_NATIVE}/perl/${@get_perl_version(d)}/"
 
 cpan_do_configure () {
 	export PERL5LIB="${PERL_ARCHLIB}"
-- 
1.7.1.1

[PATCH 28/37] libxml-parser-perl: upgrade from 2.36 to 2.40

[Saul Wold]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

---
 ...e_2.36.bb => libxml-parser-perl-native_2.40.bb} |    0
 ...ser-perl_2.36.bb => libxml-parser-perl_2.40.bb} |    8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/perl/{libxml-parser-perl-native_2.36.bb => libxml-parser-perl-native_2.40.bb} (100%)
 rename meta/recipes-devtools/perl/{libxml-parser-perl_2.36.bb => libxml-parser-perl_2.40.bb} (61%)

diff --git a/meta/recipes-devtools/perl/libxml-parser-perl-native_2.36.bb b/meta/recipes-devtools/perl/libxml-parser-perl-native_2.40.bb
similarity index 100%
rename from meta/recipes-devtools/perl/libxml-parser-perl-native_2.36.bb
rename to meta/recipes-devtools/perl/libxml-parser-perl-native_2.40.bb
diff --git a/meta/recipes-devtools/perl/libxml-parser-perl_2.36.bb b/meta/recipes-devtools/perl/libxml-parser-perl_2.40.bb
similarity index 61%
rename from meta/recipes-devtools/perl/libxml-parser-perl_2.36.bb
rename to meta/recipes-devtools/perl/libxml-parser-perl_2.40.bb
index 3287d26..c2d1bdb 100644
--- a/meta/recipes-devtools/perl/libxml-parser-perl_2.36.bb
+++ b/meta/recipes-devtools/perl/libxml-parser-perl_2.40.bb
@@ -1,14 +1,14 @@
 SECTION = "libs"
 LICENSE = "Artistic"
-LIC_FILES_CHKSUM = "file://README;endline=6;md5=fa7bbbd54d37d6ecf4ef33b7c98b9cd7"
+LIC_FILES_CHKSUM = "file://README;beginline=2;endline=6;md5=c8767d7516229f07b26e42d1cf8b51f1"
 DEPENDS += "expat expat-native"
 
-PR = "r1"
+PR = "r0"
 
 SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "1b868962b658bd87e1563ecd56498ded"
-SRC_URI[sha256sum] = "9fd529867402456bd826fe0e5588d35b3a2e27e586a2fd838d1352b71c2ed73f"
+SRC_URI[md5sum] = "c66e9adba003d0667cc40115ccd837a5"
+SRC_URI[sha256sum] = "e5e433684e799ef7b6b852c0ca31b71054717628555444d3dc9fceac0df71512"
 
 S = "${WORKDIR}/XML-Parser-${PV}"
 
-- 
1.7.1.1

[PATCH 29/37] distro_tracking: recipe information update

[Saul Wold]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../conf/distro/include/distro_tracking_fields.inc |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 4598f3c..e7201b0 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -91,6 +91,7 @@ RECIPE_MAINTAINER_pn-minicom = "Dongxiao Xu <dongxiao.xu@intel.com>"
 RECIPE_STATUS_pn-patch = "green"
 RECIPE_LATEST_VERIONS_pn-patch = "2.6.1"
 RECIPE_LAST_UPDATE_pn-patch = "Dec 7, 2010"
+RECIPE_MANUAL_CHECK_DATE_pn-patch = "Apr 7, 2011" 
 RECIPE_MAINTAINER_pn-patch = "Nitin A Kamble <nitin.a.kamble@intel.com>"
 
 RECIPE_STATUS_pn-python-imaging = "green"
@@ -2876,11 +2877,13 @@ RECIPE_STATUS_pn-fstests="green"
 RECIPE_LATEST_VERSION_pn-fstests="0.0+svnr426"
 DISTRO_PN_ALIAS_pn-fstests = "OpenedHand"
 RECIPE_LAST_UPDATE_pn-fstests = "Dec 7, 2010"
+RECIPE_MANUAL_CHECK_DATE_pn-fstests = "Apr 7, 2011" 
 RECIPE_MAINTAINER_pn-fstests = "Nitin A Kamble <nitin.a.kamble@intel.com>"
 
 RECIPE_STATUS_pn-gdb="green" 
 RECIPE_LATEST_VERSION_pn-gdb="7.2"
 RECIPE_LAST_UPDATE_pn-gdb = "Nov 8, 2010"
+RECIPE_MANUAL_CHECK_DATE_pn-gdb = "Apr 7, 2011" 
 RECIPE_MAINTAINER_pn-gdb = "Nitin A Kamble <nitin.a.kamble@intel.com>"
 
 RECIPE_STATUS_pn-intltool="green" 
@@ -2914,7 +2917,7 @@ RECIPE_MAINTAINER_pn-postinsts = "Nitin A Kamble <nitin.a.kamble@intel.com>"
 
 RECIPE_STATUS_pn-nasm="green" 
 RECIPE_LATEST_VERSION_pn-nasm="2.07"
-RECIPE_MANUAL_CHECK_DATE_pn-nasm = "Jan 25, 2011" 
+RECIPE_MANUAL_CHECK_DATE_pn-nasm = "Apr 7, 2011" 
 RECIPE_MAINTAINER_pn-nasm = "Nitin A Kamble <nitin.a.kamble@intel.com>"
 
 RECIPE_STATUS_pn-perl="red" # upgrade needed
@@ -3000,7 +3003,7 @@ RECIPE_MAINTAINER_pn-gnu-config = "Nitin A Kamble <nitin.a.kamble@intel.com>"
 
 RECIPE_STATUS_pn-mpfr="green"
 RECIPE_LATEST_VERSION_pn-mpfr="3.0.0"
-RECIPE_MANUAL_CHECK_DATE_pn-mpfr = "Jan 25, 2011" 
+RECIPE_MANUAL_CHECK_DATE_pn-mpfr = "Apr 7, 2011" 
 RECIPE_MAINTAINER_pn-mpfr = "Nitin A Kamble <nitin.a.kamble@intel.com>"
 
 RECIPE_STATUS_pn-gmp="green"
-- 
1.7.1.1

[PATCH 30/37] qemu-helper-nativesdk: Update LIC_FILE_CHKSUM for renamed helper

[Saul Wold]

From: Saul Wold <sgw@linux.intel.com>

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../qemu/qemu-helper-nativesdk_1.0.bb              |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb b/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb
index 15f872b..a3dca3d 100644
--- a/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb
+++ b/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb
@@ -6,7 +6,7 @@ PR = "r9"
 FILESPATH = "${FILE_DIRNAME}/qemu-helper"
 
 LIC_FILES_CHKSUM = "file://${WORKDIR}/tunctl.c;endline=4;md5=ff3a09996bc5fff6bc5d4e0b4c28f999 \
-                    file://${COREBASE}/scripts/runqemu;endline=18;md5=ce52af3dd295e20ad1d849611b83690b"
+                    file://${COREBASE}/scripts/runqemu;endline=18;md5=77fbe442a88b1bcdc29c3ba67733b21b"
 
 
 SRC_URI = "file://${COREBASE}/scripts/runqemu \
-- 
1.7.1.1

[PATCH 31/37] lsbsetup: add some workaround for LSB tests

[Saul Wold]

From: Kang Kai <kai.kang@windriver.com>

Add some workaround for LSB libstdcpp and tcl tests.
Recreate locales for libstdcpp test, and resolve localhost is for
tcl test [Yocto 898]
Bump PR, update LICENSE information and installed file mode

Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
 meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh |   15 ++++++++++++++-
 meta/recipes-extended/lsb/lsbsetup_0.9.bb       |    8 ++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh b/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh
index 7ce823e..a8189e5 100644
--- a/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh
+++ b/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2005-2010 Wind River Systems, Inc.
+# Copyright (C) 2010-2011 Wind River Systems, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
@@ -201,6 +201,19 @@ fi
 addr=`ifconfig eth0 | grep "inet addr" | awk -F: '{print $2}'|sed s/[[:space:]][[:space:]]Bcast//g`
 echo -e "you should input ${addr}:8888 on your browser"
 
+#workaround to add part of locales for LSB test
+localedef -i ja_JP -f EUC-JP ja_JP.eucjp
+localedef -i en_US -f ISO-8859-15  en_US.ISO-8859-15
+localedef -i en_US -f UTF-8 en_US.UTF-8
+localedef -i se_NO -f UTF-8 se_NO.UTF-8
+localedef -i de_DE -f ISO-8859-1 de_DE
+
+#resolve localhost 
+LOCALHOST=`hostname`
+if ! `grep -F -q "$LOCALHOST" /etc/hosts`; then
+    echo "127.0.0.1 $LOCALHOST" >> /etc/hosts
+fi
+
 #Step 10
 echo "Done!!"
 
diff --git a/meta/recipes-extended/lsb/lsbsetup_0.9.bb b/meta/recipes-extended/lsb/lsbsetup_0.9.bb
index 8cbaf1e..5fd0584 100644
--- a/meta/recipes-extended/lsb/lsbsetup_0.9.bb
+++ b/meta/recipes-extended/lsb/lsbsetup_0.9.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "auto-setup environment for lsb test"
 SECTION = "console/utils"
 PRIORITY = "required"
 LICENSE = "GPLv2"
-PR = "r0"
+PR = "r1"
 
-LIC_FILES_CHKSUM = "file://LSB_Setup.sh;md5=7391be3e70a02d44e1b183fa103b0585"
+LIC_FILES_CHKSUM = "file://LSB_Setup.sh;beginline=3;endline=16;md5=97451c7c0786ce5bbe9ac58042945583"
 
 SRC_URI = "file://LSB_Setup.sh"
 
@@ -12,6 +12,6 @@ S=${WORKDIR}
 
 do_install() {
         # Only install file if it has a contents
-	install -d ${D}/usr/bin
-        install -m 0644 ${S}/LSB_Setup.sh ${D}/usr/bin
+        install -d ${D}/usr/bin
+        install -m 0755 ${S}/LSB_Setup.sh ${D}/usr/bin
 }
-- 
1.7.1.1

[PATCH 32/37] pcmciautils: Upgrade 017 -> 018

[Saul Wold]

From: Khem Raj <raj.khem@gmail.com>

version workaround is done in recipe itself
by adding PV to CFLAGS

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../pcmciautils-017/version_workaround.patch       |   16 -------------
 .../makefile_fix.patch                             |   24 ++++++++++----------
 meta/recipes-bsp/pcmciautils/pcmciautils.inc       |    1 +
 meta/recipes-bsp/pcmciautils/pcmciautils_017.bb    |   12 ----------
 meta/recipes-bsp/pcmciautils/pcmciautils_018.bb    |   11 +++++++++
 5 files changed, 24 insertions(+), 40 deletions(-)
 delete mode 100644 meta/recipes-bsp/pcmciautils/pcmciautils-017/version_workaround.patch
 rename meta/recipes-bsp/pcmciautils/{pcmciautils-017 => pcmciautils-018}/makefile_fix.patch (89%)
 delete mode 100644 meta/recipes-bsp/pcmciautils/pcmciautils_017.bb
 create mode 100644 meta/recipes-bsp/pcmciautils/pcmciautils_018.bb

diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils-017/version_workaround.patch b/meta/recipes-bsp/pcmciautils/pcmciautils-017/version_workaround.patch
deleted file mode 100644
index 57efa68..0000000
--- a/meta/recipes-bsp/pcmciautils/pcmciautils-017/version_workaround.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-PCMCIAUTILS_VERSION is specified on the commandline but doesn't compile properly 
-under arm gcc 3.4.x so we work around it.
-
-Index: pcmciautils-013/src/pccardctl.c
-===================================================================
---- pcmciautils-013.orig/src/pccardctl.c	2006-03-26 11:56:41.000000000 +0100
-+++ pcmciautils-013/src/pccardctl.c	2006-05-09 22:11:09.000000000 +0100
-@@ -350,7 +350,7 @@
- }
- 
- static void print_header(void) {
--	printf("pcmciautils %s\n", PCMCIAUTILS_VERSION);
-+	printf("pcmciautils 017\n");
- 	printf("Copyright (C) 2004-2005 Dominik Brodowski, (C) 1999 David A. Hinds\n");
- 	printf("Report errors and bugs to <linux-pcmcia@lists.infradead.org>, please.\n");
- }
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils-017/makefile_fix.patch b/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_fix.patch
similarity index 89%
rename from meta/recipes-bsp/pcmciautils/pcmciautils-017/makefile_fix.patch
rename to meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_fix.patch
index 82dbfa8..81269c9 100644
--- a/meta/recipes-bsp/pcmciautils/pcmciautils-017/makefile_fix.patch
+++ b/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_fix.patch
@@ -1,16 +1,16 @@
-rebase the patch to 017, removing hardcoded path for true
+Hardcoded paths are bad...
+This lets us use the install from OE's native sysroot
+rebase the patch to 018, removing hardcoded path for true
 as well. Removing of -D in install invocation is a little
 questionable, is it some GNU extention?
 
-07/14/2010 - qhe, original patch note follows
-
-Hardcoded paths are bad...
+-Khem Raj <raj.khem@gmail.com>
 
-diff --git a/Makefile b/Makefile
-index 26f3e4b..31f0cdf 100644
---- a/Makefile
-+++ b/Makefile
-@@ -69,7 +69,7 @@ sbindir =	${exec_prefix}/sbin
+Index: pcmciautils-018/Makefile
+===================================================================
+--- pcmciautils-018.orig/Makefile
++++ pcmciautils-018/Makefile
+@@ -76,7 +76,7 @@ sbindir =	${exec_prefix}/sbin
  mandir =	${prefix}/usr/share/man
  udevdir =	${prefix}/lib/udev
  
@@ -19,7 +19,7 @@ index 26f3e4b..31f0cdf 100644
  INSTALL_PROGRAM = ${INSTALL}
  INSTALL_DATA  = ${INSTALL} -m 644
  INSTALL_SCRIPT = ${INSTALL_PROGRAM}
-@@ -171,7 +171,7 @@ endif
+@@ -180,7 +180,7 @@ endif
  # if DEBUG is enabled, then we do not strip or optimize
  ifeq ($(strip $(DEBUG)),true)
  	CFLAGS  += -O1 -g -DDEBUG -D_GNU_SOURCE
@@ -28,7 +28,7 @@ index 26f3e4b..31f0cdf 100644
  else
  	CFLAGS  += $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE
  	STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
-@@ -264,30 +264,32 @@ clean:
+@@ -273,30 +273,32 @@ clean:
  
  install-hotplug:
  	$(INSTALL) -d $(DESTDIR)$(hotplugdir)
@@ -68,7 +68,7 @@ index 26f3e4b..31f0cdf 100644
  
  uninstall-tools:
  	- rm -f $(DESTDIR)$(sbindir)/$(PCCARDCTL)
-@@ -296,22 +298,24 @@ uninstall-tools:
+@@ -305,22 +307,24 @@ uninstall-tools:
  
  install-config:
  	$(INSTALL) -d $(DESTDIR)$(pcmciaconfdir)
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils.inc b/meta/recipes-bsp/pcmciautils/pcmciautils.inc
index 260cccb..410fa5d 100644
--- a/meta/recipes-bsp/pcmciautils/pcmciautils.inc
+++ b/meta/recipes-bsp/pcmciautils/pcmciautils.inc
@@ -22,6 +22,7 @@ export udevrulesdir = "${sysconfdir}/udev/rules.d"
 export UDEV = "1"
 LD = "${CC}"
 CFLAGS =+ "-I${S}/src"
+CFLAGS =+ -DPCMCIAUTILS_VERSION=\'${PV}\'
 
 PARALLEL_MAKE = ""
 EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs' 'LEX=flex'"
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils_017.bb b/meta/recipes-bsp/pcmciautils/pcmciautils_017.bb
deleted file mode 100644
index ff67f7b..0000000
--- a/meta/recipes-bsp/pcmciautils/pcmciautils_017.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require pcmciautils.inc
-
-PR = "r0"
-
-SRC_URI += "file://makefile_fix.patch \
-            file://version_workaround.patch"
-
-SRC_URI[md5sum] = "5245af28eeba57ec0606a874d44d10f7"
-SRC_URI[sha256sum] = "2045f0e8f837f44aed72ac91c1a8cf3b899caf098a25d04f47982be6386bd4e1"
-
-FILES_${PN}-dbg += "${libdir}/udev/.debug"
-FILES_${PN} += "${libdir}/udev"
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb b/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
new file mode 100644
index 0000000..202437a
--- /dev/null
+++ b/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
@@ -0,0 +1,11 @@
+require pcmciautils.inc
+
+SRC_URI += "file://makefile_fix.patch"
+
+SRC_URI[md5sum] = "5d85669b3440baa4532363da6caaf1b4"
+SRC_URI[sha256sum] = "79e6ae441278e178c07501d492394ed2c0326fdb66894f6d040ec811b0dc8ed5"
+
+PR = "r0"
+
+FILES_${PN}-dbg += "${libdir}/udev/.debug"
+FILES_${PN} += "${libdir}/udev"
-- 
1.7.1.1

[PATCH 33/37] gconf-dbus: add SRCREV to recipe

[Saul Wold]

From: Martin Jansa <Martin.Jansa@gmail.com>

* taken from meta/conf/distro/include/poky-default-revisions.inc for
  those who want gconf-dbus and are not using poky

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-gnome/gnome/gconf-dbus_svn.bb |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-gnome/gnome/gconf-dbus_svn.bb b/meta/recipes-gnome/gnome/gconf-dbus_svn.bb
index 9fdd82c..04908c3 100644
--- a/meta/recipes-gnome/gnome/gconf-dbus_svn.bb
+++ b/meta/recipes-gnome/gnome/gconf-dbus_svn.bb
@@ -10,6 +10,7 @@ RPROVIDES_${PN}-dev = "gconf-dev"
 
 PV = "2.16.0+svnr${SRCPV}"
 
+SRCREV = "705"
 SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http"
 S = "${WORKDIR}/trunk"
 
-- 
1.7.1.1

[PATCH 34/37] xf86-video-omapfb: add SRCREV to recipe

[Saul Wold]

From: Martin Jansa <Martin.Jansa@gmail.com>

* taken from meta/conf/distro/include/poky-default-revisions.inc for
  those who want xf86-video-omapfb and are not using poky

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../xorg-driver/xf86-video-omapfb_git.bb           |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
index 2714786..5281665 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
@@ -13,6 +13,7 @@ PE = "1"
 PR = "r1"
 PV = "0.1.1+git${SRCPV}"
 
+SRCREV = "044617665d6737f4909aab96f91b06261dff05d2"
 SRC_URI = "git://git.pingu.fi/xf86-video-omapfb.git;protocol=http \
             file://omap-revert-set-CRTC-limit.patch \
             file://omap-revert-set-virtual-size.patch \
-- 
1.7.1.1

[PATCH 35/37] task-base: allow distribution to define apm provider

[Saul Wold]

From: Martin Jansa <Martin.Jansa@gmail.com>

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-core/tasks/task-base.bb |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb
index 599fa4b..af49153 100644
--- a/meta/recipes-core/tasks/task-base.bb
+++ b/meta/recipes-core/tasks/task-base.bb
@@ -179,8 +179,11 @@ RDEPENDS_task-base-acpi = "\
     acpid \
     libacpi "
 
+# Distro can override apm provider
+DISTRO_APM ?= "apm"
+
 RDEPENDS_task-base-apm = "\
-    apm \
+    ${DISTRO_APM} \
     apmd"
 
 RDEPENDS_task-base-ext2 = "\
-- 
1.7.1.1

[PATCH 36/37] librsvg 2.32.1: fix postinst script

[Saul Wold]

From: Koen Kooi <koen@dominion.thruhere.net>

The symptom:

root@pandaboard-core:~# sh /var/lib/opkg/info/librsvg-2-gtk.postinst
g_module_open() failed for /home/root/--update-cache: /home/root/--update-cache.so: cannot open shared object file: No such file or directory
root@pandaboard-core:~#

the gdk-pixbuf-query-loaders app doesn't support arguments, only .so names, so remove --update-cache

Also being fixed:

* loader libdir
* redirect output to /etc/gtk-2.0/gdk-pixbuf.loaders

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-gnome/librsvg/librsvg_2.32.1.bb |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
index ea9456d..56c8800 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 SECTION = "x11/utils"
 DEPENDS = "gtk+ libcroco cairo libxml2 popt"
 
-PR = "r0"
+PR = "r2"
 
 inherit autotools pkgconfig gnome
 
@@ -43,6 +43,12 @@ if [ "x$D" != "x" ]; then
   exit 1
 fi
 
-test -x ${bindir}/gdk-pixbuf-query-loaders && { GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/2.10.0/loaders gdk-pixbuf-query-loaders --update-cache ; }
+if [ -d ${libdir}/gtk-2.0/2.10.0/loaders ] ; then
+	export GDK_PIXBUF_MODULEDIR=${libdir}/gtk-2.0/2.10.0/loaders
+else
+	export GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/2.10.0/loaders
+fi
+
+test -x ${bindir}/gdk-pixbuf-query-loaders && gdk-pixbuf-query-loaders > ${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
 test -x ${bindir}/gtk-update-icon-cache && gtk-update-icon-cache  -q ${datadir}/icons/hicolor
 }
-- 
1.7.1.1

[PATCH 37/37] create-lsb-image:Rename creat-lsb-image and fix some bugs

[Saul Wold]

From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

Rename creat-lsb-image to create-lsb-image
Fix some fuctions for more practical
---
 scripts/creat-lsb-image  |  198 ----------------------------------------
 scripts/create-lsb-image |  228 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 228 insertions(+), 198 deletions(-)
 delete mode 100755 scripts/creat-lsb-image
 create mode 100755 scripts/create-lsb-image

diff --git a/scripts/creat-lsb-image b/scripts/creat-lsb-image
deleted file mode 100755
index 657784c..0000000
--- a/scripts/creat-lsb-image
+++ /dev/null
@@ -1,198 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2005-2010 Wind River Systems, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-red='\E[31;40m'
-green='\E[32;40m'
-USER=`whoami`
-ARCH=$1
-MACHINE_ARCH=` bitbake -e | grep ^MACHINE_ARCH | cut -d '=' -f2 | cut -d '"' -f2`
-IMAGE_PATH=` bitbake -e | grep ^COREBASE | cut -d '=' -f2 | cut -d '"' -f2`/build/tmp/deploy/images/
-
-
-ECHO()
-{
-    echo -e "${green}$@"
-    tput sgr0
-}
-
-exit_check()
-{
-    if [ ! $? -eq 0 ]; then
-        exit $?
-    fi
-}
-
-usage()
-{
-    ECHO "${red}usage:you should input one of the next commmands according to detailed target platform:"
-    ECHO "creat-lsb-image x86"
-    ECHO "creat-lsb-image x86_64"
-    ECHO "creat-lsb-image ppc32"
-}
-
-#There should be a patameter to get machine type
-if [ $# -ne 1 ]; then
-    usage
-    exit 1
-fi
-
-#check lsb image
-if [ ! -d $IMAGE_PATH ];then
-    ECHO "${red}There isn't image directory"
-    exit 1
-fi
-ECHO "Enter directory $IMAGE_PATH"
-cd $IMAGE_PATH
-
-#get architecture
-PN=`find . -name core-image-lsb-${MACHINE_ARCH}\*.rootfs.tar.bz2 -type f | awk -F- 'BEGIN{ max=0;} {if( NR!=0 && $5>max ) max=$5 }END{ printf "%d" ,max ;}'`
-if [ "XPN" == "X" ];then
-   ECHO "${red}Don't find lsb image on platform, Please run \"core-image-lsb\" to generate lsb image"
-   exit 1
-fi
-
-if [ $PN -eq 0 ];then
-	ECHO "${red}Can't ${MACHINE_ARCH} rootfs.tar.gz,Please run core-image-lsb to get lsb image"
-	exit 1
-fi
-#set varible ARCH
-if [ ${ARCH} == x86 ];then
-	T_ARCH=ia32
-    P_ARCH=i486
-elif [ ${ARCH} == x86_64 ];then
-	T_ARCH=ia64
-    P_ARCH=ia64
-else
-	P_ARCH=ppc
-	T_ARCH=${ARCH}
-fi
-
-#umount lsbtmp 
-if [ -d lsbtmp ];then
-	sudo umount lsbtmp
-fi
- 
-#download lsb test suite
-mkdir -p lsb-test-suite-${MACHINE_ARCH} 
-if [ -d lsb-test-suite-${MACHINE_ARCH} ];then
-	cd lsb-test-suite-${MACHINE_ARCH}
-	ECHO "Download lsb test suite, it could take some time..."
-    wget -c -t 5  http://ftp.linuxfoundation.org/pub/lsb/bundles/released-4.1.0/dist-testkit/lsb-dist-testkit-4.1.0-5.${T_ARCH}.tar.gz
-    exit_check
-	ECHO "Download lsb-xdg-utils-4.0.0-2.${P_ARCH}.rpm"
-	wget -c -t 5 http://ftp.linux-foundation.org/pub/lsb/lsbdev/released-4.1.0/binary/${T_ARCH}/lsb-xdg-utils-4.0.0-2.${P_ARCH}.rpm
-    exit_check
-	ECHO "Downlocad lsb-apache-2.2.8-2.lsb4.${P_ARCH}.rpm"
-	wget -c -t 5 http://ftp.linux-foundation.org/pub/lsb/app-battery/released-4.1.0/${T_ARCH}/lsb-apache-2.2.14-3.lsb4.${P_ARCH}.rpm
-    exit_check
-	ECHO "Downlocad lsb-tcl-8.5.1-2.lsb4.${P_ARCH}.rpm"
-	wget -c -t 5 http://ftp.linux-foundation.org/pub/lsb/app-battery/released-4.1.0/${T_ARCH}/lsb-tcl-8.5.7-6.lsb4.${P_ARCH}.rpm
-    exit_check
-	ECHO "Downlocad lsb-expect-5.43.0-7.lsb4.${P_ARCH}.rpm"
-	wget -c -t 5 http://ftp.linux-foundation.org/pub/lsb/app-battery/released-4.1.0/${T_ARCH}/lsb-expect-5.43.0-11.lsb4.${P_ARCH}.rpm 
-    exit_check
-	ECHO "Downlocad lsb-groff-1.19.2-4.lsb4.${P_ARCH}.rpm"
-	wget -c -t 5 http://ftp.linux-foundation.org/pub/lsb/app-battery/released-4.1.0/${T_ARCH}/lsb-groff-1.20.1-5.lsb4.${P_ARCH}.rpm  
-    exit_check
-	ECHO "Downlocad lsb-raptor-1.4.16-2.lsb4.${P_ARCH}.rpm"
-	wget -c -t 5 http://ftp.linux-foundation.org/pub/lsb/app-battery/released-4.1.0/${T_ARCH}/lsb-raptor-1.4.19-3.lsb4.${P_ARCH}.rpm 
-    exit_check
-	ECHO "Downlocad lsb-xpdf-1.01-7.lsb4.${P_ARCH}.rpm"
-	wget -c -t 5 http://ftp.linux-foundation.org/pub/lsb/app-battery/released-4.1.0/${T_ARCH}/lsb-xpdf-1.01-10.lsb4.${P_ARCH}.rpm
-    exit_check
-	ECHO "Downlocad lsb-samba-3.0.28a-3.lsb4.${P_ARCH}.rpm"
-	wget -c -t 5 http://ftp.linux-foundation.org/pub/lsb/app-battery/released-4.1.0/${T_ARCH}/lsb-samba-3.4.3-5.lsb4.${P_ARCH}.rpm 
-    exit_check
-	ECHO "Downlocad lsb-rsync-3.0.0-2.lsb4.${P_ARCH}.rpm"
-	wget -c -t 5 http://ftp.linux-foundation.org/pub/lsb/app-battery/released-4.1.0/${T_ARCH}/lsb-rsync-3.0.6-3.lsb4.${P_ARCH}.rpm
-    exit_check
-else
-	ECHO "Can't find lsb test suite for ${MACHINE_ARCH}"
-fi
-cd ..
-if [ -L core-image-lsb-${MACHINE_ARCH}.ext3 ];then
-    /bin/rm core-image-lsb-${MACHINE_ARCH}.ext3
-    exit_check
-fi
-
-#creat lsb image
-if [ -f core-image-lsb-${MACHINE_ARCH}-test.ext3 ];then
-	if [ -d lsbtmp ];then
-    	sudo umount lsbtmp
-	fi
-	ECHO "Remove old lsb image..."
-	/bin/rm core-image-lsb-${MACHINE_ARCH}-test.ext3
-fi	
-ECHO "creat a big ext3 file for lsb image with 5G..."
-dd if=/dev/zero of=core-image-lsb-${MACHINE_ARCH}-test.ext3 bs=1M count=5000
-exit_check
-ECHO "Format ext3 image,please input \"y\""
-mkfs.ext3 core-image-lsb-${MACHINE_ARCH}-test.ext3
-tune2fs -j  core-image-lsb-${MACHINE_ARCH}-test.ext3
-
-
-ECHO "get a lsb image with lsb test suite"
-if [ ! -d lsbtmp ];then
-	mkdir lsbtmp
-fi
-
-
-#install file system and lsb test suite to lsb image
-sudo mount -o loop core-image-lsb-${MACHINE_ARCH}-test.ext3 lsbtmp
-exit_check
-
-ECHO "  ->Install file system..."
-sudo tar jxf core-image-lsb-${MACHINE_ARCH}-${PN}.rootfs.tar.bz2 -C lsbtmp
-exit_check
-
-ECHO "  ->Install lsb test suite..."
-cd lsb-test-suite-${MACHINE_ARCH}
-sudo tar zxf lsb-dist-testkit-4.1.0-5.${T_ARCH}.tar.gz -C ../lsbtmp
-exit_check
-sudo mkdir ../lsbtmp/lsb-Application
-sudo cp *.rpm ../lsbtmp/lsb-Application
-exit_check
-cd ..
-
-if [ -f modules-*-${MACHINE_ARCH}.tgz ];then
-ECHO "  ->Install moules of driver..."	
-	sudo tar zxf modules-*-${MACHINE_ARCH}.tgz -C lsbtmp/
-fi
-
-
-#unmount lsbtmp
-sudo umount lsbtmp
-exit_check
-sudo rm -rf lsbtmp
-
-#change file attribute
-sudo chown ${USER}:${USER} core-image-lsb-${MACHINE_ARCH}-test.ext3 
-exit_check
-sudo chmod 755 core-image-lsb-${MACHINE_ARCH}-test.ext3
-exit_check
-
-#set up link
-if [ -L core-image-lsb-${MACHINE_ARCH}.ext3 ];then
-ECHO "Set up link"
-    /bin/rm core-image-lsb-${MACHINE_ARCH}.ext3
-    exit_check
-fi
-ln -s core-image-lsb-${MACHINE_ARCH}-test.ext3 core-image-lsb-${MACHINE_ARCH}.ext3
-
-ECHO "LSB test environment is set successfully, Please run this image on platform ${MACHINE_ARCH}"
-
diff --git a/scripts/create-lsb-image b/scripts/create-lsb-image
new file mode 100755
index 0000000..94cb337
--- /dev/null
+++ b/scripts/create-lsb-image
@@ -0,0 +1,228 @@
+#!/bin/bash
+#
+# Copyright (C) 2010-2011 Wind River Systems, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+red='\E[31;40m'
+green='\E[32;40m'
+
+#Get current owner
+OWNER=`whoami` 
+#Get group 
+GROUP=`id -gn ${USER}`
+MACHINE_ARCH=`bitbake -e | sed -n 's/^MACHINE_ARCH=\"\(.*\)\"/\1/p'`
+DEPLOY_DIR_IMAGE=`bitbake -e | sed -n 's/^DEPLOY_DIR_IMAGE=\"\(.*\)\"/\1/p'`
+#Get value of varibale MACHINE_INE and DEPLOY_DIR_IMAGE
+LSB_IMAGE=poky-image-lsb-${MACHINE_ARCH}-test.ext3
+
+ECHO()
+{
+    echo -e "${green}$@"
+    tput sgr0
+}
+
+ERROR()
+{
+    echo -e "${red}$@"
+    tput sgr0
+    exit 1
+}
+
+exit_check()
+{
+    [ $? -ne 0 ] && exit $? 
+}
+
+usage()
+{
+    ECHO "Usage: PC\$ create-lsb-image ARCH ROOTFS_IMAGE"
+    ECHO "       ARCH: x86 or x86-64 or ppc32"
+    ECHO "       ROOTFS_IMAGE: \
+Name of the rootfs image with suffix \"tar.bz2\""
+
+
+    ECHO ""
+    ECHO "Examples:"
+    ECHO "       PC\$ creat-lsb-image \
+x86 poky-image-lsb-qemux86-20110317030443.rootfs.tar.bz2"
+    exit 1
+}
+
+#There should be two parameters to get machine type and name of image
+if [ $# -ne 2 ]; then
+    usage
+fi
+
+#Get list for lsb test suite
+case ${1} in
+"x86")
+    T_ARCH=ia32
+    P_ARCH=i486
+    COM_PACKAGE_LIST="lsb-dist-testkit-4.1.0-5.${T_ARCH}.tar.gz"
+    ;;
+"x86-64")
+    T_ARCH=amd64
+    P_ARCH=x86_64
+    MACHINE_ARCH=${MACHINE_ARCH/x86_64/x86-64}
+    COM_PACKAGE_LIST="lsb-dist-testkit-4.1.0-5.${P_ARCH}.tar.gz"
+    ;;
+"ppc32")
+    P_ARCH=ppc
+    T_ARCH=${ARCH}
+    COM_PACKAGE_LIST="lsb-dist-testkit-4.1.0-5.${T_ARCH}.tar.gz"
+    ;;
+*)
+   usage
+   ;;
+esac
+
+APP_PACKAGE_RPMLIST="lsb-apache-2.2.14-3.lsb4.${P_ARCH}.rpm \
+                     lsb-tcl-8.5.7-6.lsb4.${P_ARCH}.rpm \
+                     lsb-expect-5.43.0-11.lsb4.${P_ARCH}.rpm \
+                     lsb-groff-1.20.1-5.lsb4.${P_ARCH}.rpm \
+                     lsb-raptor-1.4.19-3.lsb4.${P_ARCH}.rpm \
+                     lsb-xpdf-1.01-10.lsb4.${P_ARCH}.rpm \
+                     lsb-samba-3.4.3-5.lsb4.${P_ARCH}.rpm \
+                     lsb-rsync-3.0.6-3.lsb4.${P_ARCH}.rpm"
+
+APP_PACKAGE_SOURCELIST="expect-tests.tar \
+                        tcl-tests.tar \
+                        raptor-tests.tar \
+                        test1.pdf \
+                        test2.pdf"
+
+PACKAGE_LIST="${COM_PACKAGE_LIST} \
+              ${APP_PACKAGE_RPMLIST} \
+              ${APP_PACKAGE_SOURCELIST}"
+
+#Version for lsb test suite
+RELEASE=released-4.1.0 
+#Tools of download packages 
+WGET="wget -c -t 5" 
+SERVER1="\
+http://ftp.linuxfoundation.org/pub/lsb/bundles/${RELEASE}/dist-testkit" 
+SERVER2="\
+http://ftp.linux-foundation.org/pub/lsb/app-battery/${RELEASE}/${T_ARCH}"
+SERVER3="http://ftp.linuxfoundation.org/pub/lsb/snapshots/appbat/tests"
+
+
+#Function for downloading package from URL pointed
+download()
+{
+
+    for i in $@; do
+        ECHO "  -->Downloading package \"${i}\""
+        PACKAGE_NAME=${i}
+        suffix=${PACKAGE_NAME##*.}
+        if [ "$suffix" = "gz" ];then
+            ${WGET} ${SERVER1}/${i}
+        elif [ "$suffix" = "rpm" ];then
+            ${WGET} ${SERVER2}/${i}
+        else
+            ${WGET} ${SERVER3}/${i}
+        fi
+    done
+}
+
+#Check lsb image
+[ ! -d $DEPLOY_DIR_IMAGE ] && ERROR "\ 
+Image directory does not exist: ${DEPLOY_DIR_IMAGE}"
+
+ECHO "Entering directory $DEPLOY_DIR_IMAGE"
+cd $DEPLOY_DIR_IMAGE
+
+if [ ! -f ${2} ]; then
+    ECHO "rootfs image \"${2}\" not found in ${DEPLOY_DIR_IMAGE}"
+    ECHO "Please copy \"${2}\" to \"${DEPLOY_DIR_IMAGE}\""
+    exit 1
+fi
+
+#Umount lsbtmp 
+[ ! -d lsbtmp ] && mkdir lsbtmp 
+ 
+#Download lsb test suite
+mkdir -p lsb-test-suite-${MACHINE_ARCH} || \
+ERROR "Couldn't find lsb test suite for ${MACHINE_ARCH}"
+cd lsb-test-suite-${MACHINE_ARCH}
+ECHO "Downloading lsb test suite, it would take some time..."
+download ${PACKAGE_LIST}
+
+cd ..
+
+#Creat lsb image
+if [ -f ${LSB_IMAGE} ];then
+    sudo umount lsbtmp > /dev/null 2>&1
+    ECHO "Removing old lsb image..."
+    /bin/rm ${LSB_IMAGE} > /dev/null 2>&1
+fi	
+
+ECHO "Creating a 8GB file for the lsb image"
+dd if=/dev/zero of=${LSB_IMAGE} bs=1M count=8000 > /dev/null 2>&1
+exit_check
+
+ECHO "Formatting ext3 image..."
+mkfs.ext3 -q -F ${LSB_IMAGE} > /dev/null 2>&1
+tune2fs -j  ${LSB_IMAGE} > /dev/null 2>&1
+
+
+ECHO "Generating final image"
+[ ! -d lsbtmp ] && mkdir lsbtmp
+
+
+#Install file system and lsb test suite to lsb image
+sudo mount -o loop ${LSB_IMAGE} lsbtmp
+exit_check
+
+ECHO "  ->Installing rootfs..."
+sudo tar jpxf ${2} -C lsbtmp
+exit_check
+
+ECHO "  ->Installing lsb test suite..."
+cd lsb-test-suite-${MACHINE_ARCH}
+if [ "${1}" = "x86-64" ]; then
+    sudo tar zpxf lsb-dist-testkit-4.1.0-5.${P_ARCH}.tar.gz -C ../lsbtmp
+else
+    sudo tar zpxf lsb-dist-testkit-4.1.0-5.${T_ARCH}.tar.gz -C ../lsbtmp
+fi
+exit_check
+
+sudo mkdir ../lsbtmp/lsb-Application
+sudo cp *.rpm *.tar *.pdf ../lsbtmp/lsb-Application
+exit_check
+cd ..
+
+if [ -f modules-*-${MACHINE_ARCH}.tgz ];then
+ECHO "  ->Installing moudles of driver..."	
+    sudo tar zpxf modules-*-${MACHINE_ARCH}.tgz -C lsbtmp/
+fi
+
+
+#Unmount lsbtmp
+sudo umount lsbtmp
+exit_check
+sudo rm -rf lsbtmp
+
+#Change file attribute
+sudo chown ${OWNER}:${GROUP} ${LSB_IMAGE} 
+exit_check
+sudo chmod 755 ${LSB_IMAGE}
+exit_check
+
+#Set up link
+ln -sf ${LSB_IMAGE} poky-image-lsb-${MACHINE_ARCH}.ext3
+
+ECHO "The LSB test environment has been setup successfully."
+ECHO "Please run this image on platform ${MACHINE_ARCH}"
-- 
1.7.1.1

Re: [PATCH 37/37] create-lsb-image:Rename creat-lsb-image and fix some bugs

[Richard Purdie]

On Fri, 2011-04-22 at 23:29 -0700, Saul Wold wrote:
> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> 
> Rename creat-lsb-image to create-lsb-image
> Fix some fuctions for more practical

Please in future make renames separate to commits so people can more
easily see what changed.

Cheers,

Richard


>  scripts/creat-lsb-image  |  198 ----------------------------------------
>  scripts/create-lsb-image |  228 ++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 228 insertions(+), 198 deletions(-)
>  delete mode 100755 scripts/creat-lsb-image
>  create mode 100755 scripts/create-lsb-image
> 
> diff --git a/scripts/creat-lsb-image b/scripts/creat-lsb-image
> deleted file mode 100755
> index 657784c..0000000
> --- a/scripts/creat-lsb-image
> +++ /dev/null
> @@ -1,198 +0,0 @@
> -#!/bin/bash
> -#
> -# Copyright (c) 2005-2010 Wind River Systems, Inc.
> -#
> -# This program is free software; you can redistribute it and/or modify
> -# it under the terms of the GNU General Public License version 2 as
> -# published by the Free Software Foundation.
> -#
> -# This program is distributed in the hope that it will be useful,
> -# but WITHOUT ANY WARRANTY; without even the implied warranty of
> -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
> -# See the GNU General Public License for more details.
> -#
> -# You should have received a copy of the GNU General Public License
> -# along with this program; if not, write to the Free Software
> -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> -
> -
> -red='\E[31;40m'
> -green='\E[32;40m'
> -USER=`whoami`
> -ARCH=$1
> -MACHINE_ARCH=` bitbake -e | grep ^MACHINE_ARCH | cut -d '=' -f2 | cut -d '"' -f2`
> -IMAGE_PATH=` bitbake -e | grep ^COREBASE | cut -d '=' -f2 | cut -d '"' -f2`/build/tmp/deploy/images/
> -
> -
> -ECHO()
> -{
> -    echo -e "${green}$@"
> -    tput sgr0
> -}
> -
> -exit_check()
> -{
> -    if [ ! $? -eq 0 ]; then
> -        exit $?
> -    fi
> -}
> -
> -usage()
> -{
> -    ECHO "${red}usage:you should input one of the next commmands according to detailed target platform:"
> -    ECHO "creat-lsb-image x86"
> -    ECHO "creat-lsb-image x86_64"
> -    ECHO "creat-lsb-image ppc32"
> -}
> -
> -#There should be a patameter to get machine type
> -if [ $# -ne 1 ]; then
> -    usage
> -    exit 1
> -fi
> -
> -#check lsb image
> -if [ ! -d $IMAGE_PATH ];then
> -    ECHO "${red}There isn't image directory"
> -    exit 1
> -fi
> -ECHO "Enter directory $IMAGE_PATH"
> -cd $IMAGE_PATH
> -
> -#get architecture
> -PN=`find . -name core-image-lsb-${MACHINE_ARCH}\*.rootfs.tar.bz2 -type f | awk -F- 'BEGIN{ max=0;} {if( NR!=0 && $5>max ) max=$5 }END{ printf "%d" ,max ;}'`
> -if [ "XPN" == "X" ];then
> -   ECHO "${red}Don't find lsb image on platform, Please run \"core-image-lsb\" to generate lsb image"
> -   exit 1
> -fi
> -
> -if [ $PN -eq 0 ];then
> -	ECHO "${red}Can't ${MACHINE_ARCH} rootfs.tar.gz,Please run core-image-lsb to get lsb image"
> -	exit 1
> -fi
> -#set varible ARCH
> -if [ ${ARCH} == x86 ];then
> -	T_ARCH=ia32
> -    P_ARCH=i486
> -elif [ ${ARCH} == x86_64 ];then
> -	T_ARCH=ia64
> -    P_ARCH=ia64
> -else
> -	P_ARCH=ppc
> -	T_ARCH=${ARCH}
> -fi
> -
> -#umount lsbtmp 
> -if [ -d lsbtmp ];then
> -	sudo umount lsbtmp
> -fi
> - 
> -#download lsb test suite
> -mkdir -p lsb-test-suite-${MACHINE_ARCH} 
> -if [ -d lsb-test-suite-${MACHINE_ARCH} ];then
> -	cd lsb-test-suite-${MACHINE_ARCH}
> -	ECHO "Download lsb test suite, it could take some time..."
> -    wget -c -t 5  http://ftp.linuxfoundation.org/pub/lsb/bundles/released-4.1.0/dist-testkit/lsb-dist-testkit-4.1.0-5.${T_ARCH}.tar.gz
> -    exit_check
> -	ECHO "Download lsb-xdg-utils-4.0.0-2.${P_ARCH}.rpm"
> -	wget -c -t 5 http://ftp.linux-foundation.org/pub/lsb/lsbdev/released-4.1.0/binary/${T_ARCH}/lsb-xdg-utils-4.0.0-2.${P_ARCH}.rpm
> -    exit_check
> -	ECHO "Downlocad lsb-apache-2.2.8-2.lsb4.${P_ARCH}.rpm"
> -	wget -c -t 5 http://ftp.linux-foundation.org/pub/lsb/app-battery/released-4.1.0/${T_ARCH}/lsb-apache-2.2.14-3.lsb4.${P_ARCH}.rpm
> -    exit_check
> -	ECHO "Downlocad lsb-tcl-8.5.1-2.lsb4.${P_ARCH}.rpm"
> -	wget -c -t 5 http://ftp.linux-foundation.org/pub/lsb/app-battery/released-4.1.0/${T_ARCH}/lsb-tcl-8.5.7-6.lsb4.${P_ARCH}.rpm
> -    exit_check
> -	ECHO "Downlocad lsb-expect-5.43.0-7.lsb4.${P_ARCH}.rpm"
> -	wget -c -t 5 http://ftp.linux-foundation.org/pub/lsb/app-battery/released-4.1.0/${T_ARCH}/lsb-expect-5.43.0-11.lsb4.${P_ARCH}.rpm 
> -    exit_check
> -	ECHO "Downlocad lsb-groff-1.19.2-4.lsb4.${P_ARCH}.rpm"
> -	wget -c -t 5 http://ftp.linux-foundation.org/pub/lsb/app-battery/released-4.1.0/${T_ARCH}/lsb-groff-1.20.1-5.lsb4.${P_ARCH}.rpm  
> -    exit_check
> -	ECHO "Downlocad lsb-raptor-1.4.16-2.lsb4.${P_ARCH}.rpm"
> -	wget -c -t 5 http://ftp.linux-foundation.org/pub/lsb/app-battery/released-4.1.0/${T_ARCH}/lsb-raptor-1.4.19-3.lsb4.${P_ARCH}.rpm 
> -    exit_check
> -	ECHO "Downlocad lsb-xpdf-1.01-7.lsb4.${P_ARCH}.rpm"
> -	wget -c -t 5 http://ftp.linux-foundation.org/pub/lsb/app-battery/released-4.1.0/${T_ARCH}/lsb-xpdf-1.01-10.lsb4.${P_ARCH}.rpm
> -    exit_check
> -	ECHO "Downlocad lsb-samba-3.0.28a-3.lsb4.${P_ARCH}.rpm"
> -	wget -c -t 5 http://ftp.linux-foundation.org/pub/lsb/app-battery/released-4.1.0/${T_ARCH}/lsb-samba-3.4.3-5.lsb4.${P_ARCH}.rpm 
> -    exit_check
> -	ECHO "Downlocad lsb-rsync-3.0.0-2.lsb4.${P_ARCH}.rpm"
> -	wget -c -t 5 http://ftp.linux-foundation.org/pub/lsb/app-battery/released-4.1.0/${T_ARCH}/lsb-rsync-3.0.6-3.lsb4.${P_ARCH}.rpm
> -    exit_check
> -else
> -	ECHO "Can't find lsb test suite for ${MACHINE_ARCH}"
> -fi
> -cd ..
> -if [ -L core-image-lsb-${MACHINE_ARCH}.ext3 ];then
> -    /bin/rm core-image-lsb-${MACHINE_ARCH}.ext3
> -    exit_check
> -fi
> -
> -#creat lsb image
> -if [ -f core-image-lsb-${MACHINE_ARCH}-test.ext3 ];then
> -	if [ -d lsbtmp ];then
> -    	sudo umount lsbtmp
> -	fi
> -	ECHO "Remove old lsb image..."
> -	/bin/rm core-image-lsb-${MACHINE_ARCH}-test.ext3
> -fi	
> -ECHO "creat a big ext3 file for lsb image with 5G..."
> -dd if=/dev/zero of=core-image-lsb-${MACHINE_ARCH}-test.ext3 bs=1M count=5000
> -exit_check
> -ECHO "Format ext3 image,please input \"y\""
> -mkfs.ext3 core-image-lsb-${MACHINE_ARCH}-test.ext3
> -tune2fs -j  core-image-lsb-${MACHINE_ARCH}-test.ext3
> -
> -
> -ECHO "get a lsb image with lsb test suite"
> -if [ ! -d lsbtmp ];then
> -	mkdir lsbtmp
> -fi
> -
> -
> -#install file system and lsb test suite to lsb image
> -sudo mount -o loop core-image-lsb-${MACHINE_ARCH}-test.ext3 lsbtmp
> -exit_check
> -
> -ECHO "  ->Install file system..."
> -sudo tar jxf core-image-lsb-${MACHINE_ARCH}-${PN}.rootfs.tar.bz2 -C lsbtmp
> -exit_check
> -
> -ECHO "  ->Install lsb test suite..."
> -cd lsb-test-suite-${MACHINE_ARCH}
> -sudo tar zxf lsb-dist-testkit-4.1.0-5.${T_ARCH}.tar.gz -C ../lsbtmp
> -exit_check
> -sudo mkdir ../lsbtmp/lsb-Application
> -sudo cp *.rpm ../lsbtmp/lsb-Application
> -exit_check
> -cd ..
> -
> -if [ -f modules-*-${MACHINE_ARCH}.tgz ];then
> -ECHO "  ->Install moules of driver..."	
> -	sudo tar zxf modules-*-${MACHINE_ARCH}.tgz -C lsbtmp/
> -fi
> -
> -
> -#unmount lsbtmp
> -sudo umount lsbtmp
> -exit_check
> -sudo rm -rf lsbtmp
> -
> -#change file attribute
> -sudo chown ${USER}:${USER} core-image-lsb-${MACHINE_ARCH}-test.ext3 
> -exit_check
> -sudo chmod 755 core-image-lsb-${MACHINE_ARCH}-test.ext3
> -exit_check
> -
> -#set up link
> -if [ -L core-image-lsb-${MACHINE_ARCH}.ext3 ];then
> -ECHO "Set up link"
> -    /bin/rm core-image-lsb-${MACHINE_ARCH}.ext3
> -    exit_check
> -fi
> -ln -s core-image-lsb-${MACHINE_ARCH}-test.ext3 core-image-lsb-${MACHINE_ARCH}.ext3
> -
> -ECHO "LSB test environment is set successfully, Please run this image on platform ${MACHINE_ARCH}"
> -
> diff --git a/scripts/create-lsb-image b/scripts/create-lsb-image
> new file mode 100755
> index 0000000..94cb337
> --- /dev/null
> +++ b/scripts/create-lsb-image
> @@ -0,0 +1,228 @@
> +#!/bin/bash
> +#
> +# Copyright (C) 2010-2011 Wind River Systems, Inc.
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License version 2 as
> +# published by the Free Software Foundation.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
> +# See the GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write to the Free Software
> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> +
> +
> +red='\E[31;40m'
> +green='\E[32;40m'
> +
> +#Get current owner
> +OWNER=`whoami` 
> +#Get group 
> +GROUP=`id -gn ${USER}`
> +MACHINE_ARCH=`bitbake -e | sed -n 's/^MACHINE_ARCH=\"\(.*\)\"/\1/p'`
> +DEPLOY_DIR_IMAGE=`bitbake -e | sed -n 's/^DEPLOY_DIR_IMAGE=\"\(.*\)\"/\1/p'`
> +#Get value of varibale MACHINE_INE and DEPLOY_DIR_IMAGE
> +LSB_IMAGE=poky-image-lsb-${MACHINE_ARCH}-test.ext3
> +
> +ECHO()
> +{
> +    echo -e "${green}$@"
> +    tput sgr0
> +}
> +
> +ERROR()
> +{
> +    echo -e "${red}$@"
> +    tput sgr0
> +    exit 1
> +}
> +
> +exit_check()
> +{
> +    [ $? -ne 0 ] && exit $? 
> +}
> +
> +usage()
> +{
> +    ECHO "Usage: PC\$ create-lsb-image ARCH ROOTFS_IMAGE"
> +    ECHO "       ARCH: x86 or x86-64 or ppc32"
> +    ECHO "       ROOTFS_IMAGE: \
> +Name of the rootfs image with suffix \"tar.bz2\""
> +
> +
> +    ECHO ""
> +    ECHO "Examples:"
> +    ECHO "       PC\$ creat-lsb-image \
> +x86 poky-image-lsb-qemux86-20110317030443.rootfs.tar.bz2"
> +    exit 1
> +}
> +
> +#There should be two parameters to get machine type and name of image
> +if [ $# -ne 2 ]; then
> +    usage
> +fi
> +
> +#Get list for lsb test suite
> +case ${1} in
> +"x86")
> +    T_ARCH=ia32
> +    P_ARCH=i486
> +    COM_PACKAGE_LIST="lsb-dist-testkit-4.1.0-5.${T_ARCH}.tar.gz"
> +    ;;
> +"x86-64")
> +    T_ARCH=amd64
> +    P_ARCH=x86_64
> +    MACHINE_ARCH=${MACHINE_ARCH/x86_64/x86-64}
> +    COM_PACKAGE_LIST="lsb-dist-testkit-4.1.0-5.${P_ARCH}.tar.gz"
> +    ;;
> +"ppc32")
> +    P_ARCH=ppc
> +    T_ARCH=${ARCH}
> +    COM_PACKAGE_LIST="lsb-dist-testkit-4.1.0-5.${T_ARCH}.tar.gz"
> +    ;;
> +*)
> +   usage
> +   ;;
> +esac
> +
> +APP_PACKAGE_RPMLIST="lsb-apache-2.2.14-3.lsb4.${P_ARCH}.rpm \
> +                     lsb-tcl-8.5.7-6.lsb4.${P_ARCH}.rpm \
> +                     lsb-expect-5.43.0-11.lsb4.${P_ARCH}.rpm \
> +                     lsb-groff-1.20.1-5.lsb4.${P_ARCH}.rpm \
> +                     lsb-raptor-1.4.19-3.lsb4.${P_ARCH}.rpm \
> +                     lsb-xpdf-1.01-10.lsb4.${P_ARCH}.rpm \
> +                     lsb-samba-3.4.3-5.lsb4.${P_ARCH}.rpm \
> +                     lsb-rsync-3.0.6-3.lsb4.${P_ARCH}.rpm"
> +
> +APP_PACKAGE_SOURCELIST="expect-tests.tar \
> +                        tcl-tests.tar \
> +                        raptor-tests.tar \
> +                        test1.pdf \
> +                        test2.pdf"
> +
> +PACKAGE_LIST="${COM_PACKAGE_LIST} \
> +              ${APP_PACKAGE_RPMLIST} \
> +              ${APP_PACKAGE_SOURCELIST}"
> +
> +#Version for lsb test suite
> +RELEASE=released-4.1.0 
> +#Tools of download packages 
> +WGET="wget -c -t 5" 
> +SERVER1="\
> +http://ftp.linuxfoundation.org/pub/lsb/bundles/${RELEASE}/dist-testkit" 
> +SERVER2="\
> +http://ftp.linux-foundation.org/pub/lsb/app-battery/${RELEASE}/${T_ARCH}"
> +SERVER3="http://ftp.linuxfoundation.org/pub/lsb/snapshots/appbat/tests"
> +
> +
> +#Function for downloading package from URL pointed
> +download()
> +{
> +
> +    for i in $@; do
> +        ECHO "  -->Downloading package \"${i}\""
> +        PACKAGE_NAME=${i}
> +        suffix=${PACKAGE_NAME##*.}
> +        if [ "$suffix" = "gz" ];then
> +            ${WGET} ${SERVER1}/${i}
> +        elif [ "$suffix" = "rpm" ];then
> +            ${WGET} ${SERVER2}/${i}
> +        else
> +            ${WGET} ${SERVER3}/${i}
> +        fi
> +    done
> +}
> +
> +#Check lsb image
> +[ ! -d $DEPLOY_DIR_IMAGE ] && ERROR "\ 
> +Image directory does not exist: ${DEPLOY_DIR_IMAGE}"
> +
> +ECHO "Entering directory $DEPLOY_DIR_IMAGE"
> +cd $DEPLOY_DIR_IMAGE
> +
> +if [ ! -f ${2} ]; then
> +    ECHO "rootfs image \"${2}\" not found in ${DEPLOY_DIR_IMAGE}"
> +    ECHO "Please copy \"${2}\" to \"${DEPLOY_DIR_IMAGE}\""
> +    exit 1
> +fi
> +
> +#Umount lsbtmp 
> +[ ! -d lsbtmp ] && mkdir lsbtmp 
> + 
> +#Download lsb test suite
> +mkdir -p lsb-test-suite-${MACHINE_ARCH} || \
> +ERROR "Couldn't find lsb test suite for ${MACHINE_ARCH}"
> +cd lsb-test-suite-${MACHINE_ARCH}
> +ECHO "Downloading lsb test suite, it would take some time..."
> +download ${PACKAGE_LIST}
> +
> +cd ..
> +
> +#Creat lsb image
> +if [ -f ${LSB_IMAGE} ];then
> +    sudo umount lsbtmp > /dev/null 2>&1
> +    ECHO "Removing old lsb image..."
> +    /bin/rm ${LSB_IMAGE} > /dev/null 2>&1
> +fi	
> +
> +ECHO "Creating a 8GB file for the lsb image"
> +dd if=/dev/zero of=${LSB_IMAGE} bs=1M count=8000 > /dev/null 2>&1
> +exit_check
> +
> +ECHO "Formatting ext3 image..."
> +mkfs.ext3 -q -F ${LSB_IMAGE} > /dev/null 2>&1
> +tune2fs -j  ${LSB_IMAGE} > /dev/null 2>&1
> +
> +
> +ECHO "Generating final image"
> +[ ! -d lsbtmp ] && mkdir lsbtmp
> +
> +
> +#Install file system and lsb test suite to lsb image
> +sudo mount -o loop ${LSB_IMAGE} lsbtmp
> +exit_check
> +
> +ECHO "  ->Installing rootfs..."
> +sudo tar jpxf ${2} -C lsbtmp
> +exit_check
> +
> +ECHO "  ->Installing lsb test suite..."
> +cd lsb-test-suite-${MACHINE_ARCH}
> +if [ "${1}" = "x86-64" ]; then
> +    sudo tar zpxf lsb-dist-testkit-4.1.0-5.${P_ARCH}.tar.gz -C ../lsbtmp
> +else
> +    sudo tar zpxf lsb-dist-testkit-4.1.0-5.${T_ARCH}.tar.gz -C ../lsbtmp
> +fi
> +exit_check
> +
> +sudo mkdir ../lsbtmp/lsb-Application
> +sudo cp *.rpm *.tar *.pdf ../lsbtmp/lsb-Application
> +exit_check
> +cd ..
> +
> +if [ -f modules-*-${MACHINE_ARCH}.tgz ];then
> +ECHO "  ->Installing moudles of driver..."	
> +    sudo tar zpxf modules-*-${MACHINE_ARCH}.tgz -C lsbtmp/
> +fi
> +
> +
> +#Unmount lsbtmp
> +sudo umount lsbtmp
> +exit_check
> +sudo rm -rf lsbtmp
> +
> +#Change file attribute
> +sudo chown ${OWNER}:${GROUP} ${LSB_IMAGE} 
> +exit_check
> +sudo chmod 755 ${LSB_IMAGE}
> +exit_check
> +
> +#Set up link
> +ln -sf ${LSB_IMAGE} poky-image-lsb-${MACHINE_ARCH}.ext3
> +
> +ECHO "The LSB test environment has been setup successfully."
> +ECHO "Please run this image on platform ${MACHINE_ARCH}"

Re: [PATCH 00/37] V2 - Consolidated Pull Request

[Richard Purdie]

On Fri, 2011-04-22 at 23:28 -0700, Saul Wold wrote:
> Please pull this request, based on some cleanups and
> additional changes.  This has been built on multiple 
> machines.
[...]
> Dexuan Cui (9):
>   libxfixes: upgrade from 4.0.5 to the latest version 5.0
>   util-macros: upgrade from 1.11.0 to 1.13.0
>   preferred-xorg-versions.inc: update libxfixes, util-macros,
>     xorg-cf-files
>   mdadm: upgrade from 3.1.4 to the latest version 3.2.1
>   liburcu: upgrade from 0.5.2 to 0.5.4
>   lttng-ust: upgrade from 0.11 to the latest version 0.12
>   task-poky-tools.bb, task-sdk-gmae.inc: enable lttng-ust for ARM
>   lttng-viewer: upgrade from 0.12.36 to the latest version 0.12.38
>   distro_tracking_fields.inc: update the info for the following recipes
> 
> Gary Thomas (1):
>   Control over when package init scripts are run
> 
> Kang Kai (1):
>   lsbsetup: add some workaround for LSB tests
> 
> Khem Raj (1):
>   pcmciautils: Upgrade 017 -> 018
> 
> Koen Kooi (1):
>   librsvg 2.32.1: fix postinst script
> 
> Martin Jansa (3):
>   gconf-dbus: add SRCREV to recipe
>   xf86-video-omapfb: add SRCREV to recipe
>   task-base: allow distribution to define apm provider

I've given some feedback on these.

> Nitin A Kamble (8):
>   mpfr: upgrade from 3.0.0 to 3.0.1
>   python-gst: upgrade from 0.10.19 to 0.10.21
>   git: upgrade from 1.7.3.4 to 1.7.4.3
>   python-pycairo: fix installation path of __init__.py
>   perl-5.12.2: use of PERLHOSTLIB var fix
>   cpan.bbclass: export PERLHOSTLIB for perl modules
>   libxml-parser-perl: upgrade from 2.36 to 2.40
>   distro_tracking: recipe information update
> 
> Petr Štetiar (1):
>   modutils-initscripts: fix wrong order of module loading happening in
>     udev
> 
> Saul Wold (4):
>   slang: Fix host contamination issue
>   qemu: disable sdl for target build
>   ofono: add bluez4 to DEPENDS list
>   qemu-helper-nativesdk: Update LIC_FILE_CHKSUM for renamed helper
> 
> Tom Zanussi (1):
>   linux-tools.inc: turn off newt and dwarf for perf
> 
> Xiaofeng Yan (1):
>   create-lsb-image:Rename creat-lsb-image and fix some bugs
> 
> Zhai Edwin (6):
>   tasks: Upgrade to 0.19 (from 0.18)
>   avahi: Upgrade to 0.6.30 (from 0.6.28)
>   consolekit: Upgrade to 0.4.4 (from 0.4.3)
>   libgpg-error: Upgrade to 1.10 (from 1.9)
>   jpeg: Upgrade to 8c (from 8b)
>   puzzles: Upgrade to svn r9151 (from r9084)

but I merged everything else, thanks!

Richard

Re: [PATCH 33/37] gconf-dbus: add SRCREV to recipe

[Richard Purdie]

On Fri, 2011-04-22 at 23:29 -0700, Saul Wold wrote:
> From: Martin Jansa <Martin.Jansa@gmail.com>
> 
> * taken from meta/conf/distro/include/poky-default-revisions.inc for
>   those who want gconf-dbus and are not using poky
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

I've like to hold off this SRCREV change and the other one for just a
little longer. Yu Ke is doing some investigation to confirm that global
include file is no longer required and assuming we find it isn't, we'll
move everything to the recipes in one go. I'd rather not do this
piecemeal and risk confusion so I'd appreciate patience for another few
days on this one.

Cheers,

Richard

Re: [PATCH 35/37] task-base: allow distribution to define apm provider

[Richard Purdie]

On Fri, 2011-04-22 at 23:29 -0700, Saul Wold wrote:
> From: Martin Jansa <Martin.Jansa@gmail.com>
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta/recipes-core/tasks/task-base.bb |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb
> index 599fa4b..af49153 100644
> --- a/meta/recipes-core/tasks/task-base.bb
> +++ b/meta/recipes-core/tasks/task-base.bb
> @@ -179,8 +179,11 @@ RDEPENDS_task-base-acpi = "\
>      acpid \
>      libacpi "
>  
> +# Distro can override apm provider
> +DISTRO_APM ?= "apm"
> +
>  RDEPENDS_task-base-apm = "\
> -    apm \
> +    ${DISTRO_APM} \
>      apmd"

I think I replied about this one previously and Martin suggested we use
a different VIRTUAL* name for the variable. I'd appreciate doing that as
DISTRO* is an overloaded namespace. Can someone repsin the patch
please? :)

Cheers,

Richard

[PATCH] task-base: allow distribution to define apm provider

[Martin Jansa]

* use VIRTUAL-RUNTIME_apm instead of apm directly

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-core/tasks/task-base.bb |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb
index 599fa4b..a2a8925 100644
--- a/meta/recipes-core/tasks/task-base.bb
+++ b/meta/recipes-core/tasks/task-base.bb
@@ -179,8 +179,11 @@ RDEPENDS_task-base-acpi = "\
     acpid \
     libacpi "
 
+# Distro can override apm provider
+VIRTUAL-RUNTIME_apm ?= "apm"
+
 RDEPENDS_task-base-apm = "\
-    apm \
+    ${VIRTUAL-RUNTIME_apm} \
     apmd"
 
 RDEPENDS_task-base-ext2 = "\
-- 
1.7.5.rc1

Re: [PATCH] task-base: allow distribution to define apm provider

[Richard Purdie]

On Mon, 2011-04-25 at 00:25 +0200, Martin Jansa wrote:
> * use VIRTUAL-RUNTIME_apm instead of apm directly
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta/recipes-core/tasks/task-base.bb |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)

Merged to master, thanks.

Richard

Re: [PATCH 07/37] modutils-initscripts: fix wrong order of module loading happening in udev

[Gary Thomas]

On 04/23/2011 12:28 AM, Saul Wold wrote:
> From: =?UTF-8?q?Petr=20=C5=A0tetiar?=<ynezz@true.cz>
>
> In the current state, udev init script is loaded as 3rd and modutils.sh as
> 20th, so udevadm called in udev init script loads all kernel modules in some
> unpredictable order, not honoring in any way specified order of modules in
> /etc/modules. This causes some troubles mainly in the first boot. So to fix
> this we now move loading of the kernel modules just before we exec udev init
> script. Example of the current state:
>
> 	Starting udev
> 	rtc-m48t86 rtc-m48t86: rtc core: registered m48t86 as rtc0
> 	rtc-m48t86 rtc-m48t86: battery ok
> 	ep93xx-rtc ep93xx-rtc: rtc core: registered ep93xx-rtc as rtc1
>
> 	root@ts72xx:~# cat /etc/modules
> 	rtc-ep93xx
> 	ohci-hcd
> 	ts72xx_sbcinfo
> 	rtc-m48t86
>
> As you can guess, this is really wrong behaviour, because I've rtc1 as the
> main time source for my system.
>
> 	root@ts72xx:~# cat /etc/default/hwclock
> 	HWCLOCKACCESS=yes
> 	HWCLOCKDEVICE=/dev/rtc1
>
> Expected behaviour with this patch applied:
>
> 	Please wait: booting...
> 	ep93xx-rtc ep93xx-rtc: rtc core: registered ep93xx-rtc as rtc0
> 	usbcore: registered new device driver usb
> 	ohci_hcd: USB 1.1 'Open' Host Controller (OHCI) Driver
> 	...
> 	rtc-m48t86 rtc-m48t86: rtc core: registered m48t86 as rtc1
> 	rtc-m48t86 rtc-m48t86: battery ok
> 	Starting udev
>
> Signed-off-by: Petr Štetiar<ynezz@true.cz>
>
> (based on http://patches.openembedded.org/patch/1917/)
> Signed-off-by: Koen Kooi<koen@dominion.thruhere.net>
> Signed-off-by: Saul Wold<sgw@linux.intel.com>
> ---
>   .../modutils/modutils-initscripts.bb               |    4 ++--
>   1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-kernel/modutils/modutils-initscripts.bb b/meta/recipes-kernel/modutils/modutils-initscripts.bb
> index 1665955..5ae34b4 100644
> --- a/meta/recipes-kernel/modutils/modutils-initscripts.bb
> +++ b/meta/recipes-kernel/modutils/modutils-initscripts.bb
> @@ -4,10 +4,10 @@ LICENSE = "PD"
>   LIC_FILES_CHKSUM = "file://LICENSE;md5=7bf87fc37976e93ec66ad84fac58c098"
>   SRC_URI = "file://modutils.sh \
>   	   file://PD.patch"
> -PR = "r4"
> +PR = "r5"
>
>   INITSCRIPT_NAME = "modutils.sh"
> -INITSCRIPT_PARAMS = "start 20 S ."
> +INITSCRIPT_PARAMS = "start 2 S ."
>
>   inherit update-rc.d
>

Should there not be a corresponding change to modutils_2.4.27.bb?  It's not clear to me
where there are these two separate recipes, but they should at least be kept in sync.

diff --git a/meta/recipes-kernel/modutils/modutils_2.4.27.bb b/meta/recipes-kernel/modutils/modutils_2.4.27.bb
index 1ebc90c..2944201 100644
--- a/meta/recipes-kernel/modutils/modutils_2.4.27.bb
+++ b/meta/recipes-kernel/modutils/modutils_2.4.27.bb
@@ -5,7 +5,7 @@ manageable for all users, administrators and distribution maintainers."
  LICENSE = "GPLv2"
  LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
  DEPENDS = "bison-native"
-PR = "r9"
+PR = "r10"

  SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/modutils/v2.4/modutils-${PV}.tar.bz2 \
             file://lex.l.diff;patch=1 \
@@ -51,7 +51,7 @@ if test -n "$D"; then
                 done
         fi
  fi
-update-rc.d $D modutils.sh start 20 S .
+update-rc.d $D modutils.sh start 2 S .
  }

  pkg_prerm_modutils () {

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

Re: [PATCH 07/37] modutils-initscripts: fix wrong order of module loading happening in udev

[Saul Wold]

On 04/25/2011 05:02 AM, Gary Thomas wrote:
> On 04/23/2011 12:28 AM, Saul Wold wrote:
>> From: =?UTF-8?q?Petr=20=C5=A0tetiar?=<ynezz@true.cz>
>>
>> In the current state, udev init script is loaded as 3rd and
>> modutils.sh as
>> 20th, so udevadm called in udev init script loads all kernel modules
>> in some
>> unpredictable order, not honoring in any way specified order of
>> modules in
>> /etc/modules. This causes some troubles mainly in the first boot. So
>> to fix
>> this we now move loading of the kernel modules just before we exec
>> udev init
>> script. Example of the current state:
>>
>> Starting udev
>> rtc-m48t86 rtc-m48t86: rtc core: registered m48t86 as rtc0
>> rtc-m48t86 rtc-m48t86: battery ok
>> ep93xx-rtc ep93xx-rtc: rtc core: registered ep93xx-rtc as rtc1
>>
>> root@ts72xx:~# cat /etc/modules
>> rtc-ep93xx
>> ohci-hcd
>> ts72xx_sbcinfo
>> rtc-m48t86
>>
>> As you can guess, this is really wrong behaviour, because I've rtc1 as
>> the
>> main time source for my system.
>>
>> root@ts72xx:~# cat /etc/default/hwclock
>> HWCLOCKACCESS=yes
>> HWCLOCKDEVICE=/dev/rtc1
>>
>> Expected behaviour with this patch applied:
>>
>> Please wait: booting...
>> ep93xx-rtc ep93xx-rtc: rtc core: registered ep93xx-rtc as rtc0
>> usbcore: registered new device driver usb
>> ohci_hcd: USB 1.1 'Open' Host Controller (OHCI) Driver
>> ...
>> rtc-m48t86 rtc-m48t86: rtc core: registered m48t86 as rtc1
>> rtc-m48t86 rtc-m48t86: battery ok
>> Starting udev
>>
>> Signed-off-by: Petr Štetiar<ynezz@true.cz>
>>
>> (based on http://patches.openembedded.org/patch/1917/)
>> Signed-off-by: Koen Kooi<koen@dominion.thruhere.net>
>> Signed-off-by: Saul Wold<sgw@linux.intel.com>
>> ---
>> .../modutils/modutils-initscripts.bb | 4 ++--
>> 1 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/recipes-kernel/modutils/modutils-initscripts.bb
>> b/meta/recipes-kernel/modutils/modutils-initscripts.bb
>> index 1665955..5ae34b4 100644
>> --- a/meta/recipes-kernel/modutils/modutils-initscripts.bb
>> +++ b/meta/recipes-kernel/modutils/modutils-initscripts.bb
>> @@ -4,10 +4,10 @@ LICENSE = "PD"
>> LIC_FILES_CHKSUM = "file://LICENSE;md5=7bf87fc37976e93ec66ad84fac58c098"
>> SRC_URI = "file://modutils.sh \
>> file://PD.patch"
>> -PR = "r4"
>> +PR = "r5"
>>
>> INITSCRIPT_NAME = "modutils.sh"
>> -INITSCRIPT_PARAMS = "start 20 S ."
>> +INITSCRIPT_PARAMS = "start 2 S ."
>>
>> inherit update-rc.d
>>
>
> Should there not be a corresponding change to modutils_2.4.27.bb? It's
> not clear to me
> where there are these two separate recipes, but they should at least be
> kept in sync.
>
Gary,

Could you please resend this as a proper patch with Signed-off-by and 
commit info.

Thanks
	Sau!

> diff --git a/meta/recipes-kernel/modutils/modutils_2.4.27.bb
> b/meta/recipes-kernel/modutils/modutils_2.4.27.bb
> index 1ebc90c..2944201 100644
> --- a/meta/recipes-kernel/modutils/modutils_2.4.27.bb
> +++ b/meta/recipes-kernel/modutils/modutils_2.4.27.bb
> @@ -5,7 +5,7 @@ manageable for all users, administrators and
> distribution maintainers."
> LICENSE = "GPLv2"
> LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
> DEPENDS = "bison-native"
> -PR = "r9"
> +PR = "r10"
>
> SRC_URI =
> "${KERNELORG_MIRROR}/linux/utils/kernel/modutils/v2.4/modutils-${PV}.tar.bz2
> \
> file://lex.l.diff;patch=1 \
> @@ -51,7 +51,7 @@ if test -n "$D"; then
> done
> fi
> fi
> -update-rc.d $D modutils.sh start 20 S .
> +update-rc.d $D modutils.sh start 2 S .
> }
>
> pkg_prerm_modutils () {
>

Re: [PATCH 07/37] modutils-initscripts: fix wrong order of module loading happening in udev

[Koen Kooi]

Is anyone still using 2.4 kernels? That's what modutils is for, module-init-tools is for 2.6 kernels

Op 25 apr. 2011 om 17:49 heeft Saul Wold <sgw@linux.intel.com> het volgende geschreven:

> On 04/25/2011 05:02 AM, Gary Thomas wrote:
>> On 04/23/2011 12:28 AM, Saul Wold wrote:
>>> From: =?UTF-8?q?Petr=20=C5=A0tetiar?=<ynezz@true.cz>
>>> 
>>> In the current state, udev init script is loaded as 3rd and
>>> modutils.sh as
>>> 20th, so udevadm called in udev init script loads all kernel modules
>>> in some
>>> unpredictable order, not honoring in any way specified order of
>>> modules in
>>> /etc/modules. This causes some troubles mainly in the first boot. So
>>> to fix
>>> this we now move loading of the kernel modules just before we exec
>>> udev init
>>> script. Example of the current state:
>>> 
>>> Starting udev
>>> rtc-m48t86 rtc-m48t86: rtc core: registered m48t86 as rtc0
>>> rtc-m48t86 rtc-m48t86: battery ok
>>> ep93xx-rtc ep93xx-rtc: rtc core: registered ep93xx-rtc as rtc1
>>> 
>>> root@ts72xx:~# cat /etc/modules
>>> rtc-ep93xx
>>> ohci-hcd
>>> ts72xx_sbcinfo
>>> rtc-m48t86
>>> 
>>> As you can guess, this is really wrong behaviour, because I've rtc1 as
>>> the
>>> main time source for my system.
>>> 
>>> root@ts72xx:~# cat /etc/default/hwclock
>>> HWCLOCKACCESS=yes
>>> HWCLOCKDEVICE=/dev/rtc1
>>> 
>>> Expected behaviour with this patch applied:
>>> 
>>> Please wait: booting...
>>> ep93xx-rtc ep93xx-rtc: rtc core: registered ep93xx-rtc as rtc0
>>> usbcore: registered new device driver usb
>>> ohci_hcd: USB 1.1 'Open' Host Controller (OHCI) Driver
>>> ...
>>> rtc-m48t86 rtc-m48t86: rtc core: registered m48t86 as rtc1
>>> rtc-m48t86 rtc-m48t86: battery ok
>>> Starting udev
>>> 
>>> Signed-off-by: Petr Štetiar<ynezz@true.cz>
>>> 
>>> (based on http://patches.openembedded.org/patch/1917/)
>>> Signed-off-by: Koen Kooi<koen@dominion.thruhere.net>
>>> Signed-off-by: Saul Wold<sgw@linux.intel.com>
>>> ---
>>> .../modutils/modutils-initscripts.bb | 4 ++--
>>> 1 files changed, 2 insertions(+), 2 deletions(-)
>>> 
>>> diff --git a/meta/recipes-kernel/modutils/modutils-initscripts.bb
>>> b/meta/recipes-kernel/modutils/modutils-initscripts.bb
>>> index 1665955..5ae34b4 100644
>>> --- a/meta/recipes-kernel/modutils/modutils-initscripts.bb
>>> +++ b/meta/recipes-kernel/modutils/modutils-initscripts.bb
>>> @@ -4,10 +4,10 @@ LICENSE = "PD"
>>> LIC_FILES_CHKSUM = "file://LICENSE;md5=7bf87fc37976e93ec66ad84fac58c098"
>>> SRC_URI = "file://modutils.sh \
>>> file://PD.patch"
>>> -PR = "r4"
>>> +PR = "r5"
>>> 
>>> INITSCRIPT_NAME = "modutils.sh"
>>> -INITSCRIPT_PARAMS = "start 20 S ."
>>> +INITSCRIPT_PARAMS = "start 2 S ."
>>> 
>>> inherit update-rc.d
>>> 
>> 
>> Should there not be a corresponding change to modutils_2.4.27.bb? It's
>> not clear to me
>> where there are these two separate recipes, but they should at least be
>> kept in sync.
>> 
> Gary,
> 
> Could you please resend this as a proper patch with Signed-off-by and commit info.
> 
> Thanks
>    Sau!
> 
>> diff --git a/meta/recipes-kernel/modutils/modutils_2.4.27.bb
>> b/meta/recipes-kernel/modutils/modutils_2.4.27.bb
>> index 1ebc90c..2944201 100644
>> --- a/meta/recipes-kernel/modutils/modutils_2.4.27.bb
>> +++ b/meta/recipes-kernel/modutils/modutils_2.4.27.bb
>> @@ -5,7 +5,7 @@ manageable for all users, administrators and
>> distribution maintainers."
>> LICENSE = "GPLv2"
>> LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
>> DEPENDS = "bison-native"
>> -PR = "r9"
>> +PR = "r10"
>> 
>> SRC_URI =
>> "${KERNELORG_MIRROR}/linux/utils/kernel/modutils/v2.4/modutils-${PV}.tar.bz2
>> \
>> file://lex.l.diff;patch=1 \
>> @@ -51,7 +51,7 @@ if test -n "$D"; then
>> done
>> fi
>> fi
>> -update-rc.d $D modutils.sh start 20 S .
>> +update-rc.d $D modutils.sh start 2 S .
>> }
>> 
>> pkg_prerm_modutils () {
>> 

Re: [PATCH 07/37] modutils-initscripts: fix wrong order of module loading happening in udev

[Gary Thomas]

On 04/25/2011 10:35 AM, Koen Kooi wrote:
> Is anyone still using 2.4 kernels? That's what modutils is for, module-init-tools is for 2.6 kernels

Good question, hence my confusion over the two recipes.

BTW, I just built a 2.4 kernel today, so yes, there are still users...

> Op 25 apr. 2011 om 17:49 heeft Saul Wold<sgw@linux.intel.com>  het volgende geschreven:
>
>> On 04/25/2011 05:02 AM, Gary Thomas wrote:
>>> On 04/23/2011 12:28 AM, Saul Wold wrote:
>>>> From: =?UTF-8?q?Petr=20=C5=A0tetiar?=<ynezz@true.cz>
>>>>
>>>> In the current state, udev init script is loaded as 3rd and
>>>> modutils.sh as
>>>> 20th, so udevadm called in udev init script loads all kernel modules
>>>> in some
>>>> unpredictable order, not honoring in any way specified order of
>>>> modules in
>>>> /etc/modules. This causes some troubles mainly in the first boot. So
>>>> to fix
>>>> this we now move loading of the kernel modules just before we exec
>>>> udev init
>>>> script. Example of the current state:
>>>>
>>>> Starting udev
>>>> rtc-m48t86 rtc-m48t86: rtc core: registered m48t86 as rtc0
>>>> rtc-m48t86 rtc-m48t86: battery ok
>>>> ep93xx-rtc ep93xx-rtc: rtc core: registered ep93xx-rtc as rtc1
>>>>
>>>> root@ts72xx:~# cat /etc/modules
>>>> rtc-ep93xx
>>>> ohci-hcd
>>>> ts72xx_sbcinfo
>>>> rtc-m48t86
>>>>
>>>> As you can guess, this is really wrong behaviour, because I've rtc1 as
>>>> the
>>>> main time source for my system.
>>>>
>>>> root@ts72xx:~# cat /etc/default/hwclock
>>>> HWCLOCKACCESS=yes
>>>> HWCLOCKDEVICE=/dev/rtc1
>>>>
>>>> Expected behaviour with this patch applied:
>>>>
>>>> Please wait: booting...
>>>> ep93xx-rtc ep93xx-rtc: rtc core: registered ep93xx-rtc as rtc0
>>>> usbcore: registered new device driver usb
>>>> ohci_hcd: USB 1.1 'Open' Host Controller (OHCI) Driver
>>>> ...
>>>> rtc-m48t86 rtc-m48t86: rtc core: registered m48t86 as rtc1
>>>> rtc-m48t86 rtc-m48t86: battery ok
>>>> Starting udev
>>>>
>>>> Signed-off-by: Petr Štetiar<ynezz@true.cz>
>>>>
>>>> (based on http://patches.openembedded.org/patch/1917/)
>>>> Signed-off-by: Koen Kooi<koen@dominion.thruhere.net>
>>>> Signed-off-by: Saul Wold<sgw@linux.intel.com>
>>>> ---
>>>> .../modutils/modutils-initscripts.bb | 4 ++--
>>>> 1 files changed, 2 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/meta/recipes-kernel/modutils/modutils-initscripts.bb
>>>> b/meta/recipes-kernel/modutils/modutils-initscripts.bb
>>>> index 1665955..5ae34b4 100644
>>>> --- a/meta/recipes-kernel/modutils/modutils-initscripts.bb
>>>> +++ b/meta/recipes-kernel/modutils/modutils-initscripts.bb
>>>> @@ -4,10 +4,10 @@ LICENSE = "PD"
>>>> LIC_FILES_CHKSUM = "file://LICENSE;md5=7bf87fc37976e93ec66ad84fac58c098"
>>>> SRC_URI = "file://modutils.sh \
>>>> file://PD.patch"
>>>> -PR = "r4"
>>>> +PR = "r5"
>>>>
>>>> INITSCRIPT_NAME = "modutils.sh"
>>>> -INITSCRIPT_PARAMS = "start 20 S ."
>>>> +INITSCRIPT_PARAMS = "start 2 S ."
>>>>
>>>> inherit update-rc.d
>>>>
>>>
>>> Should there not be a corresponding change to modutils_2.4.27.bb? It's
>>> not clear to me
>>> where there are these two separate recipes, but they should at least be
>>> kept in sync.
>>>
>> Gary,
>>
>> Could you please resend this as a proper patch with Signed-off-by and commit info.
>>
>> Thanks
>>     Sau!
>>
>>> diff --git a/meta/recipes-kernel/modutils/modutils_2.4.27.bb
>>> b/meta/recipes-kernel/modutils/modutils_2.4.27.bb
>>> index 1ebc90c..2944201 100644
>>> --- a/meta/recipes-kernel/modutils/modutils_2.4.27.bb
>>> +++ b/meta/recipes-kernel/modutils/modutils_2.4.27.bb
>>> @@ -5,7 +5,7 @@ manageable for all users, administrators and
>>> distribution maintainers."
>>> LICENSE = "GPLv2"
>>> LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
>>> DEPENDS = "bison-native"
>>> -PR = "r9"
>>> +PR = "r10"
>>>
>>> SRC_URI =
>>> "${KERNELORG_MIRROR}/linux/utils/kernel/modutils/v2.4/modutils-${PV}.tar.bz2
>>> \
>>> file://lex.l.diff;patch=1 \
>>> @@ -51,7 +51,7 @@ if test -n "$D"; then
>>> done
>>> fi
>>> fi
>>> -update-rc.d $D modutils.sh start 20 S .
>>> +update-rc.d $D modutils.sh start 2 S .
>>> }
>>>
>>> pkg_prerm_modutils () {
>>>

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

Re: [PATCH 07/37] modutils-initscripts: fix wrong order of module loading happening in udev

[Gary Thomas]

[-- Attachment #1: Type: text/plain, Size: 3290 bytes --]

On 04/25/2011 09:49 AM, Saul Wold wrote:
> On 04/25/2011 05:02 AM, Gary Thomas wrote:
>> On 04/23/2011 12:28 AM, Saul Wold wrote:
>>> From: =?UTF-8?q?Petr=20=C5=A0tetiar?=<ynezz@true.cz>
>>>
>>> In the current state, udev init script is loaded as 3rd and
>>> modutils.sh as
>>> 20th, so udevadm called in udev init script loads all kernel modules
>>> in some
>>> unpredictable order, not honoring in any way specified order of
>>> modules in
>>> /etc/modules. This causes some troubles mainly in the first boot. So
>>> to fix
>>> this we now move loading of the kernel modules just before we exec
>>> udev init
>>> script. Example of the current state:
>>>
>>> Starting udev
>>> rtc-m48t86 rtc-m48t86: rtc core: registered m48t86 as rtc0
>>> rtc-m48t86 rtc-m48t86: battery ok
>>> ep93xx-rtc ep93xx-rtc: rtc core: registered ep93xx-rtc as rtc1
>>>
>>> root@ts72xx:~# cat /etc/modules
>>> rtc-ep93xx
>>> ohci-hcd
>>> ts72xx_sbcinfo
>>> rtc-m48t86
>>>
>>> As you can guess, this is really wrong behaviour, because I've rtc1 as
>>> the
>>> main time source for my system.
>>>
>>> root@ts72xx:~# cat /etc/default/hwclock
>>> HWCLOCKACCESS=yes
>>> HWCLOCKDEVICE=/dev/rtc1
>>>
>>> Expected behaviour with this patch applied:
>>>
>>> Please wait: booting...
>>> ep93xx-rtc ep93xx-rtc: rtc core: registered ep93xx-rtc as rtc0
>>> usbcore: registered new device driver usb
>>> ohci_hcd: USB 1.1 'Open' Host Controller (OHCI) Driver
>>> ...
>>> rtc-m48t86 rtc-m48t86: rtc core: registered m48t86 as rtc1
>>> rtc-m48t86 rtc-m48t86: battery ok
>>> Starting udev
>>>
>>> Signed-off-by: Petr Štetiar<ynezz@true.cz>
>>>
>>> (based on http://patches.openembedded.org/patch/1917/)
>>> Signed-off-by: Koen Kooi<koen@dominion.thruhere.net>
>>> Signed-off-by: Saul Wold<sgw@linux.intel.com>
>>> ---
>>> .../modutils/modutils-initscripts.bb | 4 ++--
>>> 1 files changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/meta/recipes-kernel/modutils/modutils-initscripts.bb
>>> b/meta/recipes-kernel/modutils/modutils-initscripts.bb
>>> index 1665955..5ae34b4 100644
>>> --- a/meta/recipes-kernel/modutils/modutils-initscripts.bb
>>> +++ b/meta/recipes-kernel/modutils/modutils-initscripts.bb
>>> @@ -4,10 +4,10 @@ LICENSE = "PD"
>>> LIC_FILES_CHKSUM = "file://LICENSE;md5=7bf87fc37976e93ec66ad84fac58c098"
>>> SRC_URI = "file://modutils.sh \
>>> file://PD.patch"
>>> -PR = "r4"
>>> +PR = "r5"
>>>
>>> INITSCRIPT_NAME = "modutils.sh"
>>> -INITSCRIPT_PARAMS = "start 20 S ."
>>> +INITSCRIPT_PARAMS = "start 2 S ."
>>>
>>> inherit update-rc.d
>>>
>>
>> Should there not be a corresponding change to modutils_2.4.27.bb? It's
>> not clear to me
>> where there are these two separate recipes, but they should at least be
>> kept in sync.
>>
> Gary,
>
> Could you please resend this as a proper patch with Signed-off-by and commit info.

Attached.  However, as Koen pointed out, perhaps this recipe should just be dropped,
at least for Poky?  I don't know that 2.4 kernels are built or supported?

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

Re: [PATCH 07/37] modutils-initscripts: fix wrong order of module loading happening in udev

[Darren Hart]

On 04/25/2011 10:14 AM, Gary Thomas wrote:
> On 04/25/2011 09:49 AM, Saul Wold wrote:
>> On 04/25/2011 05:02 AM, Gary Thomas wrote:
>>> On 04/23/2011 12:28 AM, Saul Wold wrote:
>>>> From: =?UTF-8?q?Petr=20=C5=A0tetiar?=<ynezz@true.cz>
>>>>
>>>> In the current state, udev init script is loaded as 3rd and
>>>> modutils.sh as
>>>> 20th, so udevadm called in udev init script loads all kernel modules
>>>> in some
>>>> unpredictable order, not honoring in any way specified order of
>>>> modules in
>>>> /etc/modules. This causes some troubles mainly in the first boot. So
>>>> to fix
>>>> this we now move loading of the kernel modules just before we exec
>>>> udev init
>>>> script. Example of the current state:
>>>>
>>>> Starting udev
>>>> rtc-m48t86 rtc-m48t86: rtc core: registered m48t86 as rtc0
>>>> rtc-m48t86 rtc-m48t86: battery ok
>>>> ep93xx-rtc ep93xx-rtc: rtc core: registered ep93xx-rtc as rtc1
>>>>
>>>> root@ts72xx:~# cat /etc/modules
>>>> rtc-ep93xx
>>>> ohci-hcd
>>>> ts72xx_sbcinfo
>>>> rtc-m48t86
>>>>
>>>> As you can guess, this is really wrong behaviour, because I've rtc1 as
>>>> the
>>>> main time source for my system.
>>>>
>>>> root@ts72xx:~# cat /etc/default/hwclock
>>>> HWCLOCKACCESS=yes
>>>> HWCLOCKDEVICE=/dev/rtc1
>>>>
>>>> Expected behaviour with this patch applied:
>>>>
>>>> Please wait: booting...
>>>> ep93xx-rtc ep93xx-rtc: rtc core: registered ep93xx-rtc as rtc0
>>>> usbcore: registered new device driver usb
>>>> ohci_hcd: USB 1.1 'Open' Host Controller (OHCI) Driver
>>>> ...
>>>> rtc-m48t86 rtc-m48t86: rtc core: registered m48t86 as rtc1
>>>> rtc-m48t86 rtc-m48t86: battery ok
>>>> Starting udev
>>>>
>>>> Signed-off-by: Petr Štetiar<ynezz@true.cz>
>>>>
>>>> (based on http://patches.openembedded.org/patch/1917/)
>>>> Signed-off-by: Koen Kooi<koen@dominion.thruhere.net>
>>>> Signed-off-by: Saul Wold<sgw@linux.intel.com>
>>>> ---
>>>> .../modutils/modutils-initscripts.bb | 4 ++--
>>>> 1 files changed, 2 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/meta/recipes-kernel/modutils/modutils-initscripts.bb
>>>> b/meta/recipes-kernel/modutils/modutils-initscripts.bb
>>>> index 1665955..5ae34b4 100644
>>>> --- a/meta/recipes-kernel/modutils/modutils-initscripts.bb
>>>> +++ b/meta/recipes-kernel/modutils/modutils-initscripts.bb
>>>> @@ -4,10 +4,10 @@ LICENSE = "PD"
>>>> LIC_FILES_CHKSUM = "file://LICENSE;md5=7bf87fc37976e93ec66ad84fac58c098"
>>>> SRC_URI = "file://modutils.sh \
>>>> file://PD.patch"
>>>> -PR = "r4"
>>>> +PR = "r5"
>>>>
>>>> INITSCRIPT_NAME = "modutils.sh"
>>>> -INITSCRIPT_PARAMS = "start 20 S ."
>>>> +INITSCRIPT_PARAMS = "start 2 S ."
>>>>
>>>> inherit update-rc.d
>>>>
>>>
>>> Should there not be a corresponding change to modutils_2.4.27.bb? It's
>>> not clear to me
>>> where there are these two separate recipes, but they should at least be
>>> kept in sync.
>>>
>> Gary,
>>
>> Could you please resend this as a proper patch with Signed-off-by and commit info.
> 
> Attached.  However, as Koen pointed out, perhaps this recipe should just be dropped,
> at least for Poky?  I don't know that 2.4 kernels are built or supported?


Right, so for clarification, for 2.4 kernels, images should be built
using just the modutils_2.4.27.bb recipe. For 2.6 kernels, images should
be built using module_init_tools and modutils-initscripts.

In oe-core, task-base requires module-init-tools and task-core-boot
requires modutils-initscripts. That actually seems backwards to me as
modutils-initscripts is useless without module-init-tools.

There is a considerable amount of cruft in the kernel base classes
related to older kernels which I'd like to see purged. Perhaps a
meta-linux-2.4 layer would be a good place to keep things like these as
well as the modutils_2.4.27 recipe.

However, in terms of the immediate issue, I agree with Gary's patch.

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

Re: [PATCH 07/37] modutils-initscripts: fix wrong order of module loading happening in udev

[Khem Raj]

On Mon, Apr 25, 2011 at 10:47 PM, Darren Hart <dvhart@linux.intel.com> wrote:
> On 04/25/2011 10:14 AM, Gary Thomas wrote:
>> On 04/25/2011 09:49 AM, Saul Wold wrote:
>>> On 04/25/2011 05:02 AM, Gary Thomas wrote:
>>>> On 04/23/2011 12:28 AM, Saul Wold wrote:
>>>>> From: =?UTF-8?q?Petr=20=C5=A0tetiar?=<ynezz@true.cz>
>>>>>
>>>>> In the current state, udev init script is loaded as 3rd and
>>>>> modutils.sh as
>>>>> 20th, so udevadm called in udev init script loads all kernel modules
>>>>> in some
>>>>> unpredictable order, not honoring in any way specified order of
>>>>> modules in
>>>>> /etc/modules. This causes some troubles mainly in the first boot. So
>>>>> to fix
>>>>> this we now move loading of the kernel modules just before we exec
>>>>> udev init
>>>>> script. Example of the current state:
>>>>>
>>>>> Starting udev
>>>>> rtc-m48t86 rtc-m48t86: rtc core: registered m48t86 as rtc0
>>>>> rtc-m48t86 rtc-m48t86: battery ok
>>>>> ep93xx-rtc ep93xx-rtc: rtc core: registered ep93xx-rtc as rtc1
>>>>>
>>>>> root@ts72xx:~# cat /etc/modules
>>>>> rtc-ep93xx
>>>>> ohci-hcd
>>>>> ts72xx_sbcinfo
>>>>> rtc-m48t86
>>>>>
>>>>> As you can guess, this is really wrong behaviour, because I've rtc1 as
>>>>> the
>>>>> main time source for my system.
>>>>>
>>>>> root@ts72xx:~# cat /etc/default/hwclock
>>>>> HWCLOCKACCESS=yes
>>>>> HWCLOCKDEVICE=/dev/rtc1
>>>>>
>>>>> Expected behaviour with this patch applied:
>>>>>
>>>>> Please wait: booting...
>>>>> ep93xx-rtc ep93xx-rtc: rtc core: registered ep93xx-rtc as rtc0
>>>>> usbcore: registered new device driver usb
>>>>> ohci_hcd: USB 1.1 'Open' Host Controller (OHCI) Driver
>>>>> ...
>>>>> rtc-m48t86 rtc-m48t86: rtc core: registered m48t86 as rtc1
>>>>> rtc-m48t86 rtc-m48t86: battery ok
>>>>> Starting udev
>>>>>
>>>>> Signed-off-by: Petr Štetiar<ynezz@true.cz>
>>>>>
>>>>> (based on http://patches.openembedded.org/patch/1917/)
>>>>> Signed-off-by: Koen Kooi<koen@dominion.thruhere.net>
>>>>> Signed-off-by: Saul Wold<sgw@linux.intel.com>
>>>>> ---
>>>>> .../modutils/modutils-initscripts.bb | 4 ++--
>>>>> 1 files changed, 2 insertions(+), 2 deletions(-)
>>>>>
>>>>> diff --git a/meta/recipes-kernel/modutils/modutils-initscripts.bb
>>>>> b/meta/recipes-kernel/modutils/modutils-initscripts.bb
>>>>> index 1665955..5ae34b4 100644
>>>>> --- a/meta/recipes-kernel/modutils/modutils-initscripts.bb
>>>>> +++ b/meta/recipes-kernel/modutils/modutils-initscripts.bb
>>>>> @@ -4,10 +4,10 @@ LICENSE = "PD"
>>>>> LIC_FILES_CHKSUM = "file://LICENSE;md5=7bf87fc37976e93ec66ad84fac58c098"
>>>>> SRC_URI = "file://modutils.sh \
>>>>> file://PD.patch"
>>>>> -PR = "r4"
>>>>> +PR = "r5"
>>>>>
>>>>> INITSCRIPT_NAME = "modutils.sh"
>>>>> -INITSCRIPT_PARAMS = "start 20 S ."
>>>>> +INITSCRIPT_PARAMS = "start 2 S ."
>>>>>
>>>>> inherit update-rc.d
>>>>>
>>>>
>>>> Should there not be a corresponding change to modutils_2.4.27.bb? It's
>>>> not clear to me
>>>> where there are these two separate recipes, but they should at least be
>>>> kept in sync.
>>>>
>>> Gary,
>>>
>>> Could you please resend this as a proper patch with Signed-off-by and commit info.
>>
>> Attached.  However, as Koen pointed out, perhaps this recipe should just be dropped,
>> at least for Poky?  I don't know that 2.4 kernels are built or supported?
>
>
> Right, so for clarification, for 2.4 kernels, images should be built
> using just the modutils_2.4.27.bb recipe. For 2.6 kernels, images should
> be built using module_init_tools and modutils-initscripts.
>
> In oe-core, task-base requires module-init-tools and task-core-boot
> requires modutils-initscripts. That actually seems backwards to me as
> modutils-initscripts is useless without module-init-tools.
>
> There is a considerable amount of cruft in the kernel base classes
> related to older kernels which I'd like to see purged. Perhaps a
> meta-linux-2.4 layer would be a good place to keep things like these as
> well as the modutils_2.4.27 recipe.

Do we have usecases to even support 2.4 anymore ? I would suggest
to remove it if no use cases are reported.

>
> However, in terms of the immediate issue, I agree with Gary's patch.
>
> --
> Darren Hart
> Intel Open Source Technology Center
> Yocto Project - Linux Kernel
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Re: [PATCH 07/37] modutils-initscripts: fix wrong order of module loading happening in udev

[Richard Purdie]

On Tue, 2011-04-26 at 10:51 -0700, Khem Raj wrote:
> On Mon, Apr 25, 2011 at 10:47 PM, Darren Hart <dvhart@linux.intel.com> wrote:
> > On 04/25/2011 10:14 AM, Gary Thomas wrote:
> >
> > Right, so for clarification, for 2.4 kernels, images should be built
> > using just the modutils_2.4.27.bb recipe. For 2.6 kernels, images should
> > be built using module_init_tools and modutils-initscripts.
> >
> > In oe-core, task-base requires module-init-tools and task-core-boot
> > requires modutils-initscripts. That actually seems backwards to me as
> > modutils-initscripts is useless without module-init-tools.
> >
> > There is a considerable amount of cruft in the kernel base classes
> > related to older kernels which I'd like to see purged. Perhaps a
> > meta-linux-2.4 layer would be a good place to keep things like these as
> > well as the modutils_2.4.27 recipe.
> 
> Do we have usecases to even support 2.4 anymore ? I would suggest
> to remove it if no use cases are reported.

I think the time has come for OE-Core to clean out kernel.bbclass of the
2.4 code. If anyone does want to support 2.4, they can do it with a
separate kernel-2.4 class.

Cheers,

Richard

Re: [PATCH 07/37] modutils-initscripts: fix wrong order of module loading happening in udev

[Darren Hart]

On 04/28/2011 02:25 AM, Richard Purdie wrote:
> On Tue, 2011-04-26 at 10:51 -0700, Khem Raj wrote:
>> On Mon, Apr 25, 2011 at 10:47 PM, Darren Hart <dvhart@linux.intel.com> wrote:
>>> On 04/25/2011 10:14 AM, Gary Thomas wrote:
>>>
>>> Right, so for clarification, for 2.4 kernels, images should be built
>>> using just the modutils_2.4.27.bb recipe. For 2.6 kernels, images should
>>> be built using module_init_tools and modutils-initscripts.
>>>
>>> In oe-core, task-base requires module-init-tools and task-core-boot
>>> requires modutils-initscripts. That actually seems backwards to me as
>>> modutils-initscripts is useless without module-init-tools.
>>>
>>> There is a considerable amount of cruft in the kernel base classes
>>> related to older kernels which I'd like to see purged. Perhaps a
>>> meta-linux-2.4 layer would be a good place to keep things like these as
>>> well as the modutils_2.4.27 recipe.
>>
>> Do we have usecases to even support 2.4 anymore ? I would suggest
>> to remove it if no use cases are reported.
> 
> I think the time has come for OE-Core to clean out kernel.bbclass of the
> 2.4 code. If anyone does want to support 2.4, they can do it with a
> separate kernel-2.4 class.

Excellent. Added to my todo list for the not toooo distant future.

> 
> Cheers,
> 
> Richard
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel