[PATCH 1/7] python-pycairo: fix for x32

[PATCH 1/7] python-pycairo: fix for x32

[nitin.a.kamble]

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

Add the libdir to configure so that path like /usr/libx32 can work.

Also passing parallel make flags to the building process.

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

diff --git a/meta/recipes-devtools/python/python-pycairo_1.10.0.bb b/meta/recipes-devtools/python/python-pycairo_1.10.0.bb
index 812acfb..7d1b6c1 100644
--- a/meta/recipes-devtools/python/python-pycairo_1.10.0.bb
+++ b/meta/recipes-devtools/python/python-pycairo_1.10.0.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f2e071ab72978431b294a0d696327421 \
 
 # cairo >= 1.8.8
 DEPENDS = "cairo"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://cairographics.org/releases/py2cairo-${PV}.tar.bz2"
 
@@ -21,11 +21,11 @@ S = "${WORKDIR}/py2cairo-${PV}"
 inherit distutils pkgconfig
 
 do_configure() {
-	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} ./waf configure --prefix=${D}${prefix}
+	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} ./waf configure --prefix=${D}${prefix} --libdir=${D}${libdir}
 }
 
 do_compile() {
-	./waf build
+	./waf build ${PARALLEL_MAKE}
 }
 
 do_install() {
-- 
1.7.6.4

[PATCH 2/7] libevent: fix compilation for x32

[nitin.a.kamble]

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

Pull a patch from gentoo to avoid sysctl syscall which is not
defined for x32.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../libevent/libevent-2.0.16_fix_for_x32.patch     |   47 ++++++++++++++++++++
 meta/recipes-support/libevent/libevent_2.0.16.bb   |    5 +-
 2 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-support/libevent/libevent/libevent-2.0.16_fix_for_x32.patch

diff --git a/meta/recipes-support/libevent/libevent/libevent-2.0.16_fix_for_x32.patch b/meta/recipes-support/libevent/libevent/libevent-2.0.16_fix_for_x32.patch
new file mode 100644
index 0000000..ef42863
--- /dev/null
+++ b/meta/recipes-support/libevent/libevent/libevent-2.0.16_fix_for_x32.patch
@@ -0,0 +1,47 @@
+Upstream-Status: pending
+
+Pulled the patch from gentoo: from here:
+http://sources2.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/libevent/files/libevent-2.0.16-sysctl.patch?revision=1.1
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+2012/01/04
+
+From 358c745e5432f7648b6f8b3188f32b5551cbf9d6 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 8 Dec 2011 11:39:48 -0500
+Subject: [PATCH] check for sysctl before we use it
+
+Not all C libraries under Linux support the sysctl() func.
+---
+ arc4random.c |    2 +-
+ configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arc4random.c b/arc4random.c
+index 4833169..ef10fa8 100644
+--- a/arc4random.c
++++ b/arc4random.c
+@@ -166,7 +166,7 @@ arc4_seed_win32(void)
+ }
+ #endif
+ 
+-#if defined(_EVENT_HAVE_SYS_SYSCTL_H)
++#if defined(_EVENT_HAVE_SYS_SYSCTL_H) && defined(_EVENT_HAVE_SYSCTL)
+ #if _EVENT_HAVE_DECL_CTL_KERN && _EVENT_HAVE_DECL_KERN_RANDOM && _EVENT_HAVE_DECL_RANDOM_UUID
+ #define TRY_SEED_SYSCTL_LINUX
+ static int
+diff --git a/configure.in b/configure.in
+index da08cf4..4e24444 100644
+--- a/configure.in
++++ b/configure.in
+@@ -267,7 +267,7 @@ AC_HEADER_TIME
+ 
+ dnl Checks for library functions.
+ AC_CHECK_FUNCS([gettimeofday vasprintf fcntl clock_gettime strtok_r strsep])
+-AC_CHECK_FUNCS([getnameinfo strlcpy inet_ntop inet_pton signal sigaction strtoll inet_aton pipe eventfd sendfile mmap splice arc4random arc4random_buf issetugid geteuid getegid getprotobynumber setenv unsetenv putenv])
++AC_CHECK_FUNCS([getnameinfo strlcpy inet_ntop inet_pton signal sigaction strtoll inet_aton pipe eventfd sendfile mmap splice arc4random arc4random_buf issetugid geteuid getegid getprotobynumber setenv unsetenv putenv sysctl])
+ 
+ AC_CACHE_CHECK(
+     [for getaddrinfo],
+-- 
+1.7.6.1
diff --git a/meta/recipes-support/libevent/libevent_2.0.16.bb b/meta/recipes-support/libevent/libevent_2.0.16.bb
index 6da3d94..38d42f0 100644
--- a/meta/recipes-support/libevent/libevent_2.0.16.bb
+++ b/meta/recipes-support/libevent/libevent_2.0.16.bb
@@ -7,9 +7,10 @@ SECTION = "libs"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=50aad300de703db62baae12146832b45"
 
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "http://github.com/downloads/libevent/libevent/${BPN}-${PV}-stable.tar.gz"
+SRC_URI = "http://github.com/downloads/libevent/libevent/${BPN}-${PV}-stable.tar.gz \
+           file://libevent-2.0.16_fix_for_x32.patch"
 
 SRC_URI[md5sum] = "899efcffccdb3d5111419df76e7dc8df"
 SRC_URI[sha256sum] = "a578c7bcaf3bab1cc7924bd4d219f2ea621ab8c51dfc4f886e234b6ef4d38295"
-- 
1.7.6.4

[PATCH 3/7] libxxf86dga: fix compilation with x32 toolchain

[nitin.a.kamble]

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

Fix type conversion for x32. For x32 the off_t is 64bit and pointers are
32bit.
so the conversion of pointer to off_t was resulting into this error:

| XF86DGA2.c:931:24: error: cast from pointer to integer of different
size [-Werror=pointer-to-int-cast]
| cc1: some warnings being treated as errors
|
| make[2]: *** [XF86DGA2.lo] Error 1

Fixed it by typecasting pointer into unsigned long 1st and then again
typecasting unsigned long to off_t.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../libxxf86dga-1.1.2_fix_for_x32.patch            |   30 ++++++++++++++++++++
 .../recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb |    5 ++-
 2 files changed, 34 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-1.1.2_fix_for_x32.patch

diff --git a/meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-1.1.2_fix_for_x32.patch b/meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-1.1.2_fix_for_x32.patch
new file mode 100644
index 0000000..30692ad
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-1.1.2_fix_for_x32.patch
@@ -0,0 +1,30 @@
+Upstream-Status: pending
+
+Fix type conversion for x32. For x32 the off_t is 64bit and pointers are 32bit.
+so the conversion of pointer to off_t was resulting into this error:
+
+| XF86DGA2.c:931:24: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
+| cc1: some warnings being treated as errors
+| 
+| make[2]: *** [XF86DGA2.lo] Error 1
+
+Fixed it by typecasting pointer into unsigned long 1st and then again typecasting 
+unsigned long to off_t.
+
+Signed-Off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
+2012/01/04
+
+
+Index: libXxf86dga-1.1.2/src/XF86DGA2.c
+===================================================================
+--- libXxf86dga-1.1.2.orig/src/XF86DGA2.c	2010-10-06 21:17:11.000000000 -0700
++++ libXxf86dga-1.1.2/src/XF86DGA2.c	2012-01-04 14:21:36.275971172 -0800
+@@ -928,7 +928,7 @@ DGAMapPhysical(
+     if ((pMap->fd = open(name, O_RDWR)) < 0)
+ 	return False;
+     pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE, 
+-			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base);
++			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)(unsigned long)base);
+     if (pMap->virtual == (void *)-1)
+ 	return False;
+     mprotect(pMap->virtual, size, PROT_READ | PROT_WRITE);
diff --git a/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb b/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb
index 8e777c3..9a1c96f 100644
--- a/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb
+++ b/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb
@@ -8,7 +8,10 @@ allows relative mouse reporting, et al.  It is mainly used by games and \
 emulators for games."
 
 DEPENDS += "libxext xf86dgaproto"
