All of lore.kernel.org
 help / color / mirror / Atom feed
* [CONSOLIDATED PULL 00/12] 2-June-2011
@ 2011-06-02  8:04 Saul Wold
  2011-06-02  8:05 ` [CONSOLIDATED PULL 01/12] m4: upgrade from 1.4.15 to 1.4.16 Saul Wold
                   ` (12 more replies)
  0 siblings, 13 replies; 16+ messages in thread
From: Saul Wold @ 2011-06-02  8:04 UTC (permalink / raw)
  To: openembedded-core

Richard:

Pulling a number of patches and updates from the list, they have been
built on the autobuild.

This has the gcc fix for qt4-x11-free in the form of a gcc patch

Sau!

The following changes since commit 0a496df0209c93fd00ea929b5f27faa1a6e600c0:

  clutter-1.6: Add patch to update gettext macro version (2011-06-01 18:32:30 +0100)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib sgw/stage
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage

Jingdong Lu (1):
  libx11: fix libX11 keysyms to pass xts5 of lsb

Kang Kai (1):
  task-core-lsb: add cups and ghostscript into image

Koen Kooi (3):
  u-boot: package up u-boot.bin for field upgrades
  shadow: remove selinux entry from pam.d/login
  avahi: enable service when using systemd

Nitin A Kamble (4):
  m4: upgrade from 1.4.15 to 1.4.16
  autoconf: upgrade from 2.65 to 2.68
  bison: upgrade from 2.4.3 to 2.5
  gettext-0.16.1: mark upstream status for gplv2 recipe's patches

Phil Blundell (1):
  rootfs_ipk: delete opkg metadata if package management not required
    and all packages are configured

Saul Wold (2):
  ghostscript: Fix up file locations and add i686
  gcc: Fix volatile access issue for ARM

 meta/classes/rootfs_ipk.bbclass                    |   11 ++
 meta/recipes-bsp/uboot/u-boot.inc                  |   11 ++
 meta/recipes-bsp/uboot/u-boot_2011.03.bb           |    2 +-
 meta/recipes-connectivity/avahi/avahi.inc          |   18 +++
 meta/recipes-connectivity/avahi/avahi_0.6.30.bb    |    2 +-
 .../gettext/gettext-0.16.1/disable_java.patch      |    3 +-
 .../gettext-0.16.1/fix_aclocal_version.patch       |    1 +
 .../gettext-0.16.1/fix_gnu_source_circular.patch   |    3 +-
 .../gettext/gettext-0.16.1/fixchicken.patch        |    3 +-
 .../gettext/gettext-0.16.1/getline.m4.patch        |    3 +-
 .../gettext-autoconf-lib-link-no-L.patch           |    3 +-
 .../gettext-error_print_progname.patch             |    3 +-
 .../gettext/gettext-0.16.1/gettext-vpath.patch     |    3 +-
 .../gettext-0.16.1/hardcode_macro_version.patch    |    3 +-
 .../gettext/gettext-0.16.1/linklib_from_0.17.patch |    3 +-
 .../{autoconf-2.65 => autoconf}/autoconf-x.patch   |    0
 .../autoheader-nonfatal-warnings.patch             |    0
 .../autoreconf-exclude.patch                       |    0
 .../autoreconf-foreign.patch                       |    0
 .../autoreconf-gnuconfigize.patch                  |    0
 .../autoreconf-include.patch                       |    0
 .../{autoconf-2.65 => autoconf}/config_site.patch  |   19 ++-
 .../fix_path_xtra.patch                            |   14 +-
 .../path_prog_fixes.patch                          |    0
 .../program_prefix.patch                           |    0
 .../{autoconf_2.65.bb => autoconf_2.68.bb}         |    6 +-
 meta/recipes-devtools/bison/bison/m4.patch         |  131 --------------------
 .../bison/bison/uclibc-sched_param-def.patch       |   21 ---
 .../bison/{bison_2.4.3.bb => bison_2.5.bb}         |    7 +-
 meta/recipes-devtools/gcc/gcc-4.6.0.inc            |    4 +-
 .../gcc/gcc-4.6.0/volatile_access_backport.patch   |   28 ++++
 .../{m4-native_1.4.15.bb => m4-native_1.4.16.bb}   |    0
 .../m4/{m4_1.4.15.bb => m4_1.4.16.bb}              |    6 +-
 .../ghostscript/{ => }/ghostscript/arm/objarch.h   |    0
 .../ghostscript/{ => }/ghostscript/arm/soobjarch.h |    0
 .../ghostscript/{ => }/ghostscript/i586/objarch.h  |    0
 .../{ => }/ghostscript/i586/soobjarch.h            |    0
 meta/recipes-extended/ghostscript/ghostscript/i686 |    1 +
 .../ghostscript/{ => }/ghostscript/mips/objarch.h  |    0
 .../{ => }/ghostscript/mips/soobjarch.h            |    0
 .../{ => }/ghostscript/powerpc/objarch.h           |    0
 .../{ => }/ghostscript/powerpc/soobjarch.h         |    0
 .../{ => }/ghostscript/x86_64/objarch.h            |    0
 .../{ => }/ghostscript/x86_64/soobjarch.h          |    0
 meta/recipes-extended/shadow/files/pam.d/login     |    7 -
 meta/recipes-extended/shadow/shadow.inc            |    2 +
 meta/recipes-extended/tasks/task-core-lsb.bb       |    3 +-
 .../libx11-1.3.4/makekeys_crosscompile.patch       |   45 +++++++
 .../recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb |    5 +-
 meta/recipes-graphics/xorg-lib/libx11.inc          |    8 +-
 meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb     |    5 +-
 51 files changed, 185 insertions(+), 199 deletions(-)
 rename meta/recipes-devtools/autoconf/{autoconf-2.65 => autoconf}/autoconf-x.patch (100%)
 rename meta/recipes-devtools/autoconf/{autoconf-2.65 => autoconf}/autoheader-nonfatal-warnings.patch (100%)
 rename meta/recipes-devtools/autoconf/{autoconf-2.65 => autoconf}/autoreconf-exclude.patch (100%)
 rename meta/recipes-devtools/autoconf/{autoconf-2.65 => autoconf}/autoreconf-foreign.patch (100%)
 rename meta/recipes-devtools/autoconf/{autoconf-2.65 => autoconf}/autoreconf-gnuconfigize.patch (100%)
 rename meta/recipes-devtools/autoconf/{autoconf-2.65 => autoconf}/autoreconf-include.patch (100%)
 rename meta/recipes-devtools/autoconf/{autoconf-2.65 => autoconf}/config_site.patch (60%)
 rename meta/recipes-devtools/autoconf/{autoconf-2.65 => autoconf}/fix_path_xtra.patch (90%)
 rename meta/recipes-devtools/autoconf/{autoconf-2.65 => autoconf}/path_prog_fixes.patch (100%)
 rename meta/recipes-devtools/autoconf/{autoconf-2.65 => autoconf}/program_prefix.patch (100%)
 rename meta/recipes-devtools/autoconf/{autoconf_2.65.bb => autoconf_2.68.bb} (85%)
 delete mode 100644 meta/recipes-devtools/bison/bison/uclibc-sched_param-def.patch
 rename meta/recipes-devtools/bison/{bison_2.4.3.bb => bison_2.5.bb} (85%)
 create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/volatile_access_backport.patch
 rename meta/recipes-devtools/m4/{m4-native_1.4.15.bb => m4-native_1.4.16.bb} (100%)
 rename meta/recipes-devtools/m4/{m4_1.4.15.bb => m4_1.4.16.bb} (75%)
 rename meta/recipes-extended/ghostscript/{ => }/ghostscript/arm/objarch.h (100%)
 rename meta/recipes-extended/ghostscript/{ => }/ghostscript/arm/soobjarch.h (100%)
 rename meta/recipes-extended/ghostscript/{ => }/ghostscript/i586/objarch.h (100%)
 rename meta/recipes-extended/ghostscript/{ => }/ghostscript/i586/soobjarch.h (100%)
 create mode 120000 meta/recipes-extended/ghostscript/ghostscript/i686
 rename meta/recipes-extended/ghostscript/{ => }/ghostscript/mips/objarch.h (100%)
 rename meta/recipes-extended/ghostscript/{ => }/ghostscript/mips/soobjarch.h (100%)
 rename meta/recipes-extended/ghostscript/{ => }/ghostscript/powerpc/objarch.h (100%)
 rename meta/recipes-extended/ghostscript/{ => }/ghostscript/powerpc/soobjarch.h (100%)
 rename meta/recipes-extended/ghostscript/{ => }/ghostscript/x86_64/objarch.h (100%)
 rename meta/recipes-extended/ghostscript/{ => }/ghostscript/x86_64/soobjarch.h (100%)
 create mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.3.4/makekeys_crosscompile.patch

-- 
1.7.3.4




^ permalink raw reply	[flat|nested] 16+ messages in thread
* [CONSOLIDATED PULL 01/12] m4: upgrade from 1.4.15 to 1.4.16
  2011-06-02  8:04 [CONSOLIDATED PULL 00/12] 2-June-2011 Saul Wold
