[PATCH 0/2] A couple of fixes

[PATCH 0/2] A couple of fixes

[Paul Eggleton]

The following changes since commit b055075ba5b9ff5250bc66be1cd8b222bdb86161:

  slang: Fix rpath QA warnings (2012-03-15 00:07:43 +0000)

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

Paul Eggleton (2):
  util-linux: restore zlib and ncurses dependencies for native
  python-imaging: bring in fixes from meta-oe

 meta/recipes-core/util-linux/util-linux.inc        |    2 +-
 meta/recipes-core/util-linux/util-linux_2.21.bb    |    2 +-
 ...ng-setup.py-force-paths-for-zlib-freetyp.patch} |   36 +++++++++++++++----
 .../python/python-imaging_1.1.7.bb                 |    9 +++--
 4 files changed, 36 insertions(+), 13 deletions(-)
 rename meta/recipes-devtools/python/python-imaging/{path.patch => 0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch} (47%)

-- 
1.7.5.4

[PATCH 1/2] util-linux: restore zlib and ncurses dependencies for native

[Paul Eggleton]

OE-Core commit 4a158b6ef125b555225472eefbe1ea226dc47c2c unintentionally
removed the dependencies for util-linux-native on zlib-native and
ncurses-native by getting append and virtclass-native overrides swapped
around; later this was tidied up to remove the append (which did not change
anything functionally). These libraries are required, so add them back in.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/recipes-core/util-linux/util-linux.inc     |    2 +-
 meta/recipes-core/util-linux/util-linux_2.21.bb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index e2d354f..024b55c 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=9c920d811858a74b67a36ba23cbaa95f
 
 inherit autotools gettext pkgconfig
 DEPENDS = "zlib ncurses"
-DEPENDS_virtclass-native = " lzo-native"
+DEPENDS_append_virtclass-native = " lzo-native"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \
            file://MCONFIG \
diff --git a/meta/recipes-core/util-linux/util-linux_2.21.bb b/meta/recipes-core/util-linux/util-linux_2.21.bb
index d899dd3..ab26fcd 100644
--- a/meta/recipes-core/util-linux/util-linux_2.21.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.21.bb
@@ -1,5 +1,5 @@
 MAJOR_VERSION = "2.21"
-PR = "r4"
+PR = "r5"
 require util-linux.inc
 
 # note that `lscpu' is under GPLv3+
-- 
1.7.5.4

[PATCH 2/2] python-imaging: bring in fixes from meta-oe

[Paul Eggleton]

This makes the following changes:
* Replace the /usr/local/bin/python path in all scripts
* Move RDEPENDS_${PN} to the end (but use += or we lose the python-core
  depencency).
* Use PR = "r3" instead of "ml2". (Even without increasing the numeric
  part it is recognised as greater alphabetically.)
* Bring in meta-oe version of the path patch which avoids the following
  warning:

WARNING: python-imaging: The compile log indicates that host include
and/or library paths were used.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 ...ng-setup.py-force-paths-for-zlib-freetyp.patch} |   36 +++++++++++++++----
 .../python/python-imaging_1.1.7.bb                 |    9 +++--
 2 files changed, 34 insertions(+), 11 deletions(-)
 rename meta/recipes-devtools/python/python-imaging/{path.patch => 0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch} (47%)

diff --git a/meta/recipes-devtools/python/python-imaging/path.patch b/meta/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch
similarity index 47%
rename from meta/recipes-devtools/python/python-imaging/path.patch
rename to meta/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch
index a5bba75..2575306 100644
--- a/meta/recipes-devtools/python/python-imaging/path.patch
+++ b/meta/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch
@@ -1,9 +1,19 @@
+From 07d4f095a9e22ae676a8d68073101131e65012dc Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Tue, 15 Nov 2011 13:16:54 +0100
+Subject: [PATCH] python imaging setup.py: force paths for zlib, freetype and jpeg and don't add host paths
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+
 Upstream-Status: Inappropriate [embedded specific]
+---
+ setup.py |   14 +++-----------
+ 1 files changed, 3 insertions(+), 11 deletions(-)
 
-Index: Imaging-1.1.7/setup.py
-===================================================================
---- Imaging-1.1.7.orig/setup.py
-+++ Imaging-1.1.7/setup.py
+diff --git a/setup.py b/setup.py
+index 5d4d53a..b1a22ec 100644
+--- a/setup.py
++++ b/setup.py
 @@ -34,10 +34,10 @@ def libinclude(root):
  # TIFF_ROOT = libinclude("/opt/tiff")
  
@@ -14,11 +24,19 @@ Index: Imaging-1.1.7/setup.py
 +ZLIB_ROOT = os.environ['STAGING_LIBDIR']
  TIFF_ROOT = None
 -FREETYPE_ROOT = None
-+FREETYPE_ROOT = os.environ['STAGING_LIBDIR'], os.environ['STAGING_INCDIR']
++FREETYPE_ROOT =  os.environ['STAGING_LIBDIR'], os.environ['STAGING_INCDIR']
  LCMS_ROOT = None
  
  # FIXME: add mechanism to explicitly *disable* the use of a library