-PR = "r1"
+PR = "r2"
+
+SRC_URI += "file://libxxf86dga-1.1.2_fix_for_x32.patch"
+
 PE = "1"
 
 XORG_PN = "libXxf86dga"
-- 
1.7.6.4

[PATCH 0/7] Misc Fixes

[nitin.a.kamble]

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


Here are fixes related to x32 & automake-1.11.2.

Thanks,
Nitin

The following changes since commit 7f837eb05f924996c89283ec8b74e46f6b5cd343:

  bitbake/runqueue: Improve the setscene logging (2012-01-05 13:04:19 +0000)

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

Nitin A Kamble (7):
  python-pycairo: fix for x32
  libevent: fix compilation for x32
  libxxf86dga: fix compilation with x32 toolchain
  vte: update patch header
  automake-1.11.2: backport pkglibexec_SCRIPTS fix
  mc: remove not needed fix for automake 1.11.2
  systemtap: remove not needed fix for automake 1.11.2

 ...utomake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch |  118 ++++++++++++++++++++
 meta/recipes-devtools/automake/automake_1.11.2.bb  |    5 +-
 .../python/python-pycairo_1.10.0.bb                |    6 +-
 .../mc/files/fix_for_automake_1.11.2.patch         |   69 ------------
 meta/recipes-extended/mc/mc_4.8.1.bb               |    3 +-
 .../libxxf86dga-1.1.2_fix_for_x32.patch            |   30 +++++
 .../recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb |    5 +-
 .../systemtap/fix_for_automake_1.11.2.patch        |   46 --------
 meta/recipes-kernel/systemtap/systemtap_git.bb     |    6 +-
 .../libevent/libevent-2.0.16_fix_for_x32.patch     |   47 ++++++++
 meta/recipes-support/libevent/libevent_2.0.16.bb   |    5 +-
 meta/recipes-support/vte/vte/introspection.patch   |    8 ++
 12 files changed, 219 insertions(+), 129 deletions(-)
 create mode 100644 meta/recipes-devtools/automake/automake/automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch
 delete mode 100644 meta/recipes-extended/mc/files/fix_for_automake_1.11.2.patch
 create mode 100644 meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-1.1.2_fix_for_x32.patch
 delete mode 100644 meta/recipes-kernel/systemtap/systemtap/fix_for_automake_1.11.2.patch
 create mode 100644 meta/recipes-support/libevent/libevent/libevent-2.0.16_fix_for_x32.patch