@ 2011-06-02  8:05 ` Saul Wold
  2011-06-02  8:05 ` [CONSOLIDATED PULL 02/12] autoconf: upgrade from 2.65 to 2.68 Saul Wold
                   ` (11 subsequent siblings)
  12 siblings, 0 replies; 16+ messages in thread
From: Saul Wold @ 2011-06-02  8:05 UTC (permalink / raw)
  To: openembedded-core

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

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../{m4-native_1.4.15.bb => m4-native_1.4.16.bb}   |    0
 .../m4/{m4_1.4.15.bb => m4_1.4.16.bb}              |    6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/m4/{m4-native_1.4.15.bb => m4-native_1.4.16.bb} (100%)
 rename meta/recipes-devtools/m4/{m4_1.4.15.bb => m4_1.4.16.bb} (75%)

diff --git a/meta/recipes-devtools/m4/m4-native_1.4.15.bb b/meta/recipes-devtools/m4/m4-native_1.4.16.bb
similarity index 100%
rename from meta/recipes-devtools/m4/m4-native_1.4.15.bb
rename to meta/recipes-devtools/m4/m4-native_1.4.16.bb
diff --git a/meta/recipes-devtools/m4/m4_1.4.15.bb b/meta/recipes-devtools/m4/m4_1.4.16.bb
similarity index 75%
rename from meta/recipes-devtools/m4/m4_1.4.15.bb
rename to meta/recipes-devtools/m4/m4_1.4.16.bb
index 586071f..53ef5ae 100644
--- a/meta/recipes-devtools/m4/m4_1.4.15.bb
+++ b/meta/recipes-devtools/m4/m4_1.4.16.bb
@@ -4,14 +4,14 @@ compatible although it has some extensions (for example, handling more than 9 po
 GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc."
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
-	file://examples/COPYING;md5=380fd7d57d3fd009a5716e074a845d6d"
+	file://examples/COPYING;md5=fbc986d45b3dae6725c29870dd6b669d"
 
 PR = "r0"
 SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \
            file://ac_config_links.patch;patch=1"
 
-SRC_URI[md5sum] = "5649a2e593b6c639deae9e72ede777dd"
-SRC_URI[sha256sum] = "3d66dfeb609007062265a67b9a2c08d3686a74068830bacae60a6d58413c9367"
+SRC_URI[md5sum] = "a5dfb4f2b7370e9d34293d23fd09b280"
+SRC_URI[sha256sum] = "e9176a35bb13a1b08482359aa554ee8072794f58f00e4827bf0e06b570c827da"
 
 inherit autotools
 
-- 
1.7.3.4




^ permalink raw reply related	[flat|nested] 16+ messages in thread
* [CONSOLIDATED PULL 02/12] autoconf: upgrade from 2.65 to 2.68
  2011-06-02  8:04 [CONSOLIDATED PULL 00/12] 2-June-2011 Saul Wold
  2011-06-02  8:05 ` [CONSOLIDATED PULL 01/12] m4: upgrade from 1.4.15 to 1.4.16 Saul Wold
@ 2011-06-02  8:05 ` Saul Wold
  2011-06-02  8:05 ` [CONSOLIDATED PULL 03/12] bison: upgrade from 2.4.3 to 2.5 Saul Wold
                   ` (10 subsequent siblings)
  12 siblings, 0 replies; 16+ messages in thread
From: Saul Wold @ 2011-06-02  8:05 UTC (permalink / raw)
  To: openembedded-core

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

And rebase the patches to the newer code.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../{autoconf-2.65 => autoconf}/autoconf-x.patch   |    0
 .../autoheader-nonfatal-warnings.patch             |    0
 .../autoreconf-exclude.patch                       |    0
 .../autoreconf-foreign.patch                       |    0
 .../autoreconf-gnuconfigize.patch                  |    0
 .../autoreconf-include.patch                       |    0
 .../{autoconf-2.65 => autoconf}/config_site.patch  |   19 ++++++++++++++-----
 .../fix_path_xtra.patch                            |   14 +++++++-------
 .../path_prog_fixes.patch                          |    0
 .../program_prefix.patch                           |    0
 .../{autoconf_2.65.bb => autoconf_2.68.bb}         |    6 +++---
 11 files changed, 24 insertions(+), 15 deletions(-)
 rename meta/recipes-devtools/autoconf/{autoconf-2.65 => autoconf}/autoconf-x.patch (100%)
 rename meta/recipes-devtools/autoconf/{autoconf-2.65 => autoconf}/autoheader-nonfatal-warnings.patch (100%)
 rename meta/recipes-devtools/autoconf/{autoconf-2.65 => autoconf}/autoreconf-exclude.patch (100%)
 rename meta/recipes-devtools/autoconf/{autoconf-2.65 => autoconf}/autoreconf-foreign.patch (100%)
 rename meta/recipes-devtools/autoconf/{autoconf-2.65 => autoconf}/autoreconf-gnuconfigize.patch (100%)
 rename meta/recipes-devtools/autoconf/{autoconf-2.65 => autoconf}/autoreconf-include.patch (100%)
 rename meta/recipes-devtools/autoconf/{autoconf-2.65 => autoconf}/config_site.patch (60%)
 rename meta/recipes-devtools/autoconf/{autoconf-2.65 => autoconf}/fix_path_xtra.patch (90%)
 rename meta/recipes-devtools/autoconf/{autoconf-2.65 => autoconf}/path_prog_fixes.patch (100%)
 rename meta/recipes-devtools/autoconf/{autoconf-2.65 => autoconf}/program_prefix.patch (100%)
 rename meta/recipes-devtools/autoconf/{autoconf_2.65.bb => autoconf_2.68.bb} (85%)

diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/autoconf-x.patch b/meta/recipes-devtools/autoconf/autoconf/autoconf-x.patch
similarity index 100%
rename from meta/recipes-devtools/autoconf/autoconf-2.65/autoconf-x.patch
rename to meta/recipes-devtools/autoconf/autoconf/autoconf-x.patch
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/autoheader-nonfatal-warnings.patch b/meta/recipes-devtools/autoconf/autoconf/autoheader-nonfatal-warnings.patch
similarity index 100%
rename from meta/recipes-devtools/autoconf/autoconf-2.65/autoheader-nonfatal-warnings.patch
rename to meta/recipes-devtools/autoconf/autoconf/autoheader-nonfatal-warnings.patch
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-exclude.patch b/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch
similarity index 100%
rename from meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-exclude.patch
rename to meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-foreign.patch b/meta/recipes-devtools/autoconf/autoconf/autoreconf-foreign.patch
similarity index 100%
rename from meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-foreign.patch
rename to meta/recipes-devtools/autoconf/autoconf/autoreconf-foreign.patch
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-gnuconfigize.patch b/meta/recipes-devtools/autoconf/autoconf/autoreconf-gnuconfigize.patch
similarity index 100%
rename from meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-gnuconfigize.patch
rename to meta/recipes-devtools/autoconf/autoconf/autoreconf-gnuconfigize.patch
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-include.patch b/meta/recipes-devtools/autoconf/autoconf/autoreconf-include.patch
similarity index 100%
rename from meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-include.patch
rename to meta/recipes-devtools/autoconf/autoconf/autoreconf-include.patch
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/config_site.patch b/meta/recipes-devtools/autoconf/autoconf/config_site.patch
similarity index 60%
rename from meta/recipes-devtools/autoconf/autoconf-2.65/config_site.patch
rename to meta/recipes-devtools/autoconf/autoconf/config_site.patch
index e3ff318..9f04440 100644
--- a/meta/recipes-devtools/autoconf/autoconf-2.65/config_site.patch
+++ b/meta/recipes-devtools/autoconf/autoconf/config_site.patch
@@ -6,17 +6,26 @@ them.
 
 RP 1/2/10
 
-Index: autoconf-2.65/lib/autoconf/general.m4
+Updated for 2.68 version: the CONFIG_SITE var was not getting used at all
+fixed the 2.68 code 
+Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/27
+
+Index: autoconf-2.68/lib/autoconf/general.m4
 ===================================================================
---- autoconf-2.65.orig/lib/autoconf/general.m4	2010-02-01 12:41:32.329073138 +0000
-+++ autoconf-2.65/lib/autoconf/general.m4	2010-02-01 12:41:56.769040799 +0000
-@@ -1863,17 +1863,10 @@
+--- autoconf-2.68.orig/lib/autoconf/general.m4
++++ autoconf-2.68/lib/autoconf/general.m4
+@@ -1878,7 +1878,6 @@ AU_DEFUN([AC_VALIDATE_CACHED_SYSTEM_TUPL
  m4_define([AC_SITE_LOAD],
  [# Prefer an explicitly selected file to automatically selected ones.
  ac_site_file1=NONE
 -ac_site_file2=NONE
  if test -n "$CONFIG_SITE"; then
-   ac_site_file1=$CONFIG_SITE
+   # We do not want a PATH search for config.site.
+   case $CONFIG_SITE in @%:@((
+@@ -1886,14 +1885,8 @@ if test -n "$CONFIG_SITE"; then
+     */*) ac_site_file1=$CONFIG_SITE;;
+     *)   ac_site_file1=./$CONFIG_SITE;;
+   esac
 -elif test "x$prefix" != xNONE; then
 -  ac_site_file1=$prefix/share/config.site
 -  ac_site_file2=$prefix/etc/config.site
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/fix_path_xtra.patch b/meta/recipes-devtools/autoconf/autoconf/fix_path_xtra.patch
similarity index 90%
rename from meta/recipes-devtools/autoconf/autoconf-2.65/fix_path_xtra.patch
rename to meta/recipes-devtools/autoconf/autoconf/fix_path_xtra.patch
index 29fe6a2..65df88f 100644
--- a/meta/recipes-devtools/autoconf/autoconf-2.65/fix_path_xtra.patch
+++ b/meta/recipes-devtools/autoconf/autoconf/fix_path_xtra.patch
@@ -6,11 +6,11 @@ This patch removes them to stop any confusion.
 
 RP - 20071115
 
-Index: autoconf-2.65/lib/autoconf/libs.m4
+Index: autoconf-2.68/lib/autoconf/libs.m4
 ===================================================================
---- autoconf-2.65.orig/lib/autoconf/libs.m4	2009-10-29 01:53:41.000000000 +0000
-+++ autoconf-2.65/lib/autoconf/libs.m4	2010-01-29 13:40:13.000000000 +0000
-@@ -159,53 +159,6 @@
+--- autoconf-2.68.orig/lib/autoconf/libs.m4
++++ autoconf-2.68/lib/autoconf/libs.m4
+@@ -159,53 +159,6 @@ m4_popdef([AC_Lib_Name])dnl
  # --------------------- #
  
  
@@ -32,7 +32,7 @@ Index: autoconf-2.65/lib/autoconf/libs.m4
 -	@echo libdir='${LIBDIR}'
 -_ACEOF
 -  if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
--    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+-    # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 -    for ac_var in incroot usrlibdir libdir; do
 -      eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
 -    done
@@ -64,7 +64,7 @@ Index: autoconf-2.65/lib/autoconf/libs.m4
  # _AC_PATH_X_DIRECT
  # -----------------
  # Internal subroutine of _AC_PATH_X.
-@@ -213,44 +166,7 @@
+@@ -213,44 +166,7 @@ fi
  m4_define([_AC_PATH_X_DIRECT],
  [# Standard set of common directories for X headers.
  # Check X11 before X11Rn because it is often a symlink to the current release.
@@ -110,7 +110,7 @@ Index: autoconf-2.65/lib/autoconf/libs.m4
  
  if test "$ac_x_includes" = no; then
    # Guess where to find include files, by looking for Xlib.h.
-@@ -299,7 +215,6 @@
+@@ -299,7 +215,6 @@ AC_DEFUN([_AC_PATH_X],
  [AC_CACHE_VAL(ac_cv_have_x,
  [# One or both of the vars are not set, and there is no cached value.
  ac_x_includes=no ac_x_libraries=no
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/path_prog_fixes.patch b/meta/recipes-devtools/autoconf/autoconf/path_prog_fixes.patch
similarity index 100%
rename from meta/recipes-devtools/autoconf/autoconf-2.65/path_prog_fixes.patch
rename to meta/recipes-devtools/autoconf/autoconf/path_prog_fixes.patch
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/program_prefix.patch b/meta/recipes-devtools/autoconf/autoconf/program_prefix.patch
similarity index 100%
rename from meta/recipes-devtools/autoconf/autoconf-2.65/program_prefix.patch
rename to meta/recipes-devtools/autoconf/autoconf/program_prefix.patch
diff --git a/meta/recipes-devtools/autoconf/autoconf_2.65.bb b/meta/recipes-devtools/autoconf/autoconf_2.68.bb
similarity index 85%
rename from meta/recipes-devtools/autoconf/autoconf_2.65.bb
rename to meta/recipes-devtools/autoconf/autoconf_2.68.bb
index 0bc615e..c647a15 100644
--- a/meta/recipes-devtools/autoconf/autoconf_2.65.bb
+++ b/meta/recipes-devtools/autoconf/autoconf_2.68.bb
@@ -1,6 +1,6 @@
 require autoconf.inc
 
-PR = "r2"
+PR = "r0"
 
 PARALLEL_MAKE = ""
 
@@ -17,8 +17,8 @@ SRC_URI += "file://autoreconf-include.patch;patch=1 \
 	   ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]} \
            file://config_site.patch;patch=1"
 
-SRC_URI[md5sum] = "a6de1cc6434cd64038b0a0ae4e252b33"
-SRC_URI[sha256sum] = "db11944057f3faf229ff5d6ce3fcd819f565455c152b72cec17ebc1cbb80136b"
+SRC_URI[md5sum] = "864d785215aa60d627c91fcb21b05b07"
+SRC_URI[sha256sum] = "c491fb273fd6d4ca925e26ceed3d177920233c76d542b150ff35e571454332c8"
 
 DEPENDS_virtclass-native = "m4-native gnu-config-native"
 RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native"
-- 
1.7.3.4




^ permalink raw reply related	[flat|nested] 16+ messages in thread
* [CONSOLIDATED PULL 03/12] bison: upgrade from 2.4.3 to 2.5
  2011-06-02  8:04 [CONSOLIDATED PULL 00/12] 2-June-2011 Saul Wold
  2011-06-02  8:05 ` [CONSOLIDATED PULL 01/12] m4: upgrade from 1.4.15 to 1.4.16 Saul Wold
  2011-06-02  8:05 ` [CONSOLIDATED PULL 02/12] autoconf: upgrade from 2.65 to 2.68 Saul Wold
@ 2011-06-02  8:05 ` Saul Wold
  2011-06-02  8:05 ` [CONSOLIDATED PULL 04/12] gettext-0.16.1: mark upstream status for gplv2 recipe's patches Saul Wold
                   ` (9 subsequent siblings)
  12 siblings, 0 replies; 16+ messages in thread