-@@ -207,14 +207,6 @@ class pil_build_ext(build_ext):
+@@ -147,7 +147,6 @@ class pil_build_ext(build_ext):
+             add_directory(library_dirs, "/opt/local/lib")
+             add_directory(include_dirs, "/opt/local/include")
+ 
+-        add_directory(library_dirs, "/usr/local/lib")
+         # FIXME: check /opt/stuff directories here?
+ 
+         prefix = sysconfig.get_config_var("prefix")
+@@ -207,13 +206,6 @@ class pil_build_ext(build_ext):
              if os.path.isfile(os.path.join(tcl_dir, "tk.h")):
                  add_directory(include_dirs, tcl_dir)
  
@@ -29,7 +47,9 @@ Index: Imaging-1.1.7/setup.py
 -        add_directory(library_dirs, "/usr/lib")
 -        add_directory(include_dirs, "/usr/include")
 -
--        #
+         #
          # insert new dirs *before* default libs, to avoid conflicts
          # between Python PYD stub libs and real libraries
- 
+-- 
+1.7.2.5
+
diff --git a/meta/recipes-devtools/python/python-imaging_1.1.7.bb b/meta/recipes-devtools/python/python-imaging_1.1.7.bb
index fc568b5..6d9743e 100644
--- a/meta/recipes-devtools/python/python-imaging_1.1.7.bb
+++ b/meta/recipes-devtools/python/python-imaging_1.1.7.bb
@@ -3,12 +3,11 @@ SECTION = "devel/python"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://README;beginline=92;endline=120;md5=c4371af4579f1e489cf881c1443dd4ec"
 DEPENDS = "freetype jpeg tiff"
-RDEPENDS_${PN} = "python-lang python-stringold"
 SRCNAME = "Imaging"
-PR = "ml2"
+PR = "r3"
 
 SRC_URI = "http://effbot.org/downloads/Imaging-${PV}.tar.gz \
-           file://path.patch"
+           file://0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch"
 
 SRC_URI[md5sum] = "fc14a54e1ce02a0225be8854bfba478e"
 SRC_URI[sha256sum] = "895bc7c2498c8e1f9b99938f1a40dc86b3f149741f105cf7c7bd2e0725405211"
@@ -30,4 +29,8 @@ do_install() {
     install -m 0644 ${S}/README ${D}${datadir}/doc/${PN}/
     install -m 0644 ${S}/Docs/* ${D}${datadir}/doc/${PN}/html/
 
+    # get rid of #!/usr/local/bin/python
+    sed -i -e 's:/usr/local/bin/:${bindir}/env :g' ${D}${bindir}/*
 }
+
+RDEPENDS_${PN} += "python-lang python-stringold"
-- 
1.7.5.4

Re: [PATCH 0/2] A couple of fixes

[Saul Wold]

On 03/15/2012 07:24 AM, Paul Eggleton wrote:
> The following changes since commit b055075ba5b9ff5250bc66be1cd8b222bdb86161:
>
>    slang: Fix rpath QA warnings (2012-03-15 00:07:43 +0000)
>
> are available in the git repository at:
>    git://git.openembedded.org/openembedded-core-contrib paule/fixes15
>    http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/fixes15
>
> Paul Eggleton (2):
>    util-linux: restore zlib and ncurses dependencies for native
>    python-imaging: bring in fixes from meta-oe
>
>   meta/recipes-core/util-linux/util-linux.inc        |    2 +-
>   meta/recipes-core/util-linux/util-linux_2.21.bb    |    2 +-
>   ...ng-setup.py-force-paths-for-zlib-freetyp.patch} |   36 +++++++++++++++----
>   .../python/python-imaging_1.1.7.bb                 |    9 +++--
>   4 files changed, 36 insertions(+), 13 deletions(-)
>   rename meta/recipes-devtools/python/python-imaging/{path.patch =>  0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch} (47%)
>

Merged into OE-Core

Thanks
	Sau!

[PATCH 0/2] A couple of fixes

[Saul Wold]

Richard,

These patches address a couple of issues, the gnupg fixes the GPLv2 version
of that recipe, it was orignally pushed (by me as a mistake, got pulled too 
soon).  This version is correct and builds.

The syslinux change removes about 60 WARNINGS by packaging the remaining files
in syslinux-misc

Sau!

The following changes since commit 22194a04f224864dd687660e351a3a10da1f06fa:

  scripts/hob: Launch the new hob (2012-02-24 18:05:46 +0000)

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

Saul Wold (2):
  gnupg: Update checksum, fix configure and compliation issues
  syslinux: Package unpackaged files in -misc

 meta/recipes-devtools/syslinux/syslinux_4.03.bb    |    3 ++-
 .../gnupg/gnupg-1.4.7/configure.patch              |   17 +++++++++++++++++
 meta/recipes-support/gnupg/gnupg_1.4.7.bb          |   17 +++++++++--------
 3 files changed, 28 insertions(+), 9 deletions(-)
 create mode 100644 meta/recipes-support/gnupg/gnupg-1.4.7/configure.patch

-- 
1.7.7.6