-- 
1.7.6.4

[PATCH 4/7] vte: update patch header

[nitin.a.kamble]

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

No functional change here. Just updating the headers of the patch.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 meta/recipes-support/vte/vte/introspection.patch |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-support/vte/vte/introspection.patch b/meta/recipes-support/vte/vte/introspection.patch
index 76a841c..890ba31 100644
--- a/meta/recipes-support/vte/vte/introspection.patch
+++ b/meta/recipes-support/vte/vte/introspection.patch
@@ -1,3 +1,11 @@
+Upstream-Status:  Inappropriate [configuration]
+
+Get this m4 file from introspection, so that we can configure without
+depending on the introspection package.
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+2011/01/03
+
 Index: vte-0.28.2/m4/introspection.m4
 ===================================================================
 --- /dev/null
-- 
1.7.6.4

[PATCH 5/7] automake-1.11.2: backport pkglibexec_SCRIPTS fix

[nitin.a.kamble]

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

automake-1.11.2 made variable libexec_SCRIPTS valid while
pkglibexec_SCRIPTS invalid. Both should be either allowed
or not allowed. This issue is fixed in the automake
developement branch, and now backported into our automake
1.11.2 recipe.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 ...utomake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch |  118 ++++++++++++++++++++
 meta/recipes-devtools/automake/automake_1.11.2.bb  |    5 +-
 2 files changed, 121 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-devtools/automake/automake/automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch

diff --git a/meta/recipes-devtools/automake/automake/automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch b/meta/recipes-devtools/automake/automake/automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch
new file mode 100644
index 0000000..f06dfe3
--- /dev/null
+++ b/meta/recipes-devtools/automake/automake/automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch
@@ -0,0 +1,118 @@
+Upstream-Status: Backport
+
+Backporting this patch from automake devel git tree.
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+2012/01/05
+
+
+From 4e4dae500390d2ace681e4e4bc4c590ecdca38c6 Mon Sep 17 00:00:00 2001
+From: Stefano Lattarini <stefano.lattarini@gmail.com>
+Date: Tue, 03 Jan 2012 08:06:09 +0000
+Subject: install: pkglibexec_SCRIPTS is a valid prefix/primary combination
+
+It makes little sense for `libexec_SCRIPTS' to be accepted as valid
+while `pkglibexec_SCRIPTS' is not.  So fix this inconsistency by
+explicitly allowing `pkglibexec_SCRIPTS' as well.  It is worth
+noting that the inconsistency has been there for a long time,
+but only the quite recent commit `v1.11-373-g9ca6326' "Warnings
+about primary/prefix mismatch fixed and extended" has made it
+noisy enough to be noticed.
+
+* automake.in (handle_scripts): Also list `pkglibexec' among the
+prefixes valid for the `SCRIPTS' primary.
+* doc/automake.texi (Scripts): Likewise.
+* tests/primary-prefix-valid-couples.test: Update.
+* THANKS: Likewise.
+* NEWS: Likewise.
+
+Reported by Dennis Schridde on the automake list:
+<http://lists.gnu.org/archive/html/automake/2012-01/msg00002.html>
+---
+diff --git a/NEWS b/NEWS
+index 599f19f..2e572e4 100644
+--- a/NEWS
++++ b/NEWS
+@@ -82,6 +82,11 @@ New in 1.11.0a:
+ 
+ Bugs fixed in 1.11.0a:
+ 
++* Bugs introduced by 1.11.2:
++
++  - Automake now correctly recognizes the prefix/primary combination
++   `pkglibexec_SCRIPTS' as valid.
++
+ * Bugs introduced by 1.11:
+ 
+   - The `parallel-tests' test driver works around a GNU make 3.80 bug with
+diff --git a/THANKS b/THANKS
+index e9da06c..e9c6db8 100644
+--- a/THANKS
++++ b/THANKS
+@@ -78,6 +78,7 @@ David Pashley		david@davidpashley.com
+ David Zaroski		cz253@cleveland.Freenet.Edu
+ Dean Povey		dpovey@wedgetail.com
+ Dennis J. Linse		Dennis.J.Linse@SAIC.com
++Dennis Schridde		devurandom@gmx.net
+ Derek R. Price		derek.price@openavenue.com
+ Diab Jerius		djerius@cfa.harvard.edu
+ Didier Cassirame	faded@free.fr
+diff --git a/automake.in b/automake.in
+index a852195..a689b63 100644
+--- a/automake.in
++++ b/automake.in
+@@ -3091,7 +3091,7 @@ sub handle_scripts
+     # useful to sometimes distribute scripts verbatim.  This happens
+     # e.g. in Automake itself.
+     &am_install_var ('-candist', 'scripts', 'SCRIPTS',
+-		     'bin', 'sbin', 'libexec', 'pkgdata',
++		     'bin', 'sbin', 'libexec', 'pkglibexec', 'pkgdata',
+ 		     'noinst', 'check');
+ }
+ 
+diff --git a/doc/automake.texi b/doc/automake.texi
+index cebe084..0c4dc01 100644
+--- a/doc/automake.texi
++++ b/doc/automake.texi
+@@ -7099,11 +7099,12 @@ prefix as with other primaries.
+ @vindex sbin_SCRIPTS
+ @vindex libexec_SCRIPTS
+ @vindex pkgdata_SCRIPTS
++@vindex pkglibexec_SCRIPTS
+ @vindex noinst_SCRIPTS
+ @vindex check_SCRIPTS
+ 
+ Scripts can be installed in @code{bindir}, @code{sbindir},
+-@code{libexecdir}, or @code{pkgdatadir}.
++@code{libexecdir}, @code{pkglibexecdir}, or @code{pkgdatadir}.
+ 
+ Scripts that need not be installed can be listed in
+ @code{noinst_SCRIPTS}, and among them, those which are needed only by
+diff --git a/tests/primary-prefix-invalid-couples.test b/tests/primary-prefix-invalid-couples.test
+index 88e0817..c3d6471 100755
+--- a/tests/primary-prefix-invalid-couples.test
++++ b/tests/primary-prefix-invalid-couples.test
+@@ -79,7 +79,7 @@ for primary in $primaries; do
+       prefixes_ok='bin sbin libexec pkglibexec'
+       ;;
+     SCRIPTS)
+-      prefixes_ok='bin sbin libexec pkgdata'
++      prefixes_ok='bin sbin libexec pkglibexec pkgdata'
+       ;;
+     DATA)
+       prefixes_ok='data dataroot pkgdata doc html dvi pdf ps
+diff --git a/tests/primary-prefix-valid-couples.test b/tests/primary-prefix-valid-couples.test
+index 36ff5d8..6eb4149 100755
+--- a/tests/primary-prefix-valid-couples.test
++++ b/tests/primary-prefix-valid-couples.test
+@@ -57,7 +57,7 @@ for p in lib pkglib; do
+   echo "${p}_LTLIBRARIES = libd-$p.la" >> Makefile.am
+ done
+ 
+-for p in bin sbin libexec pkgdata; do
++for p in bin sbin libexec pkglibexec pkgdata; do
+   echo "${p}_SCRIPTS = $p.sh" >> Makefile.am
+ done
+ 
+--
+cgit v0.9.0.2
diff --git a/meta/recipes-devtools/automake/automake_1.11.2.bb b/meta/recipes-devtools/automake/automake_1.11.2.bb
index 0a65f24..4534c39 100644
--- a/meta/recipes-devtools/automake/automake_1.11.2.bb
+++ b/meta/recipes-devtools/automake/automake_1.11.2.bb
@@ -36,9 +36,10 @@ PATHFIXPATCH_virtclass-nativesdk = ""
 
 SRC_URI += "${PATHFIXPATCH} \
 	    file://prefer-cpio-over-pax-for-ustar-archives.patch \
-	    file://python-libdir.patch"
+	    file://python-libdir.patch \
+            file://automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch"
 
-PR = "r0"
+PR = "r1"
 SRC_URI[md5sum] = "18194e804d415767bae8f703c963d456"
 SRC_URI[sha256sum] = "4f46d1f9380c8a3506280750f630e9fc915cb1a435b724be56b499d016368718"
 
-- 
1.7.6.4

[PATCH 6/7] mc: remove not needed fix for automake 1.11.2

[nitin.a.kamble]

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

The pkglibexec_SCRIPTS pair is valid. the 1.11.2 introduced an bug
to make it invalid. Now the automake 1.11.2 recipe is fixed, so
no need for this fix for mc recipe.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../mc/files/fix_for_automake_1.11.2.patch         |   69 --------------------
 meta/recipes-extended/mc/mc_4.8.1.bb               |    3 +-
 2 files changed, 1 insertions(+), 71 deletions(-)
 delete mode 100644 meta/recipes-extended/mc/files/fix_for_automake_1.11.2.patch

