Skip to contentSkip to conversation

Misc recipe fixes

PATCH New [email protected] 1 participant 5 messages Jan 21, 2012

lore
Share & tools
lore
#0 lore raw

cover Misc recipe fixes

From: Nitin A Kamble <[email protected]>

These are misc fixes.
Nitin

The following changes since commit 3fe81df6400448b54b47a13f27e1389b1e824ab0:

distro_tracking: update libpng, libgdbus, opensp, nfs-utils manual check dates (2012-01-20 16:47:51 +0000)

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

Nitin A Kamble (4):
ltp: disable elf binary stripping
guile: fix a quote in description
distutils: Bandaid against wrong libdir computation
python-pyrex: force recompilation

 meta/classes/distutils.bbclass                     |    7 +++++++
 meta/recipes-devtools/guile/guile_2.0.3.bb         |    4 ++--
 meta/recipes-devtools/python/python-pyrex_0.9.9.bb |    2 +-
 meta/recipes-extended/ltp/ltp_20110915.bb          |    6 +++++-
 4 files changed, 15 insertions(+), 4 deletions(-)
Signature · 1 line
1.7.6.4
#1 lore raw

PATCH 1/4 ltp: disable elf binary stripping

From: Nitin A Kamble <[email protected]>

Otherwise the ltp tests ldd01 & nm01 fail due to missing stripped information.

This Fixes these bugs:
[YOCTO #1922]
[YOCTO #1923]

---
 meta/recipes-extended/ltp/ltp_20110915.bb |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
meta/recipes-extended/ltp/ltp_20110915.bb +5 -1
index dabc0f0..fd0510e 100644
@@ -3,7 +3,7 @@ DESCRIPTION = "The Linux Test Project is a joint project with SGI, IBM, OSDL, an
 HOMEPAGE = "http://ltp.sourceforge.net"
 SECTION = "console/utils"
 
-PR = "r0"
+PR = "r1"
 
 LICENSE = "GPLv2 & GPLv2+ & LGPLv2+ & LGPLv2.1+ & BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
@@ -66,3 +66,7 @@ do_install(){
 	# We will add expect for enhancement in future
 	find ${D} -type f -print | xargs grep "\!.*\/usr\/bin\/expect" | awk -F":" '{print $1}' | xargs rm -f
 }
+
+# Avoid geenrated binaries stripping. Otherwise some of the ltp tests such as ldd01 & nm fails
+INHIBIT_PACKAGE_STRIP = "1"
+
Signature · 1 line
1.7.6.4
#2 lore raw

PATCH 2/4 guile: fix a quote in description

From: Nitin A Kamble <[email protected]>

---
 meta/recipes-devtools/guile/guile_2.0.3.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/guile/guile_2.0.3.bb +2 -2
index 60fbe32..f6f7a8e 100644
@@ -4,7 +4,7 @@ DESCRIPTION = "Guile is the GNU Ubiquitous Intelligent Language for Extensions,\
  Guile is a library designed to help programmers create flexible applications.\
  Using Guile in an application allows the application's functionality to be\
  extended by users or other programmers with plug-ins, modules, or scripts.\
- Guile provides what might be described as "practical software freedom,"\
+ Guile provides what might be described as 'practical software freedom,'\
  making it possible for users to customize an application to meet their\
  needs without digging into the application's internals."
 
@@ -24,7 +24,7 @@ SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.gz \
 SRC_URI[md5sum] = "3b8b4e1083037f29d2c4704a6d55f2a8"
 SRC_URI[sha256sum] = "a53b21159befe3e89bbaca71e9e62cf00af0f49fcca297c407944b988d59eb08"
 
-PR = "r1"
+PR = "r2"
 
 inherit autotools gettext
 BBCLASSEXTEND = "native"
Signature · 1 line
1.7.6.4
#3 lore raw

PATCH 3/4 distutils: Bandaid against wrong libdir computation

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

fix python-* recipes install path for some of the files in libdir

This fixes issues like these:

WARNING: For recipe python-pyrex, the following files/directories were installed but not shipped in any package:

WARNING:   /usr/share
WARNING:   /usr/share/lib
WARNING:   /usr/share/lib/python2.7
WARNING:   /usr/share/lib/python2.7/site-packages
WARNING:   /usr/share/lib/python2.7/site-packages/Pyrex
WARNING:   /usr/share/lib/python2.7/site-packages/Pyrex/Compiler

WARNING:
/usr/share/lib/python2.7/site-packages/Pyrex/Compiler/Lexicon.pickle

---
 meta/classes/distutils.bbclass |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
meta/classes/distutils.bbclass +7 -0
index 79b962a..b6383ac 100644
@@ -66,6 +66,13 @@ distutils_do_install() {
             mv -f ${D}${datadir}/share/* ${D}${datadir}/
         fi
 
+        #
+        # FIXME: Bandaid against wrong libdir computation
+        #
+        if test -e ${D}${datadir}/lib; then
+            cp -r -f ${D}${datadir}/lib/* ${D}${libdir}/
+            rm -rf ${D}${datadir}/lib/
+        fi
         # These are generated files, on really slow systems the storage/speed trade off
         # might be worth it, but in general it isn't 
         find ${D}${libdir}/${PYTHON_DIR}/site-packages -iname '*.pyo' -exec rm {} \;
Signature · 1 line
1.7.6.4
#4 lore raw

PATCH 4/4 python-pyrex: force recompilation

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

distutils.bbclass is updated to fix files getting installed in wrong libdir to fix following warnings.

WARNING: For recipe python-pyrex, the following files/directories were installed but not shipped in any package:

WARNING:   /usr/share
WARNING:   /usr/share/lib
WARNING:   /usr/share/lib/python2.7
WARNING:   /usr/share/lib/python2.7/site-packages
WARNING:   /usr/share/lib/python2.7/site-packages/Pyrex
WARNING:   /usr/share/lib/python2.7/site-packages/Pyrex/Compiler

WARNING:
/usr/share/lib/python2.7/site-packages/Pyrex/Compiler/Lexicon.pickle

Just bump PR to force recompilation

---
 meta/recipes-devtools/python/python-pyrex_0.9.9.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-devtools/python/python-pyrex_0.9.9.bb +1 -1
index 7d80554..ae1a93b 100644
@@ -5,7 +5,7 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=771d472f53f933033f57eeee7808e5bd"
 SRCNAME = "Pyrex"
-PR = "ml2"
+PR = "r2"
 
 SRC_URI = "\
   http://www.cosc.canterbury.ac.nz/greg.ewing/python/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
Signature · 1 line
1.7.6.4