From: Saul Wold @ 2011-06-02  8:05 UTC (permalink / raw)
  To: openembedded-core

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

This version of bison needs m4 1.4.16 or newer

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 meta/recipes-devtools/bison/bison/m4.patch         |  131 --------------------
 .../bison/bison/uclibc-sched_param-def.patch       |   21 ---
 .../bison/{bison_2.4.3.bb => bison_2.5.bb}         |    7 +-
 3 files changed, 3 insertions(+), 156 deletions(-)
 delete mode 100644 meta/recipes-devtools/bison/bison/uclibc-sched_param-def.patch
 rename meta/recipes-devtools/bison/{bison_2.4.3.bb => bison_2.5.bb} (85%)

diff --git a/meta/recipes-devtools/bison/bison/m4.patch b/meta/recipes-devtools/bison/bison/m4.patch
index 0754a90..d139da5 100644
--- a/meta/recipes-devtools/bison/bison/m4.patch
+++ b/meta/recipes-devtools/bison/bison/m4.patch
@@ -75,109 +75,6 @@ Index: bison-2.4.2/m4/uintmax_t.m4
 +   if <inttypes.h> and <stdint.h> don't define.])
 +  fi
 +])
-Index: bison-2.4.2/m4/glibc21.m4
-===================================================================
---- /dev/null
-+++ bison-2.4.2/m4/glibc21.m4
-@@ -0,0 +1,32 @@
-+# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
-+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+# Test for the GNU C Library, version 2.1 or newer.
-+# From Bruno Haible.
-+
-+AC_DEFUN([jm_GLIBC21],
-+  [
-+    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
-+      ac_cv_gnu_library_2_1,
-+      [AC_EGREP_CPP([Lucky GNU user],
-+	[
-+#include <features.h>
-+#ifdef __GNU_LIBRARY__
-+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
-+  Lucky GNU user
-+ #endif
-+#endif
-+	],
-+	ac_cv_gnu_library_2_1=yes,
-+	ac_cv_gnu_library_2_1=no)
-+      ]
-+    )
-+    AC_SUBST(GLIBC21)
-+    GLIBC21="$ac_cv_gnu_library_2_1"
-+  ]
-+)
-Index: bison-2.4.2/m4/stdint_h.m4
-===================================================================
---- /dev/null
-+++ bison-2.4.2/m4/stdint_h.m4
-@@ -0,0 +1,28 @@
-+# stdint_h.m4 serial 2 (gettext-0.11.4)
-+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Paul Eggert.
-+
-+# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
-+# doesn't clash with <sys/types.h>, and declares uintmax_t.
-+
-+AC_DEFUN([jm_AC_HEADER_STDINT_H],
-+[
-+  AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
-+  [AC_TRY_COMPILE(
-+    [#include <sys/types.h>
-+#include <stdint.h>],
-+    [uintmax_t i = (uintmax_t) -1;],
-+    jm_ac_cv_header_stdint_h=yes,
-+    jm_ac_cv_header_stdint_h=no)])
-+  if test $jm_ac_cv_header_stdint_h = yes; then
-+    AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
-+[Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
-+   and declares uintmax_t. ])
-+  fi
-+])
-Index: bison-2.4.2/m4/inttypes_h.m4
-===================================================================
---- /dev/null
-+++ bison-2.4.2/m4/inttypes_h.m4
-@@ -0,0 +1,28 @@
-+# inttypes_h.m4 serial 4 (gettext-0.11.4)
-+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Paul Eggert.
-+
-+# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
-+# doesn't clash with <sys/types.h>, and declares uintmax_t.
-+
-+AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
-+[
-+  AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
-+  [AC_TRY_COMPILE(
-+    [#include <sys/types.h>
-+#include <inttypes.h>],
-+    [uintmax_t i = (uintmax_t) -1;],
-+    jm_ac_cv_header_inttypes_h=yes,
-+    jm_ac_cv_header_inttypes_h=no)])
-+  if test $jm_ac_cv_header_inttypes_h = yes; then
-+    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
-+[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
-+   and declares uintmax_t. ])
-+  fi
-+])
 Index: bison-2.4.2/m4/ulonglong.m4
 ===================================================================
 --- /dev/null