diff --git a/meta/recipes-extended/mc/files/fix_for_automake_1.11.2.patch b/meta/recipes-extended/mc/files/fix_for_automake_1.11.2.patch
deleted file mode 100644
index 9b610ca..0000000
--- a/meta/recipes-extended/mc/files/fix_for_automake_1.11.2.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Upstream-Status: Pending
-
-As Nitin said, "automake version 1.11.2 has made use of dir variables
-more strict, the pkglibexec var can not have SCRIPTS suffix. Using pkgdata
-instead."
-
-Fixes this error:
-| contrib/Makefile.am:10: `pkglibexecdir' is not a legitimate directory for `SCRIPTS'
-| autoreconf: automake failed with exit status: 1
-NOTE: package mc-4.8.1-r0: task do_configure: Failed
-
-Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
-Wed Jan  4 17:04:47 CST 2012
-
-diff -Nru mc-4.8.1.orig//contrib/Makefile.am mc-4.8.1/contrib/Makefile.am
---- mc-4.8.1.orig//contrib/Makefile.am	2011-11-30 15:44:40.000000000 +0800
-+++ mc-4.8.1/contrib/Makefile.am	2012-01-04 17:03:16.926911680 +0800
-@@ -7,7 +7,7 @@
- SCRIPTS_IN = mc.csh.in mc.sh.in mc-wrapper.csh.in mc-wrapper.sh.in
- SCRIPTS_OUT = mc.csh mc.sh mc-wrapper.csh mc-wrapper.sh
- 
--pkglibexec_SCRIPTS = $(SCRIPTS_OUT)
-+pkgdata_SCRIPTS = $(SCRIPTS_OUT)
- pkglibexecdir =		$(libexecdir)/@PACKAGE@
- 
- cfgdir = $(sysconfdir)/@PACKAGE@
-diff -Nru mc-4.8.1.orig//contrib/Makefile.in mc-4.8.1/contrib/Makefile.in
---- mc-4.8.1.orig//contrib/Makefile.in	2011-12-13 18:10:52.000000000 +0800
-+++ mc-4.8.1/contrib/Makefile.in	2012-01-04 17:03:16.926911680 +0800
-@@ -112,7 +112,7 @@
-   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(cfgdir)"
--SCRIPTS = $(pkglibexec_SCRIPTS)
-+SCRIPTS = $(pkgdata_SCRIPTS)
- AM_V_GEN = $(am__v_GEN_$(V))
- am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
- am__v_GEN_0 = @echo "  GEN   " $@;
-@@ -372,7 +372,7 @@
- noinst_DATA = README.xterm
- SCRIPTS_IN = mc.csh.in mc.sh.in mc-wrapper.csh.in mc-wrapper.sh.in
- SCRIPTS_OUT = mc.csh mc.sh mc-wrapper.csh mc-wrapper.sh
--pkglibexec_SCRIPTS = $(SCRIPTS_OUT)
-+pkgdata_SCRIPTS = $(SCRIPTS_OUT)
- cfgdir = $(sysconfdir)/@PACKAGE@
- cfg_DATA = \
- 	$(LIBFILES_ADD)
-@@ -417,10 +417,10 @@
- $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(am__aclocal_m4_deps):
--install-pkglibexecSCRIPTS: $(pkglibexec_SCRIPTS)
-+install-pkglibexecSCRIPTS: $(pkgdata_SCRIPTS)
- 	@$(NORMAL_INSTALL)
- 	test -z "$(pkglibexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibexecdir)"
--	@list='$(pkglibexec_SCRIPTS)'; test -n "$(pkglibexecdir)" || list=; \
-+	@list='$(pkgdata_SCRIPTS)'; test -n "$(pkglibexecdir)" || list=; \
- 	for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-@@ -445,7 +445,7 @@
- 
- uninstall-pkglibexecSCRIPTS:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(pkglibexec_SCRIPTS)'; test -n "$(pkglibexecdir)" || exit 0; \
-+	@list='$(pkgdata_SCRIPTS)'; test -n "$(pkglibexecdir)" || exit 0; \
- 	files=`for p in $$list; do echo "$$p"; done | \
- 	       sed -e 's,.*/,,;$(transform)'`; \
- 	test -n "$$list" || exit 0; \
diff --git a/meta/recipes-extended/mc/mc_4.8.1.bb b/meta/recipes-extended/mc/mc_4.8.1.bb
index b66c170..78bbc9d 100644
--- a/meta/recipes-extended/mc/mc_4.8.1.bb
+++ b/meta/recipes-extended/mc/mc_4.8.1.bb
@@ -6,10 +6,9 @@ SECTION = "console/utils"
 DEPENDS = "ncurses glib-2.0"
 RDEPENDS_${PN} = "ncurses-terminfo"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2"