@@ -206,34 +103,6 @@ Index: bison-2.4.2/m4/ulonglong.m4
 +      [Define if you have the unsigned long long type.])
 +  fi
 +])
-Index: bison-2.4.2/m4/codeset.m4
-===================================================================
---- /dev/null
-+++ bison-2.4.2/m4/codeset.m4
-@@ -0,0 +1,23 @@
-+# codeset.m4 serial AM1 (gettext-0.10.40)
-+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Bruno Haible.
-+
-+AC_DEFUN([AM_LANGINFO_CODESET],
-+[
-+  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
-+    [AC_TRY_LINK([#include <langinfo.h>],
-+      [char* cs = nl_langinfo(CODESET);],
-+      am_cv_langinfo_codeset=yes,
-+      am_cv_langinfo_codeset=no)
-+    ])
-+  if test $am_cv_langinfo_codeset = yes; then
-+    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
-+      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
-+  fi
-+])
 Index: bison-2.4.2/m4/intdiv0.m4
 ===================================================================
 --- /dev/null
diff --git a/meta/recipes-devtools/bison/bison/uclibc-sched_param-def.patch b/meta/recipes-devtools/bison/bison/uclibc-sched_param-def.patch
deleted file mode 100644
index 6774838..0000000
--- a/meta/recipes-devtools/bison/bison/uclibc-sched_param-def.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Upstream-Status: Pending
-
-uclibc defines __GLIBC__ but it does not expose struct shed_param as much as glibc
-and is not needed too per standard. gnulib attempts to use it but we have to account
-for it because in this case uclibc does not behave like glibc.
-
--Khem
-
-http://bugs.gentoo.org/336484
-
---- m4-1.4.14/lib/spawn.in.h
-+++ m4-1.4.14/lib/spawn.in.h
-@@ -31,7 +31,7 @@
- 
- /* Get definitions of 'struct sched_param' and 'sigset_t'.
-    But avoid namespace pollution on glibc systems.  */
--#ifndef __GLIBC__
-+#if !defined __GLIBC__ || defined __UCLIBC__
- # include <sched.h>
- # include <signal.h>
- #endif
diff --git a/meta/recipes-devtools/bison/bison_2.4.3.bb b/meta/recipes-devtools/bison/bison_2.5.bb
similarity index 85%
rename from meta/recipes-devtools/bison/bison_2.4.3.bb
rename to meta/recipes-devtools/bison/bison_2.5.bb
index 3c164d9..b81efab 100644
--- a/meta/recipes-devtools/bison/bison_2.4.3.bb
+++ b/meta/recipes-devtools/bison/bison_2.5.bb
@@ -10,18 +10,17 @@ SECTION = "devel"
 PRIORITY = "optional"
 DEPENDS = "bison-native"
 
-PR = "r2"
+PR = "r0"
 
 BASE_SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \
 	   file://m4.patch \
-	   file://uclibc-sched_param-def.patch \
 	  "
 
 SRC_URI = "${BASE_SRC_URI} \
         file://fix_cross_manpage_building.patch "
 
-SRC_URI[md5sum] = "ea45c778b36bdc7a720096819e292a73"
-SRC_URI[sha256sum] = "6b17be5e63ff6667c83f6ef0423befe0ba23d4bc554c4c33b02ce5bb65179b16"
+SRC_URI[md5sum] = "687e1dcd29452789d34eaeea4c25abe4"
+SRC_URI[sha256sum] = "722def46e4a19a5b7a579ef30db1965f86c37c1a20a5f0113743a2e4399f7c99"
 
 DEPENDS_virtclass-native = "gettext-native"
 SRC_URI_virtclass-native = "${BASE_SRC_URI}"
-- 
1.7.3.4




^ permalink raw reply related	[flat|nested] 16+ messages in thread
* [CONSOLIDATED PULL 04/12] gettext-0.16.1: mark upstream status for gplv2 recipe's patches
  2011-06-02  8:04 [CONSOLIDATED PULL 00/12] 2-June-2011 Saul Wold
                   ` (2 preceding siblings ...)
  2011-06-02  8:05 ` [CONSOLIDATED PULL 03/12] bison: upgrade from 2.4.3 to 2.5 Saul Wold
@ 2011-06-02  8:05 ` Saul Wold
  2011-06-02  8:05 ` [CONSOLIDATED PULL 05/12] u-boot: package up u-boot.bin for field upgrades Saul Wold
                   ` (8 subsequent siblings)
  12 siblings, 0 replies; 16+ messages in thread
From: Saul Wold @ 2011-06-02  8:05 UTC (permalink / raw)
  To: openembedded-core

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

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../gettext/gettext-0.16.1/disable_java.patch      |    3 ++-
 .../gettext-0.16.1/fix_aclocal_version.patch       |    1 +
 .../gettext-0.16.1/fix_gnu_source_circular.patch   |    3 ++-
 .../gettext/gettext-0.16.1/fixchicken.patch        |    3 ++-
 .../gettext/gettext-0.16.1/getline.m4.patch        |    3 ++-
 .../gettext-autoconf-lib-link-no-L.patch           |    3 ++-
 .../gettext-error_print_progname.patch             |    3 ++-
 .../gettext/gettext-0.16.1/gettext-vpath.patch     |    3 ++-
 .../gettext-0.16.1/hardcode_macro_version.patch    |    3 ++-
 .../gettext/gettext-0.16.1/linklib_from_0.17.patch |    3 ++-
 10 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch b/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch
index 2f8478a..e4c5f15 100644
--- a/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch
+++ b/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch
@@ -1,8 +1,9 @@
+
 # Pulled from OpenEmbedded
 # 
 # Commented by: Saul Wold <saul.wold@intel.com>
 
-Upstream-Status: Inappropriate [embedded]
+Upstream-Status: Inappropriate [licensing]
 
 Index: gettext-0.16.1/gettext-tools/configure.ac
 ===================================================================
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch b/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch
index 8fe7712..7293f5b 100644
--- a/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch
+++ b/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch
@@ -1,3 +1,4 @@
+
 This patch updates the required version number from 2.61 to the 
 current 2.65 version of aclocal, this will need to be updated 
 when we update aclocal
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch b/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch
index d1c0bbb..0686149 100644
--- a/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch
+++ b/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch
@@ -1,9 +1,10 @@
+
 This patch removes the circular dependency on AC_GNU_SOURCE in
 AC_USE_SYSTEM_EXTENSIONS.
 
 Thanks to Mark Hatle for the timely pointers and fixes.
 
-Upstream-Status: Inappropriate [configuration]
+Upstream-Status: Inappropriate [licensing]
 
 Signed-off-by Saul Wold <sgw@linux.intel.com>
 
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch b/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch
index d6bb7b0..36ce463 100644
--- a/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch
+++ b/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch
@@ -1,8 +1,9 @@
+
 # Pulled from OpenEmbedded
 # 
 # Commented by: Saul Wold <saul.wold@intel.com>
 
-Upstream-Status: Inappropriate [embedded]
+Upstream-Status: Inappropriate [licensing]
 
 Index: gettext-tools/m4/csharpcomp.m4
 ===================================================================
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch b/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch
index 34965fc..bf995bc 100644
--- a/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch
+++ b/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch
@@ -1,8 +1,9 @@
+
 # Pulled from OpenEmbedded
 # 
 # Commented by: Saul Wold <saul.wold@intel.com>
 
-Upstream-Status: Inappropriate [configuration]
+Upstream-Status: Inappropriate [licensing]
 
 --- /gettext-tools/m4/orig-getline.m4	2003-07-18 18:11:37.000000000 +0300
 +++ /gettext-tools/m4/getline.m4	2007-02-03 13:33:41.000000000 +0200
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch b/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch
index 82775d6..072fe5f 100644
--- a/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch
+++ b/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch
@@ -1,8 +1,9 @@
+
 # Pulled from OpenEmbedded
 # 
 # Commented by: Saul Wold <saul.wold@intel.com>
 
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [licensing]
 
 --- gettext-0.17/autoconf-lib-link/m4/lib-link.m4~	2009-04-17 15:12:30.000000000 -0700
 +++ gettext-0.17/autoconf-lib-link/m4/lib-link.m4	2009-04-17 15:37:39.000000000 -0700
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch b/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch
index abb7195..93d9194 100644
--- a/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch
+++ b/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch
@@ -1,8 +1,9 @@
+
 # Pulled from OpenEmbedded
 # 
 # Commented by: Saul Wold <saul.wold@intel.com>
 
-Upstream-Status: Inappropriate [configuration]
+Upstream-Status: Inappropriate [licensing]
 
 diff -ur gettext-0.14.6/gettext-tools/lib/error.h gettext-0.14.6-patched/gettext-tools/lib/error.h
 --- gettext-0.14.6/gettext-tools/lib/error.h	2005-05-20 16:03:42.000000000 -0500
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch b/meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch
index 67b0a5a..f09e450 100644
--- a/meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch
+++ b/meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch
@@ -1,8 +1,9 @@
+
 # Pulled from OpenEmbedded
 # 
 # Commented by: Saul Wold <saul.wold@intel.com>
 
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [licensing]
 
 Index: gettext-0.16.1/gettext-runtime/intl/Makefile.in
 ===================================================================
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch b/meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch
index 82ed04d..4da8dd4 100644
--- a/meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch
+++ b/meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch
@@ -1,8 +1,9 @@
+
 This patch hardcodes in version 0.17 for the GETTEXT_MACRO_VERSION,
 the version check is only part of 0.17 and will not affect any 0.16.1
 operations
 
-Upstream-Status: Inappropriate [configuration]
+Upstream-Status: Inappropriate [licensing]
 
 Signed-off-by: Saul Wold <sgw@linux.intel.com>
 
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch b/meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch
index 3cbe867..d921069 100644
--- a/meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch
+++ b/meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch
@@ -1,8 +1,9 @@
+
 # Pulled from OpenEmbedded
 # 
 # Commented by: Saul Wold <saul.wold@intel.com>
 
-Upstream-Status: Inappropriate [configuration]
+Upstream-Status: Inappropriate [licensing]
 
 Index: gettext-0.16.1/autoconf-lib-link/m4/lib-link.m4
 ===================================================================
-- 
1.7.3.4




^ permalink raw reply related	[flat|nested] 16+ messages in thread
* [CONSOLIDATED PULL 05/12] u-boot: package up u-boot.bin for field upgrades
  2011-06-02  8:04 [CONSOLIDATED PULL 00/12] 2-June-2011 Saul Wold
                   ` (3 preceding siblings ...)
  2011-06-02  8:05 ` [CONSOLIDATED PULL 04/12] gettext-0.16.1: mark upstream status for gplv2 recipe's patches Saul Wold
@ 2011-06-02  8:05 ` Saul Wold
  2011-06-02  8:05 ` [CONSOLIDATED PULL 06/12] shadow: remove selinux entry from pam.d/login Saul Wold
                   ` (7 subsequent siblings)
  12 siblings, 0 replies; 16+ messages in thread
From: Saul Wold @ 2011-06-02  8:05 UTC (permalink / raw)
  To: openembedded-core; +Cc: Koen Kooi

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

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-bsp/uboot/u-boot.inc        |   11 +++++++++++
 meta/recipes-bsp/uboot/u-boot_2011.03.bb |    2 +-
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-bsp/uboot/u-boot.inc b/meta/recipes-bsp/uboot/u-boot.inc
index 83dfb6f..2be9fc9 100644
--- a/meta/recipes-bsp/uboot/u-boot.inc
+++ b/meta/recipes-bsp/uboot/u-boot.inc
@@ -21,6 +21,7 @@ python () {
 }
 
 UBOOT_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.bin"
+UBOOT_BINARY ?= "u-boot.bin"
 UBOOT_SYMLINK ?= "u-boot-${MACHINE}.bin"
 UBOOT_MAKE_TARGET ?= "all"
 
@@ -32,6 +33,16 @@ do_compile () {
 	oe_runmake ${UBOOT_MAKE_TARGET}
 }
 
+do_install () {
+    install -d ${D}/boot
+    install ${S}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE}
+    ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
+}
+
+FILES_${PN} = "/boot"
+# no gnu_hash in uboot.bin, by design, so skip QA
+INSANE_SKIP_${PN} = True
+
 do_deploy () {
 	install ${S}/u-boot.bin ${DEPLOYDIR}/${UBOOT_IMAGE}
 
diff --git a/meta/recipes-bsp/uboot/u-boot_2011.03.bb b/meta/recipes-bsp/uboot/u-boot_2011.03.bb
index 0fbb9ba..07f0609 100644
--- a/meta/recipes-bsp/uboot/u-boot_2011.03.bb
+++ b/meta/recipes-bsp/uboot/u-boot_2011.03.bb
@@ -14,7 +14,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-git/${MACHINE
 
 SRCREV = "v2011.03"
 PV = "v2011.03+git${SRCPV}"
-PR="r3"
+PR="r4"
 
 SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
 
-- 
1.7.3.4




^ permalink raw reply related	[flat|nested] 16+ messages in thread
* [CONSOLIDATED PULL 06/12] shadow: remove selinux entry from pam.d/login
  2011-06-02  8:04 [CONSOLIDATED PULL 00/12] 2-June-2011 Saul Wold
                   ` (4 preceding siblings ...)
  2011-06-02  8:05 ` [CONSOLIDATED PULL 05/12] u-boot: package up u-boot.bin for field upgrades Saul Wold
@ 2011-06-02  8:05 ` Saul Wold
  2011-06-02  8:05 ` [CONSOLIDATED PULL 07/12] rootfs_ipk: delete opkg metadata if package management not required and all packages are configured Saul Wold
                   ` (6 subsequent siblings)
  12 siblings, 0 replies; 16+ messages in thread
From: Saul Wold @ 2011-06-02  8:05 UTC (permalink / raw)
  To: openembedded-core; +Cc: Koen Kooi

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

SElinux has been disabled in the recipe, leading to messages like this:

[  167.643218] login[312]: PAM unable to dlopen(/lib/security/pam_selinux.so): /lib/security/pam_selinux.so: cannot open shared object file: No such file or directory
[  167.670837] login[312]: PAM adding faulty module: /lib/security/pam_selinux.so

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-extended/shadow/files/pam.d/login |    7 -------
 meta/recipes-extended/shadow/shadow.inc        |    2 ++
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/meta/recipes-extended/shadow/files/pam.d/login b/meta/recipes-extended/shadow/files/pam.d/login
index e41eb04..e4dacc2 100644
--- a/meta/recipes-extended/shadow/files/pam.d/login
+++ b/meta/recipes-extended/shadow/files/pam.d/login
@@ -26,13 +26,6 @@ auth       [success=ok ignore=ignore user_unknown=ignore default=die]  pam_secur
 # (Replaces the `NOLOGINS_FILE' option from login.defs)
 auth       requisite  pam_nologin.so
 
-# SELinux needs to be the first session rule. This ensures that any 
-# lingering context has been cleared. Without out this it is possible 
-# that a module could execute code in the wrong domain.
-# When the module is present, "required" would be sufficient (When SELinux
-# is disabled, this returns success.)
-session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
-
 # This module parses environment configuration file(s)
 # and also allows you to use an extended config
 # file /etc/security/pam_env.conf.
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc
index 42f92a7..35bd6a8 100644
--- a/meta/recipes-extended/shadow/shadow.inc
+++ b/meta/recipes-extended/shadow/shadow.inc
@@ -6,6 +6,8 @@ LICENSE = "BSD | Artistic"
 LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \
                     file://src/passwd.c;firstline=8;endline=30;md5=2899a045e90511d0e043b85a7db7e2fe"
 
+PR = "r1"
+
 PAM_PLUGINS = "  libpam-runtime \
                  pam-plugin-faildelay \
                  pam-plugin-securetty \
-- 
1.7.3.4




^ permalink raw reply related	[flat|nested] 16+ messages in thread
* [CONSOLIDATED PULL 07/12] rootfs_ipk: delete opkg metadata if package management not required and all packages are configured
  2011-06-02  8:04 [CONSOLIDATED PULL 00/12] 2-June-2011 Saul Wold
                   ` (5 preceding siblings ...)
  2011-06-02  8:05 ` [CONSOLIDATED PULL 06/12] shadow: remove selinux entry from pam.d/login Saul Wold
@ 2011-06-02  8:05 ` Saul Wold
  2011-06-02  8:05 ` [CONSOLIDATED PULL 08/12] avahi: enable service when using systemd Saul Wold
                   ` (5 subsequent siblings)
  12 siblings, 0 replies; 16+ messages in thread
From: Saul Wold @ 2011-06-02  8:05 UTC (permalink / raw)
  To: openembedded-core; +Cc: Phil Blundell

From: Phil Blundell <pb@pbcl.net>

If all the postinsts were successfully run in offline mode, and
package-management hasn't been requested as an IMAGE_FEATURE, the opkg
metadata is now redundant and can safely be deleted.

Also, the update-rc.d and base-passwd packages can be removed since
they will serve no further purpose in this situation.

If some packages are still unconfigured at this point then we need to
keep their metadata around so that either opkg or the awk script can
configure the packages at boot time.  In theory it would be possible to
strip out the data for packages that have already been configured, but
right now we just hold on to the whole status file in that situation.

Signed-off-by: Phil Blundell <philb@gnu.org>
---
 meta/classes/rootfs_ipk.bbclass |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index edd84fb..3b4b4da 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -82,6 +82,17 @@ fakeroot rootfs_ipk_do_rootfs () {
 	
 	rm -f ${IMAGE_ROOTFS}${opkglibdir}/lists/*
 
+	if ${@base_contains("IMAGE_FEATURES", "package-management", "false", "true", d)}; then
+		if [ $runtime_script_required -eq 0 ]; then
+			# All packages were successfully configured.
+			# update-rc.d, base-passwd are no further use, remove them now
+			opkg-cl ${IPKG_ARGS} --force-depends remove update-rc.d base-passwd || true
+
+			# Also delete the status files
+			rm -rf ${IMAGE_ROOTFS}${opkglibdir}
+		fi
+	fi
+
 	log_check rootfs 	
 }
 
-- 
1.7.3.4




^ permalink raw reply related	[flat|nested] 16+ messages in thread
* [CONSOLIDATED PULL 08/12] avahi: enable service when using systemd
  2011-06-02  8:04 [CONSOLIDATED PULL 00/12] 2-June-2011 Saul Wold
                   ` (6 preceding siblings ...)
  2011-06-02  8:05 ` [CONSOLIDATED PULL 07/12] rootfs_ipk: delete opkg metadata if package management not required and all packages are configured Saul Wold
@ 2011-06-02  8:05 ` Saul Wold
  2011-06-02  8:05 ` [CONSOLIDATED PULL 09/12] ghostscript: Fix up file locations and add i686 Saul Wold
                   ` (4 subsequent siblings)
  12 siblings, 0 replies; 16+ messages in thread
From: Saul Wold @ 2011-06-02  8:05 UTC (permalink / raw)
  To: openembedded-core; +Cc: Koen Kooi

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

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-connectivity/avahi/avahi.inc       |   18 ++++++++++++++++++
 meta/recipes-connectivity/avahi/avahi_0.6.30.bb |    2 +-
 2 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 099c5a4..9e26a20 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -46,6 +46,24 @@ PACKAGES =+ "avahi-systemd avahi-daemon libavahi-common libavahi-core libavahi-c
 FILES_avahi-systemd = "${base_libdir}/systemd"
 RDEPENDS_avahi-systemd = "avahi-daemon"
 
+pkg_postinst_avahi-systemd() {
+	# can't do this offline
+	if [ "x$D" != "x" ]; then
+		exit 1
+	fi
+	
+	systemctl enable avahi-daemon.service
+}
+
+pkg_postrm_avahi-systemd() {
+	# can't do this offline
+	if [ "x$D" != "x" ]; then
+		exit 1
+	fi
+
+	systemctl disable avahi-daemon.service
+}
+
 FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
 FILES_libavahi-core = "${libdir}/libavahi-core.so.*"
 FILES_libavahi-ui = "${libdir}/libavahi-ui.so.*"
diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.30.bb b/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
index e63f406..23c0fa0 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.6.30.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 = "r1"
+PR = "r3"
 
 EXTRA_OECONF += "--disable-gtk3"
 
-- 
1.7.3.4




^ permalink raw reply related	[flat|nested] 16+ messages in thread
* [CONSOLIDATED PULL 09/12] ghostscript: Fix up file locations and add i686
  2011-06-02  8:04 [CONSOLIDATED PULL 00/12] 2-June-2011 Saul Wold
                   ` (7 preceding siblings ...)
  2011-06-02  8:05 ` [CONSOLIDATED PULL 08/12] avahi: enable service when using systemd Saul Wold
@ 2011-06-02  8:05 ` Saul Wold
  2011-06-02  8:05 ` [CONSOLIDATED PULL 10/12] gcc: Fix volatile access issue for ARM Saul Wold
                   ` (3 subsequent siblings)
  12 siblings, 0 replies; 16+ messages in thread
From: Saul Wold @ 2011-06-02  8:05 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../ghostscript/{ => }/ghostscript/arm/objarch.h   |    0
 .../ghostscript/{ => }/ghostscript/arm/soobjarch.h |    0
 .../ghostscript/{ => }/ghostscript/i586/objarch.h  |    0
 .../{ => }/ghostscript/i586/soobjarch.h            |    0
 meta/recipes-extended/ghostscript/ghostscript/i686 |    1 +
 .../ghostscript/{ => }/ghostscript/mips/objarch.h  |    0
 .../{ => }/ghostscript/mips/soobjarch.h            |    0
 .../{ => }/ghostscript/powerpc/objarch.h           |    0
 .../{ => }/ghostscript/powerpc/soobjarch.h         |    0
 .../{ => }/ghostscript/x86_64/objarch.h            |    0
 .../{ => }/ghostscript/x86_64/soobjarch.h          |    0
 11 files changed, 1 insertions(+), 0 deletions(-)
 rename meta/recipes-extended/ghostscript/{ => }/ghostscript/arm/objarch.h (100%)
 rename meta/recipes-extended/ghostscript/{ => }/ghostscript/arm/soobjarch.h (100%)
 rename meta/recipes-extended/ghostscript/{ => }/ghostscript/i586/objarch.h (100%)
 rename meta/recipes-extended/ghostscript/{ => }/ghostscript/i586/soobjarch.h (100%)
 create mode 120000 meta/recipes-extended/ghostscript/ghostscript/i686
 rename meta/recipes-extended/ghostscript/{ => }/ghostscript/mips/objarch.h (100%)
 rename meta/recipes-extended/ghostscript/{ => }/ghostscript/mips/soobjarch.h (100%)
 rename meta/recipes-extended/ghostscript/{ => }/ghostscript/powerpc/objarch.h (100%)
 rename meta/recipes-extended/ghostscript/{ => }/ghostscript/powerpc/soobjarch.h (100%)
 rename meta/recipes-extended/ghostscript/{ => }/ghostscript/x86_64/objarch.h (100%)
 rename meta/recipes-extended/ghostscript/{ => }/ghostscript/x86_64/soobjarch.h (100%)

diff --git a/meta/recipes-extended/ghostscript/arm/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/arm/objarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/arm/objarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/arm/objarch.h
diff --git a/meta/recipes-extended/ghostscript/arm/soobjarch.h b/meta/recipes-extended/ghostscript/ghostscript/arm/soobjarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/arm/soobjarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/arm/soobjarch.h
diff --git a/meta/recipes-extended/ghostscript/i586/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/i586/objarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/i586/objarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/i586/objarch.h
diff --git a/meta/recipes-extended/ghostscript/i586/soobjarch.h b/meta/recipes-extended/ghostscript/ghostscript/i586/soobjarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/i586/soobjarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/i586/soobjarch.h
diff --git a/meta/recipes-extended/ghostscript/ghostscript/i686 b/meta/recipes-extended/ghostscript/ghostscript/i686
new file mode 120000
index 0000000..87aaca5
--- /dev/null
+++ b/meta/recipes-extended/ghostscript/ghostscript/i686
@@ -0,0 +1 @@
+i586
\ No newline at end of file
diff --git a/meta/recipes-extended/ghostscript/mips/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/mips/objarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/mips/objarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/mips/objarch.h
diff --git a/meta/recipes-extended/ghostscript/mips/soobjarch.h b/meta/recipes-extended/ghostscript/ghostscript/mips/soobjarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/mips/soobjarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/mips/soobjarch.h
diff --git a/meta/recipes-extended/ghostscript/powerpc/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/powerpc/objarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/powerpc/objarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/powerpc/objarch.h
diff --git a/meta/recipes-extended/ghostscript/powerpc/soobjarch.h b/meta/recipes-extended/ghostscript/ghostscript/powerpc/soobjarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/powerpc/soobjarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/powerpc/soobjarch.h
diff --git a/meta/recipes-extended/ghostscript/x86_64/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/x86_64/objarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/x86_64/objarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/x86_64/objarch.h
diff --git a/meta/recipes-extended/ghostscript/x86_64/soobjarch.h b/meta/recipes-extended/ghostscript/ghostscript/x86_64/soobjarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/x86_64/soobjarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/x86_64/soobjarch.h
-- 
1.7.3.4




^ permalink raw reply related	[flat|nested] 16+ messages in thread
* [CONSOLIDATED PULL 10/12] gcc: Fix volatile access issue for ARM
  2011-06-02  8:04 [CONSOLIDATED PULL 00/12] 2-June-2011 Saul Wold
                   ` (8 preceding siblings ...)
  2011-06-02  8:05 ` [CONSOLIDATED PULL 09/12] ghostscript: Fix up file locations and add i686 Saul Wold
@ 2011-06-02  8:05 ` Saul Wold
  2011-06-02  8:05 ` [CONSOLIDATED PULL 11/12] task-core-lsb: add cups and ghostscript into image Saul Wold
                   ` (2 subsequent siblings)
  12 siblings, 0 replies; 16+ messages in thread
From: Saul Wold @ 2011-06-02  8:05 UTC (permalink / raw)
  To: openembedded-core

[YOCTO #1130]

This patch brings in a patch from gcc for the following issue:

http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-devtools/gcc/gcc-4.6.0.inc            |    4 ++-
 .../gcc/gcc-4.6.0/volatile_access_backport.patch   |   28 ++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/volatile_access_backport.patch

diff --git a/meta/recipes-devtools/gcc/gcc-4.6.0.inc b/meta/recipes-devtools/gcc/gcc-4.6.0.inc
index fb5c70d..cb9eb8e 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.0.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.0.inc
@@ -7,7 +7,7 @@ require gcc-common.inc
 
 require gcc-4_6-branch-backports.inc
 
-PR = "r2"
+PR = "r3"
 
 DEPENDS =+ "mpfr gmp libmpc"
 NATIVEDEPS = "mpfr-native gmp-native gettext-native libmpc-native"
@@ -53,7 +53,9 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://gcc-poison-parameters.patch \
 	   file://GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch \
 	   file://COLLECT_GCC_OPTIONS.patch \
+           file://volatile_access_backport.patch \
 	  "
+
 SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
 
 SRC_URI[md5sum] = "93d1c436bf991564524701259b6285a2"
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.0/volatile_access_backport.patch b/meta/recipes-devtools/gcc/gcc-4.6.0/volatile_access_backport.patch
new file mode 100644
index 0000000..9c86817
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-4.6.0/volatile_access_backport.patch
@@ -0,0 +1,28 @@
+Pulled from http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html
+
+Upstream-Status: Backport
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+    gcc/
+    * expr.c (expand_expr_real_1): Only use BLKmode for volatile
+    accesses which are not naturally aligned.
+
+Index: gcc-4.6.0/gcc/expr.c
+===================================================================
+--- gcc-4.6.0.orig/gcc/expr.c	2011-06-01 15:28:55.000000000 -0700
++++ gcc-4.6.0/gcc/expr.c	2011-06-01 15:41:17.154848182 -0700
+@@ -9178,8 +9178,11 @@
+ 		&& modifier != EXPAND_CONST_ADDRESS
+ 		&& modifier != EXPAND_INITIALIZER)
+ 	    /* If the field is volatile, we always want an aligned
+-	       access.  */
+-	    || (volatilep && flag_strict_volatile_bitfields > 0)
++	       access.  Only do this if the access is not already naturally
++	       aligned, otherwise "normal" (non-bitfield) volatile fields
++	       become non-addressable.  */
++	    || (volatilep && flag_strict_volatile_bitfields > 0
++		&& (bitpos % GET_MODE_ALIGNMENT (mode) != 0))
+ 	    /* If the field isn't aligned enough to fetch as a memref,
+ 	       fetch it as a bit field.  */
+ 	    || (mode1 != BLKmode
-- 
1.7.3.4




^ permalink raw reply related	[flat|nested] 16+ messages in thread
* [CONSOLIDATED PULL 11/12] task-core-lsb: add cups and ghostscript into image
  2011-06-02  8:04 [CONSOLIDATED PULL 00/12] 2-June-2011 Saul Wold
                   ` (9 preceding siblings ...)
  2011-06-02  8:05 ` [CONSOLIDATED PULL 10/12] gcc: Fix volatile access issue for ARM Saul Wold
@ 2011-06-02  8:05 ` Saul Wold
  2011-06-02  8:05 ` [CONSOLIDATED PULL 12/12] libx11: fix libX11 keysyms to pass xts5 of lsb Saul Wold
  2011-06-02 13:50 ` [CONSOLIDATED PULL 00/12] 2-June-2011 Richard Purdie
  12 siblings, 0 replies; 16+ messages in thread
From: Saul Wold @ 2011-06-02  8:05 UTC (permalink / raw)
  To: openembedded-core; +Cc: Kang Kai

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

[Yocto 1030]
Because it is fixed by Qing He, then add cups and ghostscipt into image

Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
 meta/recipes-extended/tasks/task-core-lsb.bb |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-extended/tasks/task-core-lsb.bb b/meta/recipes-extended/tasks/task-core-lsb.bb
index b6c5ae5..9fbacf9 100644
--- a/meta/recipes-extended/tasks/task-core-lsb.bb
+++ b/meta/recipes-extended/tasks/task-core-lsb.bb
@@ -133,8 +133,9 @@ RDEPENDS_task-core-lsb-command-add = "\
     chkconfig \
     xdg-utils \
     foomatic-filters \
+    cups \
+    ghostscript \
 "
-#    cups
 
 RDEPENDS_task-core-lsb-perl-add = "\
     perl-modules \
-- 
1.7.3.4




^ permalink raw reply related	[flat|nested] 16+ messages in thread
* [CONSOLIDATED PULL 12/12] libx11: fix libX11 keysyms to pass xts5 of lsb
  2011-06-02  8:04 [CONSOLIDATED PULL 00/12] 2-June-2011 Saul Wold
                   ` (10 preceding siblings ...)
  2011-06-02  8:05 ` [CONSOLIDATED PULL 11/12] task-core-lsb: add cups and ghostscript into image Saul Wold
@ 2011-06-02  8:05 ` Saul Wold
  2011-06-02 13:50 ` [CONSOLIDATED PULL 00/12] 2-June-2011 Richard Purdie
  12 siblings, 0 replies; 16+ messages in thread
From: Saul Wold @ 2011-06-02  8:05 UTC (permalink / raw)
  To: openembedded-core; +Cc: Jingdong Lu

From: Jingdong Lu <jingdong.lu@windriver.com>

Fixes bug: [YOCTO #1095]
Because of cross-compiling libx11 keysyms will cause Xts5 test of LSB fail.
libx11 use a tool named "makekey" which compiled as a native tool to generate
ks_tables.h. Because the size of "unsigned long" is different between 32-bit
and 64-bit, we should judge whether our target is 32-bit or 64-bit and tell
"makekey".
I add a patch to "makekeys_crosscompile.patch" to "src/utils/makekeys.c" in
order to deal with the different targets. If our target is 32-bit, we force
the variable its type is "unsigned long" to "uint32_t". So we can generate a
correct keysyms.

Signed-off-by: Jingdong Lu <jingdong.lu@windriver.com>
---
 .../libx11-1.3.4/makekeys_crosscompile.patch       |   45 ++++++++++++++++++++
 .../recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb |    5 +-
 meta/recipes-graphics/xorg-lib/libx11.inc          |    8 +++-
 meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb     |    5 +-
 4 files changed, 58 insertions(+), 5 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.3.4/makekeys_crosscompile.patch

diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/makekeys_crosscompile.patch b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/makekeys_crosscompile.patch
new file mode 100644
index 0000000..e5eacf0
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/makekeys_crosscompile.patch
@@ -0,0 +1,45 @@
+Because the size of "unsigned long" is different between 32-bit
+and 64-bit, judge whether target is 32-bit or 64-bit and tell
+"makekey". 
+
+Upstream-Status: Pending
+
+Signed-off-by: dbuitenh@windriver.com
+
+--- libX11-1.3.4.orig/src/util/makekeys.c	2010-01-15 09:11:36.000000000 +0800
++++ libX11-1.3.4/src/util/makekeys.c	2011-05-24 19:04:25.454774908 +0800
+@@ -33,6 +33,7 @@
+ #include <X11/keysymdef.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdint.h>
+ 
+ typedef unsigned long Signature;
+ 
+@@ -124,7 +125,12 @@
+ 	    name = info[i].name;
+ 	    sig = 0;
+ 	    while ((c = *name++))
+-		sig = (sig << 1) + c;
++#ifdef USE32
++		sig = (uint32_t)(sig << 1) + c;
++#else
++		sig = (uint64_t)(sig << 1) + c;
++#endif
++		
+ 	    first = j = sig % z;
+ 	    for (k = 0; tab[j]; k++) {
+ 		j += first + 1;
+@@ -163,7 +169,11 @@
+ 	name = info[i].name;
+ 	sig = 0;
+ 	while ((c = *name++))
+-	    sig = (sig << 1) + c;
++#ifdef USE32
++	    sig = (uint32_t)(sig << 1) + c;
++#else
++	    sig = (uint64_t)(sig << 1) + c;
++#endif
+ 	first = j = sig % z;
+ 	while (offsets[j]) {
+ 	    j += first + 1;
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
index b013498..1469bc1 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
@@ -5,12 +5,13 @@ DESCRIPTION += " Support for XCB, and XCMS is disabled in this version."
 LICENSE = "MIT & MIT-style & BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bf75bfe4d05068311b5e6862d4b5f2c5"
 
-PR = "r0"
+PR = "r1"
 
 DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
 
 SRC_URI += "file://../libx11-${PV}/x11_disable_makekeys.patch \
             file://../libx11-${PV}/include_fix.patch \
-            file://../libx11-${PV}/nodolt.patch"
+            file://../libx11-${PV}/nodolt.patch \
+            file://../libx11-${PV}/makekeys_crosscompile.patch"
 
 EXTRA_OECONF += "--disable-xcms --with-xcb"
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index 030b0db..c156ce6 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -6,6 +6,8 @@ basic functions of the window system."
 
 require xorg-lib-common.inc
 
+inherit siteinfo
+
 PROVIDES = "virtual/libx11"
 
 XORG_PN = "libX11"
@@ -22,7 +24,11 @@ do_compile() {
 	touch makekeys-makekeys.o
 	(
 		unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
-		${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys
+		if [ "${SITEINFO_BITS}" == "64" ]; then
+                        ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys
+                else
+                        ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} -DUSE32 makekeys.c -o makekeys
+                fi
 	)
 	if [ "$?" != "0" ]; then
 		exit 1
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb b/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
index 08ba07b..3e046a1 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
@@ -5,11 +5,12 @@ LICENSE = "MIT & MIT-style & BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bf75bfe4d05068311b5e6862d4b5f2c5"
 
 PE = "1"
-PR = "r0"
+PR = "r1"
 
 SRC_URI += "file://x11_disable_makekeys.patch \
             file://nodolt.patch \
-            file://include_fix.patch"
+            file://include_fix.patch \
+	    file://makekeys_crosscompile.patch"
 
 SRC_URI[md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd"
 SRC_URI[sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844"
-- 
1.7.3.4




^ permalink raw reply related	[flat|nested] 16+ messages in thread
* Re: [CONSOLIDATED PULL 00/12] 2-June-2011
  2011-06-02  8:04 [CONSOLIDATED PULL 00/12] 2-June-2011 Saul Wold
                   ` (11 preceding siblings ...)
  2011-06-02  8:05 ` [CONSOLIDATED PULL 12/12] libx11: fix libX11 keysyms to pass xts5 of lsb Saul Wold
@ 2011-06-02 13:50 ` Richard Purdie
  2011-06-02 14:57   ` Saul Wold
  12 siblings, 1 reply; 16+ messages in thread
From: Richard Purdie @ 2011-06-02 13:50 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer

On Thu, 2011-06-02 at 01:04 -0700, Saul Wold wrote:
> Pulling a number of patches and updates from the list, they have been
> built on the autobuild.
> 
> This has the gcc fix for qt4-x11-free in the form of a gcc patch
> 
> The following changes since commit 0a496df0209c93fd00ea929b5f27faa1a6e600c0:
> 
>   clutter-1.6: Add patch to update gettext macro version (2011-06-01 18:32:30 +0100)
> 
> are available in the git repository at:
>   git://git.openembedded.org/openembedded-core-contrib sgw/stage
>   http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
> 
> Jingdong Lu (1):
>   libx11: fix libX11 keysyms to pass xts5 of lsb
> 
> Kang Kai (1):
>   task-core-lsb: add cups and ghostscript into image
> 
> Koen Kooi (3):
>   u-boot: package up u-boot.bin for field upgrades
>   shadow: remove selinux entry from pam.d/login
>   avahi: enable service when using systemd
>
> Nitin A Kamble (4):
>   gettext-0.16.1: mark upstream status for gplv2 recipe's patches
>
> Phil Blundell (1):
>   rootfs_ipk: delete opkg metadata if package management not required
>     and all packages are configured
> 

I merged the above.

>   m4: upgrade from 1.4.15 to 1.4.16

Khem asked what the license change was here and it should have been
mentioned in the commit message.

>   autoconf: upgrade from 2.65 to 2.68

Not pulled as likely dependent on the above.

>   bison: upgrade from 2.4.3 to 2.5

Likewise.

> Saul Wold (2):
>   ghostscript: Fix up file locations and add i686

Why did this need the location fixups? Something sounds wrong here and
needs digging into.

>   gcc: Fix volatile access issue for ARM

I merged this.

Cheers,

Richard




^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: [CONSOLIDATED PULL 00/12] 2-June-2011
  2011-06-02 13:50 ` [CONSOLIDATED PULL 00/12] 2-June-2011 Richard Purdie
@ 2011-06-02 14:57   ` Saul Wold
  2011-06-02 15:03     ` Richard Purdie
  0 siblings, 1 reply; 16+ messages in thread
From: Saul Wold @ 2011-06-02 14:57 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer

On 06/02/2011 06:50 AM, Richard Purdie wrote:
> On Thu, 2011-06-02 at 01:04 -0700, Saul Wold wrote:
>> Pulling a number of patches and updates from the list, they have been
>> built on the autobuild.
>>
>> This has the gcc fix for qt4-x11-free in the form of a gcc patch
>>
>> The following changes since commit 0a496df0209c93fd00ea929b5f27faa1a6e600c0:
>>
>>    clutter-1.6: Add patch to update gettext macro version (2011-06-01 18:32:30 +0100)
>>
>> are available in the git repository at:
>>    git://git.openembedded.org/openembedded-core-contrib sgw/stage
>>    http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
>>
>> Jingdong Lu (1):
>>    libx11: fix libX11 keysyms to pass xts5 of lsb
>>
>> Kang Kai (1):
>>    task-core-lsb: add cups and ghostscript into image
>>
>> Koen Kooi (3):
>>    u-boot: package up u-boot.bin for field upgrades
>>    shadow: remove selinux entry from pam.d/login
>>    avahi: enable service when using systemd
>>
>> Nitin A Kamble (4):
>>    gettext-0.16.1: mark upstream status for gplv2 recipe's patches
>>
>> Phil Blundell (1):
>>    rootfs_ipk: delete opkg metadata if package management not required
>>      and all packages are configured
>>
>
> I merged the above.
>
>>    m4: upgrade from 1.4.15 to 1.4.16
>
> Khem asked what the license change was here and it should have been
> mentioned in the commit message.
>
I will update the commit message since Nitin is not available for the 
rest of this week.

>>    autoconf: upgrade from 2.65 to 2.68
>
> Not pulled as likely dependent on the above.
>
>>    bison: upgrade from 2.4.3 to 2.5
>
> Likewise.
>
>> Saul Wold (2):
>>    ghostscript: Fix up file locations and add i686
>
> Why did this need the location fixups? Something sounds wrong here and
> needs digging into.
>
So what I changed was to move the architecture header files (in 
architecture directories) into the ghostscript directory instead of 
being in the top level of the recipe directory.  I also need to add an 
i686 directory in addition to the i586 directory, if there is a way to 
map this for the native then more digging is needed.  This is required 
to build ghostscript-native.

>>    gcc: Fix volatile access issue for ARM
>
> I merged this.
>
> Cheers,
>
> Richard
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>



^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: [CONSOLIDATED PULL 00/12] 2-June-2011
  2011-06-02 14:57   ` Saul Wold
@ 2011-06-02 15:03     ` Richard Purdie
  0 siblings, 0 replies; 16+ messages in thread
From: Richard Purdie @ 2011-06-02 15:03 UTC (permalink / raw)
  To: Saul Wold; +Cc: Patches and discussions about the oe-core layer

On Thu, 2011-06-02 at 07:57 -0700, Saul Wold wrote:
> >
> > Not pulled as likely dependent on the above.
> >
> >>    bison: upgrade from 2.4.3 to 2.5
> >
> > Likewise.
> >
> >> Saul Wold (2):
> >>    ghostscript: Fix up file locations and add i686
> >
> > Why did this need the location fixups? Something sounds wrong here and
> > needs digging into.
> >
> So what I changed was to move the architecture header files (in 
> architecture directories) into the ghostscript directory instead of 
> being in the top level of the recipe directory.  I also need to add an 
> i686 directory in addition to the i586 directory, if there is a way to 
> map this for the native then more digging is needed.  This is required 
> to build ghostscript-native.

Sorry, I misread this diff. What you've done is what I'd have expected
was needed and I'm find with that. I've merged it.

Cheers,

Richard




^ permalink raw reply	[flat|nested] 16+ messages in thread
end of thread, other threads:[~2011-06-02 15:07 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-06-02  8:04 [CONSOLIDATED PULL 00/12] 2-June-2011 Saul Wold
2011-06-02  8:05 ` [CONSOLIDATED PULL 01/12] m4: upgrade from 1.4.15 to 1.4.16 Saul Wold
2011-06-02  8:05 ` [CONSOLIDATED PULL 02/12] autoconf: upgrade from 2.65 to 2.68 Saul Wold
2011-06-02  8:05 ` [CONSOLIDATED PULL 03/12] bison: upgrade from 2.4.3 to 2.5 Saul Wold
2011-06-02  8:05 ` [CONSOLIDATED PULL 04/12] gettext-0.16.1: mark upstream status for gplv2 recipe's patches Saul Wold
2011-06-02  8:05 ` [CONSOLIDATED PULL 05/12] u-boot: package up u-boot.bin for field upgrades Saul Wold
2011-06-02  8:05 ` [CONSOLIDATED PULL 06/12] shadow: remove selinux entry from pam.d/login Saul Wold
2011-06-02  8:05 ` [CONSOLIDATED PULL 07/12] rootfs_ipk: delete opkg metadata if package management not required and all packages are configured Saul Wold
2011-06-02  8:05 ` [CONSOLIDATED PULL 08/12] avahi: enable service when using systemd Saul Wold
2011-06-02  8:05 ` [CONSOLIDATED PULL 09/12] ghostscript: Fix up file locations and add i686 Saul Wold
2011-06-02  8:05 ` [CONSOLIDATED PULL 10/12] gcc: Fix volatile access issue for ARM Saul Wold
2011-06-02  8:05 ` [CONSOLIDATED PULL 11/12] task-core-lsb: add cups and ghostscript into image Saul Wold
2011-06-02  8:05 ` [CONSOLIDATED PULL 12/12] libx11: fix libX11 keysyms to pass xts5 of lsb Saul Wold
2011-06-02 13:50 ` [CONSOLIDATED PULL 00/12] 2-June-2011 Richard Purdie
2011-06-02 14:57   ` Saul Wold
2011-06-02 15:03     ` Richard Purdie

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.