-SRC_URI += "file://fix_for_automake_1.11.2.patch"
 
 SRC_URI[md5sum] = "7d60c87d87b359831d976fa28034935e"
 SRC_URI[sha256sum] = "8f9bd09750c65a7786197a8f7e5a10a6dabf8c8737c564079ca393d8ecaf944d"
-- 
1.7.6.4

[PATCH 7/7] systemtap: remove not needed fix for automake 1.11.2

[nitin.a.kamble]

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

The pkglibexec_SCRIPTS pair is valid. the 1.11.2 introduced an bug
to make it invalid. Now the automake 1.11.2 recipe is fixed, so
no need for this fix for systemtap recipe.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../systemtap/fix_for_automake_1.11.2.patch        |   46 --------------------
 meta/recipes-kernel/systemtap/systemtap_git.bb     |    6 +--
 2 files changed, 2 insertions(+), 50 deletions(-)
 delete mode 100644 meta/recipes-kernel/systemtap/systemtap/fix_for_automake_1.11.2.patch

diff --git a/meta/recipes-kernel/systemtap/systemtap/fix_for_automake_1.11.2.patch b/meta/recipes-kernel/systemtap/systemtap/fix_for_automake_1.11.2.patch
deleted file mode 100644
index 99e72b2..0000000
--- a/meta/recipes-kernel/systemtap/systemtap/fix_for_automake_1.11.2.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Upstream-Status: Pending
-
-automake version 1.11.2 has made use of dir variables more strict.
-The pkglibexec var can not have SCRIPTS suffix. Using pkgdata
-instead.
-
-Fixes this error:
-| Makefile.am:25: `pkglibexecdir' is not a legitimate directory for `SCRIPTS'
-| autoreconf: automake failed with exit status: 1
-| ERROR: autoreconf execution failed.
-NOTE: package systemtap-1.6+git1+820f2d22fc47fad6e09ba886efb9b91e1247cb39-r0: task do_configure: Failed
-
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
-2011/12/29
-
-Index: git/Makefile.am
-===================================================================
---- git.orig/Makefile.am
-+++ git/Makefile.am
-@@ -22,7 +22,7 @@ dtrace.1 stap-merge.1\
- stappaths.7
- 
- bin_SCRIPTS = stap-report
--pkglibexec_SCRIPTS = stap-env
-+pkgdata_SCRIPTS = stap-env
- oldinclude_HEADERS = includes/sys/sdt.h includes/sys/sdt-config.h
- 
- bin_PROGRAMS =
-@@ -41,7 +41,7 @@ if BUILD_SERVER
- man_MANS += stap-server.8
- pkglibexec_PROGRAMS += stap-serverd stap-gen-cert
- bin_SCRIPTS += stap-server
--pkglibexec_SCRIPTS += stap-start-server stap-stop-server
-+pkgdata_SCRIPTS += stap-start-server stap-stop-server
- endif
- endif
- 
-@@ -127,7 +127,7 @@ install-scripts: install-binSCRIPTS inst
- 	for f in $(bin_SCRIPTS); do \
- 	   sed -i -e "s,\$${PKGLIBEXECDIR},$(pkglibexecdir)/," $(DESTDIR)$(bindir)/$$f; \
- 	done
--	for f in $(pkglibexec_SCRIPTS); do \
-+	for f in $(pkgdata_SCRIPTS); do \
- 	   sed -i -e "/INSTALL-HOOK/d;s,sysconfdir=.*,sysconfdir=$(sysconfdir),;s,pkglibexecdir=.*,pkglibexecdir=$(pkglibexecdir)/,;s,localstatedir=.*,localstatedir=$(localstatedir),;s,\$${PKGLIBEXECDIR},$(pkglibexecdir)/," $(DESTDIR)$(pkglibexecdir)/$$f; \
- 	done
- endif
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
index 1c64be6..ebacc43 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
@@ -5,12 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS = "elfutils sqlite3"
 
 SRCREV = "820f2d22fc47fad6e09ba886efb9b91e1247cb39"
-PR = "r1"
+PR = "r2"
 PV = "1.6+git${SRCPV}"
 
-SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git \
-           file://fix_for_automake_1.11.2.patch \
-          "
+SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git"
 
 EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \
 	     ac_cv_file__usr_include_nss=no \
-- 
1.7.6.4

Re: [PATCH 0/7] Misc Fixes

[Saul Wold]

On 01/05/2012 09:30 AM, nitin.a.kamble@intel.com wrote:
> From: Nitin A Kamble<nitin.a.kamble@intel.com>
>
>
> Here are fixes related to x32&  automake-1.11.2.
>
> Thanks,
> Nitin
>
> The following changes since commit 7f837eb05f924996c89283ec8b74e46f6b5cd343:
>
>    bitbake/runqueue: Improve the setscene logging (2012-01-05 13:04:19 +0000)
>
> are available in the git repository at:
>    git://git.pokylinux.org/poky-contrib nitin/work
>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/work
>
> Nitin A Kamble (7):
>    python-pycairo: fix for x32
>    libevent: fix compilation for x32
>    libxxf86dga: fix compilation with x32 toolchain
>    vte: update patch header
>    automake-1.11.2: backport pkglibexec_SCRIPTS fix
>    mc: remove not needed fix for automake 1.11.2
>    systemtap: remove not needed fix for automake 1.11.2
>
Merged all of thexe execpt the libxxf86dga, due to comments, which have 
been addressed.

Will merge that one in the next block.

Thanks
	Sau!

>   ...utomake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch |  118 ++++++++++++++++++++
>   meta/recipes-devtools/automake/automake_1.11.2.bb  |    5 +-
>   .../python/python-pycairo_1.10.0.bb                |    6 +-
>   .../mc/files/fix_for_automake_1.11.2.patch         |   69 ------------
>   meta/recipes-extended/mc/mc_4.8.1.bb               |    3 +-
>   .../libxxf86dga-1.1.2_fix_for_x32.patch            |   30 +++++
>   .../recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb |    5 +-
>   .../systemtap/fix_for_automake_1.11.2.patch        |   46 --------
>   meta/recipes-kernel/systemtap/systemtap_git.bb     |    6 +-
>   .../libevent/libevent-2.0.16_fix_for_x32.patch     |   47 ++++++++
>   meta/recipes-support/libevent/libevent_2.0.16.bb   |    5 +-
>   meta/recipes-support/vte/vte/introspection.patch   |    8 ++
>   12 files changed, 219 insertions(+), 129 deletions(-)
>   create mode 100644 meta/recipes-devtools/automake/automake/automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch
>   delete mode 100644 meta/recipes-extended/mc/files/fix_for_automake_1.11.2.patch
>   create mode 100644 meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-1.1.2_fix_for_x32.patch
>   delete mode 100644 meta/recipes-kernel/systemtap/systemtap/fix_for_automake_1.11.2.patch
>   create mode 100644 meta/recipes-support/libevent/libevent/libevent-2.0.16_fix_for_x32.patch
>

[PATCH 0/7] Misc fixes

[Khem Raj]

These fixes are independent but feeding into the bigger items
e.g. mips64/sh4 support, supporting xorg-xserver on qemumachines
etc.

The following changes since commit 35b5fb2dd2131d4c7dc6635c14c6e08ea6926457:

  eglibc-package: remove /var (2012-05-01 12:36:18 +0100)

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

Khem Raj (6):
  unfs-server: Do not use DESTDIR
  xserver-xorg: Fix build on powerpc
  libatomics-ops: Make it build for SH4
  qemu-git: Move to tip of git
  openssl: Fix build for mips64(el)
  uclibc: Return correct endianness for mips64

Yuri Bushmelev (1):
  Enable PARALLEL_MAKE for testing

 meta/recipes-bsp/pciutils/pciutils_3.1.9.bb        |    1 -
 meta/recipes-bsp/pcmciautils/pcmciautils.inc       |    1 -
 meta/recipes-connectivity/iproute2/iproute2.inc    |    1 -
 .../nfs-utils/nfs-utils_1.2.3.bb                   |    1 -
 .../openssl/openssl-1.0.0i/configure-targets.patch |   17 ++---
 .../recipes-connectivity/openssl/openssl_1.0.0i.bb |    2 +-
 meta/recipes-core/eggdbus/eggdbus_0.6.bb           |    1 -
 meta/recipes-core/uclibc/uclibc-config.inc         |    2 +-
 meta/recipes-devtools/autoconf/autoconf_2.68.bb    |    1 -
 .../recipes-devtools/qemu/qemu-git/powerpc_rom.bin |  Bin 0 -> 4096 bytes
 meta/recipes-devtools/qemu/qemu_git.bb             |   18 ++----
 .../unfs-server/unfs-server_2.1+2.2beta47.bb       |    4 +-
 meta/recipes-extended/groff/groff_1.20.1.bb        |    1 -
 meta/recipes-extended/mailx/mailx_12.5.bb          |    1 -
 .../net-tools/net-tools_1.60-23.bb                 |    1 -
 meta/recipes-extended/sat-solver/sat-solver_git.bb |    1 -
 .../fontconfig/fontconfig_2.8.0.bb                 |    1 -
 meta/recipes-graphics/libsdl/libsdl_1.2.15.bb      |    1 -
 meta/recipes-graphics/xcb/libpthread-stubs_0.3.bb  |    1 -
 meta/recipes-graphics/xcb/xcb-util.inc             |    1 -
 .../xorg-xserver/xserver-xorg-1.11.2.inc           |    9 ++-
 .../xserver-xorg-1.11.2/gcc-47-warning.patch       |   33 +++++++++
 .../libatomics-ops/gentoo/sh4-atomic-ops.patch     |   70 ++++++++++++++++++++
 .../pulseaudio/libatomics-ops_1.2.bb               |    6 +-
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc  |    1 -
 meta/recipes-multimedia/speex/speex_1.2rc1.bb      |    1 -
 meta/recipes-support/icu/icu-3.6.inc               |    1 -
 meta/recipes-support/libpcre/libpcre_8.21.bb       |    1 -
 28 files changed, 129 insertions(+), 50 deletions(-)
 create mode 100644 meta/recipes-devtools/qemu/qemu-git/powerpc_rom.bin
 create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch
 create mode 100644 meta/recipes-multimedia/pulseaudio/libatomics-ops/gentoo/sh4-atomic-ops.patch

-- 
1.7.5.4

Re: [PATCH 0/7] Misc fixes

[Saul Wold]

On 05/02/2012 01:53 PM, Khem Raj wrote:
> These fixes are independent but feeding into the bigger items
> e.g. mips64/sh4 support, supporting xorg-xserver on qemumachines
> etc.
>
> The following changes since commit 35b5fb2dd2131d4c7dc6635c14c6e08ea6926457:
>
>    eglibc-package: remove /var (2012-05-01 12:36:18 +0100)
>
> are available in the git repository at:
>    git://git.openembedded.org/openembedded-core-contrib kraj/misc-updates
>    http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/misc-updates
>
> Khem Raj (6):
>    unfs-server: Do not use DESTDIR
Withdrawn
>    xserver-xorg: Fix build on powerpc
Holding with rest of xserver changes

>    libatomics-ops: Make it build for SH4
Merged

>    qemu-git: Move to tip of git
Not merged.

>    openssl: Fix build for mips64(el)
>    uclibc: Return correct endianness for mips64
Merged

>
> Yuri Bushmelev (1):
>    Enable PARALLEL_MAKE for testing
>
Not merged at this time

Thanks
	Sau!


>   meta/recipes-bsp/pciutils/pciutils_3.1.9.bb        |    1 -
>   meta/recipes-bsp/pcmciautils/pcmciautils.inc       |    1 -
>   meta/recipes-connectivity/iproute2/iproute2.inc    |    1 -
>   .../nfs-utils/nfs-utils_1.2.3.bb                   |    1 -
>   .../openssl/openssl-1.0.0i/configure-targets.patch |   17 ++---
>   .../recipes-connectivity/openssl/openssl_1.0.0i.bb |    2 +-
>   meta/recipes-core/eggdbus/eggdbus_0.6.bb           |    1 -
>   meta/recipes-core/uclibc/uclibc-config.inc         |    2 +-
>   meta/recipes-devtools/autoconf/autoconf_2.68.bb    |    1 -
>   .../recipes-devtools/qemu/qemu-git/powerpc_rom.bin |  Bin 0 ->  4096 bytes
>   meta/recipes-devtools/qemu/qemu_git.bb             |   18 ++----
>   .../unfs-server/unfs-server_2.1+2.2beta47.bb       |    4 +-
>   meta/recipes-extended/groff/groff_1.20.1.bb        |    1 -
>   meta/recipes-extended/mailx/mailx_12.5.bb          |    1 -
>   .../net-tools/net-tools_1.60-23.bb                 |    1 -
>   meta/recipes-extended/sat-solver/sat-solver_git.bb |    1 -
>   .../fontconfig/fontconfig_2.8.0.bb                 |    1 -
>   meta/recipes-graphics/libsdl/libsdl_1.2.15.bb      |    1 -
>   meta/recipes-graphics/xcb/libpthread-stubs_0.3.bb  |    1 -
>   meta/recipes-graphics/xcb/xcb-util.inc             |    1 -
>   .../xorg-xserver/xserver-xorg-1.11.2.inc           |    9 ++-
>   .../xserver-xorg-1.11.2/gcc-47-warning.patch       |   33 +++++++++
>   .../libatomics-ops/gentoo/sh4-atomic-ops.patch     |   70 ++++++++++++++++++++
>   .../pulseaudio/libatomics-ops_1.2.bb               |    6 +-
>   meta/recipes-multimedia/pulseaudio/pulseaudio.inc  |    1 -
>   meta/recipes-multimedia/speex/speex_1.2rc1.bb      |    1 -
>   meta/recipes-support/icu/icu-3.6.inc               |    1 -
>   meta/recipes-support/libpcre/libpcre_8.21.bb       |    1 -
>   28 files changed, 129 insertions(+), 50 deletions(-)
>   create mode 100644 meta/recipes-devtools/qemu/qemu-git/powerpc_rom.bin
>   create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch
>   create mode 100644 meta/recipes-multimedia/pulseaudio/libatomics-ops/gentoo/sh4-atomic-ops.patch
>