All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/7] SSTATE_SCAN_FILES Fix with non-gplv3 and World fixes
@ 2011-12-15  1:50 Saul Wold
  2011-12-15  1:50 ` [PATCH 1/7] qt-mobility: Fix QA error for debug files Saul Wold
                   ` (7 more replies)
  0 siblings, 8 replies; 16+ messages in thread
From: Saul Wold @ 2011-12-15  1:50 UTC (permalink / raw)
  To: openembedded-core

Richard,

This patch contains a couple of fixes for world and non-gplv3 along
with the sstate fix for ensure we mangle (or "fixmepath") files that
do not fall into the standard set.

SSTATE_SCAN_FILES is defaulted to "*.la and *-configs", recipes can
append to it with SSTATE_SCAN_FILES += "<filename>".


The following changes since commit b9dfccc018f32a47fc045f35d5f53d7269d791ed:

  gdk-pixbuf: Ensure the binaries can be relocated (2011-12-13 18:00:18 +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 (7):
  qt-mobility: Fix QA error for debug files
  ed: Fix EXTRA_OECONF to ensure right compiler is found
  sstate: Add SSTATE_SCAN_FILES
  icu: Add Makefile.inc to SSTATE_SCAN_FILES
  gmp: Add gmp.h to SSTATE_SCAN_FILES
  libtool-cross: Add libtool & libtoolize to SSTATE_SCAN_FILES
  perl: add .pl, pm, pod, sh files to SSTATE_SCANE_FILES

 meta/classes/sstate.bbclass                        |   11 ++++++++++-
 .../libtool/libtool-cross_2.4.2.bb                 |    4 +++-
 meta/recipes-devtools/perl/perl_5.14.2.bb          |    5 ++++-
 meta/recipes-extended/ed/ed_0.5.bb                 |    5 ++++-
 meta/recipes-qt/qt4/qt-mobility_1.2.0.inc          |    7 ++++---
 meta/recipes-support/gmp/gmp.inc                   |    2 ++
 meta/recipes-support/gmp/gmp_4.2.1.bb              |    2 +-
 meta/recipes-support/gmp/gmp_5.0.2.bb              |    2 +-
 meta/recipes-support/icu/icu-3.6.inc               |    2 ++
 meta/recipes-support/icu/icu_3.6.bb                |    2 +-
 10 files changed, 32 insertions(+), 10 deletions(-)

-- 
1.7.6.4




^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH 1/7] qt-mobility: Fix QA error for debug files
  2011-12-15  1:50 [PATCH 0/7] SSTATE_SCAN_FILES Fix with non-gplv3 and World fixes Saul Wold
@ 2011-12-15  1:50 ` Saul Wold
  2011-12-15  1:50 ` [PATCH 2/7] ed: Fix EXTRA_OECONF to ensure right compiler is found Saul Wold
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 16+ messages in thread
From: Saul Wold @ 2011-12-15  1:50 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-qt/qt4/qt-mobility_1.2.0.inc |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
index b3a3fad..55650b8 100644
--- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
+++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
@@ -60,7 +60,8 @@ do_install() {
 
 PACKAGES = "${PN}-dbg ${PN} ${PN}-dev"
 
-FILES_${PN}-dbg = "${qtm_bin}/.debug ${qtm_examples}/.debug ${qtm_demos}/.debug ${qtm_lib}/.debug ${qtm_plugins}/*/.debug \
-		${qtm_imports}/*/.debug ${qtm_imports}/*/*/.debug /usr/src/debug"
+FILES_${PN}-dbg = "${qtm_bin}/.debug ${qtm_examples}/.debug ${qtm_demos}/.debug \
+                   ${qtm_lib}/.debug ${qtm_plugins}/*/.debug  ${qtm_imports}/*/.debug \
+                   ${qtm_imports}/*/*/.debug ${bindir}/.debug /usr/src/debug"
 FILES_${PN} = "${qtm_bin} ${qtm_examples} ${qtm_demos} ${qtm_lib}/*.so.1* ${qtm_plugins} ${qtm_imports}"
-FILES_${PN}-dev = "/usr"
+FILES_${PN}-dev = "${exec_prefix}"
-- 
1.7.6.4




^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [PATCH 2/7] ed: Fix EXTRA_OECONF to ensure right compiler is found
  2011-12-15  1:50 [PATCH 0/7] SSTATE_SCAN_FILES Fix with non-gplv3 and World fixes Saul Wold
  2011-12-15  1:50 ` [PATCH 1/7] qt-mobility: Fix QA error for debug files Saul Wold
@ 2011-12-15  1:50 ` Saul Wold
  2011-12-15  6:56   ` Khem Raj
  2011-12-15  1:50 ` [PATCH 3/7] sstate: Add SSTATE_SCAN_FILES Saul Wold
                   ` (5 subsequent siblings)
  7 siblings, 1 reply; 16+ messages in thread
From: Saul Wold @ 2011-12-15  1:50 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/ed/ed_0.5.bb |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-extended/ed/ed_0.5.bb b/meta/recipes-extended/ed/ed_0.5.bb
index 205822f..d251e4e 100644
--- a/meta/recipes-extended/ed/ed_0.5.bb
+++ b/meta/recipes-extended/ed/ed_0.5.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6ddd5335ef96fb858a138230af773710 \
                     file://main.c;beginline=1;endline=17;md5=36d4b85e5ae9028e918d1cc775c2475e"
 
-PR = "r1"
+PR = "r2"
 SRC_URI = "http://download.savannah.gnu.org/releases-noredirect/ed/ed-${PV}.tar.bz2"
 
 SRC_URI[md5sum] = "4ee21e9dcc9b5b6012c23038734e1632"
@@ -13,6 +13,9 @@ SRC_URI[sha256sum] = "edef2bbde0fbf0d88232782a0eded323f483a0519d6fde9a3b1809056f
 
 inherit autotools
 
+EXTRA_OECONF = "'CC=${CC}' 'CXX=${CXX}' 'CFLAGS=${CFLAGS}' 'CXXFLAGS=${CXXFLAGS}' 'CPPFLAGS=${CPPFLAGS}' 'LDFLAGS=${LDFLAGS}'"
+
 CONFIGUREOPTS := "${@d.getVar('CONFIGUREOPTS', True).replace('--disable-dependency-tracking', ' ')}"
 CONFIGUREOPTS := "${@d.getVar('CONFIGUREOPTS', True).replace('--disable-silent-rules', ' ')}"
 
+
-- 
1.7.6.4




^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [PATCH 3/7] sstate: Add SSTATE_SCAN_FILES
  2011-12-15  1:50 [PATCH 0/7] SSTATE_SCAN_FILES Fix with non-gplv3 and World fixes Saul Wold
  2011-12-15  1:50 ` [PATCH 1/7] qt-mobility: Fix QA error for debug files Saul Wold
  2011-12-15  1:50 ` [PATCH 2/7] ed: Fix EXTRA_OECONF to ensure right compiler is found Saul Wold
@ 2011-12-15  1:50 ` Saul Wold
  2011-12-15  8:38   ` Saul Wold
  2011-12-15 11:12   ` Richard Purdie
  2011-12-15  1:50 ` [PATCH 4/7] icu: Add Makefile.inc to SSTATE_SCAN_FILES Saul Wold
                   ` (4 subsequent siblings)
  7 siblings, 2 replies; 16+ messages in thread
From: Saul Wold @ 2011-12-15  1:50 UTC (permalink / raw)
  To: openembedded-core

This allows recipes to specify files that may be outside the normal set
for inclusion when there are hardcoded paths that need to be fixmepathed
to work correctly.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/classes/sstate.bbclass |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 504b099..5452a43 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -10,7 +10,8 @@ SSTATE_PKGSPEC    = "sstate-${PN}-${PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}-$
 SSTATE_PKGNAME    = "${SSTATE_PKGSPEC}${BB_TASKHASH}"
 SSTATE_PKG        = "${SSTATE_DIR}/${SSTATE_PKGNAME}"
 
-SSTATE_SCAN_CMD ?= "find ${SSTATE_BUILDDIR} \( -name "*.la" -o -name "*-config" \) -type f"
+SSTATE_SCAN_FILES ?= "*.la *-config"
+SSTATE_SCAN_CMD ?= "find ${SSTATE_BUILDDIR} \( ${SSTATE_FIND_CMD_FILES} \) -type f"
 
 BB_HASHFILENAME = "${SSTATE_PKGNAME}"
 
@@ -33,6 +34,13 @@ python () {
     else:
         d.setVar('SSTATE_MANMACH', bb.data.expand("${MACHINE}", d))
 
+    find_cmd_files = ""
+    for file in d.getVar('SSTATE_SCAN_FILES', True).split():
+        find_file = "-o -name \"" + file + "\""
+        find_cmd_files = find_cmd_files + " " + find_file
+    d.setVar('SSTATE_FIND_CMD_FILES', find_cmd_files.replace("-o ", "", 1))
+    bb.note("FIND_CMD_FILES = %s" % find_cmd_files)
+
     # These classes encode staging paths into their scripts data so can only be
     # reused if we manipulate the paths
     if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('sdk', d) or bb.data.inherits_class('crosssdk', d):
@@ -299,6 +307,7 @@ def sstate_hardcode_path(d):
 	# Need to remove hardcoded paths and fix these when we install the
 	# staging packages.
 	sstate_scan_cmd = d.getVar('SSTATE_SCAN_CMD', True)
+        bb.note("SCAN_CMD = %s" % sstate_scan_cmd)
 	p = os.popen("%s" % sstate_scan_cmd)
 	file_list = p.read()
 
-- 
1.7.6.4




^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [PATCH 4/7] icu: Add Makefile.inc to SSTATE_SCAN_FILES
  2011-12-15  1:50 [PATCH 0/7] SSTATE_SCAN_FILES Fix with non-gplv3 and World fixes Saul Wold
                   ` (2 preceding siblings ...)
  2011-12-15  1:50 ` [PATCH 3/7] sstate: Add SSTATE_SCAN_FILES Saul Wold
@ 2011-12-15  1:50 ` Saul Wold
  2011-12-15  1:50 ` [PATCH 5/7] gmp: Add gmp.h " Saul Wold
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 16+ messages in thread
From: Saul Wold @ 2011-12-15  1:50 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-support/icu/icu-3.6.inc |    2 ++
 meta/recipes-support/icu/icu_3.6.bb  |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-support/icu/icu-3.6.inc b/meta/recipes-support/icu/icu-3.6.inc
index 18efd16..8fadc92 100644
--- a/meta/recipes-support/icu/icu-3.6.inc
+++ b/meta/recipes-support/icu/icu-3.6.inc
@@ -54,3 +54,5 @@ FILES_libicutu = "${libdir}/libicutu.so.*"
 FILES_libicuio = "${libdir}/libicuio.so.*"
 
 BBCLASSEXTEND = "native"
+
+SSTATE_SCAN_FILES += "Makefile.inc"
diff --git a/meta/recipes-support/icu/icu_3.6.bb b/meta/recipes-support/icu/icu_3.6.bb
index 4863cbf..f5a3d8c 100644
--- a/meta/recipes-support/icu/icu_3.6.bb
+++ b/meta/recipes-support/icu/icu_3.6.bb
@@ -1,6 +1,6 @@
 require icu-3.6.inc
 
-PR = "r6"
+PR = "r7"
 
 SRC_URI[md5sum] = "6243f7a19e03e05403ce84e597510d4c"
 SRC_URI[sha256sum] = "5135e8d69d6206d320515df7aeee7027711ab1aef9d8dbf29571a97a9746b041"
-- 
1.7.6.4




^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [PATCH 5/7] gmp: Add gmp.h to SSTATE_SCAN_FILES
  2011-12-15  1:50 [PATCH 0/7] SSTATE_SCAN_FILES Fix with non-gplv3 and World fixes Saul Wold
                   ` (3 preceding siblings ...)
  2011-12-15  1:50 ` [PATCH 4/7] icu: Add Makefile.inc to SSTATE_SCAN_FILES Saul Wold
@ 2011-12-15  1:50 ` Saul Wold
  2011-12-15  1:50 ` [PATCH 6/7] libtool-cross: Add libtool & libtoolize " Saul Wold
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 16+ messages in thread
From: Saul Wold @ 2011-12-15  1:50 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-support/gmp/gmp.inc      |    2 ++
 meta/recipes-support/gmp/gmp_4.2.1.bb |    2 +-
 meta/recipes-support/gmp/gmp_5.0.2.bb |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/gmp/gmp.inc b/meta/recipes-support/gmp/gmp.inc
index 5ba118d..789d6d0 100644
--- a/meta/recipes-support/gmp/gmp.inc
+++ b/meta/recipes-support/gmp/gmp.inc
@@ -19,3 +19,5 @@ EXTRA_OECONF += " --enable-cxx=detect"
 
 PACKAGES =+ "libgmpxx"
 FILES_libgmpxx = "${libdir}/libgmpxx${SOLIBS}"
+
+SSTATE_SCAN_FILES += "gmp.h"
diff --git a/meta/recipes-support/gmp/gmp_4.2.1.bb b/meta/recipes-support/gmp/gmp_4.2.1.bb
index 5f3929f..280b1ab 100644
--- a/meta/recipes-support/gmp/gmp_4.2.1.bb
+++ b/meta/recipes-support/gmp/gmp_4.2.1.bb
@@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a \
                     file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \
                     file://gmp-h.in;startline=6;endline=21;md5=5e25ffd16996faba8c1cd27b04b16099"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/gmp/${BP}.tar.bz2 \
            file://disable-stdc.patch"
diff --git a/meta/recipes-support/gmp/gmp_5.0.2.bb b/meta/recipes-support/gmp/gmp_5.0.2.bb
index c28e745..d39e500 100644
--- a/meta/recipes-support/gmp/gmp_5.0.2.bb
+++ b/meta/recipes-support/gmp/gmp_5.0.2.bb
@@ -2,7 +2,7 @@ require gmp.inc
 LICENSE="LGPLv3&GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
 		    file://version.c;endline=18;md5=d8c56b52b9092346b9f93b4da65ef790"
-PR = "r3"
+PR = "r4"
 
 SRC_URI_append += "file://sh4-asmfix.patch \
                    file://gmp_bugfix.patch \
-- 
1.7.6.4




^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [PATCH 6/7] libtool-cross: Add libtool & libtoolize to SSTATE_SCAN_FILES
  2011-12-15  1:50 [PATCH 0/7] SSTATE_SCAN_FILES Fix with non-gplv3 and World fixes Saul Wold
                   ` (4 preceding siblings ...)
  2011-12-15  1:50 ` [PATCH 5/7] gmp: Add gmp.h " Saul Wold
@ 2011-12-15  1:50 ` Saul Wold
  2011-12-15  1:50 ` [PATCH 7/7] perl: add .pl, pm, pod, sh files to SSTATE_SCANE_FILES Saul Wold
  2011-12-15 14:46 ` [PATCH 0/7] SSTATE_SCAN_FILES Fix with non-gplv3 and World fixes Richard Purdie
  7 siblings, 0 replies; 16+ messages in thread
From: Saul Wold @ 2011-12-15  1:50 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../libtool/libtool-cross_2.4.2.bb                 |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb b/meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb
index 5003c9b..97794a6 100644
--- a/meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb
+++ b/meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb
@@ -1,6 +1,6 @@
 require libtool-${PV}.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 PACKAGES = ""
 SRC_URI += "file://prefix.patch"
 SRC_URI += "file://fixinstall.patch"
@@ -34,3 +34,5 @@ libtoolcross_sysroot_preprocess () {
 	sysroot_stage_dir ${D}${bindir_crossscripts} ${SYSROOT_DESTDIR}${bindir_crossscripts}
 	sysroot_stage_dir ${D}${target_datadir} ${SYSROOT_DESTDIR}${target_datadir}
 }
+
+SSTATE_SCAN_FILES += "libtoolize *-libtool"
-- 
1.7.6.4




^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [PATCH 7/7] perl: add .pl, pm, pod, sh files to SSTATE_SCANE_FILES
  2011-12-15  1:50 [PATCH 0/7] SSTATE_SCAN_FILES Fix with non-gplv3 and World fixes Saul Wold
                   ` (5 preceding siblings ...)
  2011-12-15  1:50 ` [PATCH 6/7] libtool-cross: Add libtool & libtoolize " Saul Wold
@ 2011-12-15  1:50 ` Saul Wold
  2011-12-15 10:26   ` Phil Blundell
  2011-12-15 14:46 ` [PATCH 0/7] SSTATE_SCAN_FILES Fix with non-gplv3 and World fixes Richard Purdie
  7 siblings, 1 reply; 16+ messages in thread
From: Saul Wold @ 2011-12-15  1:50 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-devtools/perl/perl_5.14.2.bb |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb
index 5efe249..0abefe4 100644
--- a/meta/recipes-devtools/perl/perl_5.14.2.bb
+++ b/meta/recipes-devtools/perl/perl_5.14.2.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
 # We need gnugrep (for -I)
 DEPENDS = "virtual/db grep-native"
 DEPENDS += "gdbm zlib"
-PR = "r1"
+PR = "r2"
 
 # 5.10.1 has Module::Build built-in
 PROVIDES += "libmodule-build-perl"
@@ -302,3 +302,6 @@ RPROVIDES_perl-lib = "perl-lib"
 require perl-rdepends_${PV}.inc
 require perl-rprovides.inc
 require perl-rprovides_${PV}.inc
+
+SSTATE_SCAN_FILES += "*.pm *.pod *.h *.pl *.sh"
+
-- 
1.7.6.4




^ permalink raw reply related	[flat|nested] 16+ messages in thread

* Re: [PATCH 2/7] ed: Fix EXTRA_OECONF to ensure right compiler is found
  2011-12-15  1:50 ` [PATCH 2/7] ed: Fix EXTRA_OECONF to ensure right compiler is found Saul Wold
@ 2011-12-15  6:56   ` Khem Raj
  2011-12-15  8:37     ` Saul Wold
  0 siblings, 1 reply; 16+ messages in thread
From: Khem Raj @ 2011-12-15  6:56 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer

On Wed, Dec 14, 2011 at 5:50 PM, Saul Wold <sgw@linux.intel.com> wrote:
>
> +EXTRA_OECONF = "'CC=${CC}' 'CXX=${CXX}' 'CFLAGS=${CFLAGS}' 'CXXFLAGS=${CXXFLAGS}' 'CPPFLAGS=${CPPFLAGS}' 'LDFLAGS=${LDFLAGS}'"
> +

hmm why doesnt it pick it from environment in configure ?



^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH 2/7] ed: Fix EXTRA_OECONF to ensure right compiler is found
  2011-12-15  6:56   ` Khem Raj
@ 2011-12-15  8:37     ` Saul Wold
  2011-12-15 19:23       ` Saul Wold
  0 siblings, 1 reply; 16+ messages in thread
From: Saul Wold @ 2011-12-15  8:37 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer

On 12/14/2011 10:56 PM, Khem Raj wrote:
> On Wed, Dec 14, 2011 at 5:50 PM, Saul Wold<sgw@linux.intel.com>  wrote:
>>
>> +EXTRA_OECONF = "'CC=${CC}' 'CXX=${CXX}' 'CFLAGS=${CFLAGS}' 'CXXFLAGS=${CXXFLAGS}' 'CPPFLAGS=${CPPFLAGS}' 'LDFLAGS=${LDFLAGS}'"
>> +
>
> hmm why doesnt it pick it from environment in configure ?
>
That's a really good question!  But it does not seem to, when I do the 
build with non-gplv3, it gets CC=/usr/bin/gcc!  So clearly it's not 
getting the environment, otherwise I would not have made this patch.

This is an old-school configure script.

Sau!

> _______________________________________________
> 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: [PATCH 3/7] sstate: Add SSTATE_SCAN_FILES
  2011-12-15  1:50 ` [PATCH 3/7] sstate: Add SSTATE_SCAN_FILES Saul Wold
@ 2011-12-15  8:38   ` Saul Wold
  2011-12-15 11:12   ` Richard Purdie
  1 sibling, 0 replies; 16+ messages in thread
From: Saul Wold @ 2011-12-15  8:38 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer

On 12/14/2011 05:50 PM, Saul Wold wrote:
> This allows recipes to specify files that may be outside the normal set
> for inclusion when there are hardcoded paths that need to be fixmepathed
> to work correctly.
>
> Signed-off-by: Saul Wold<sgw@linux.intel.com>
> ---
>   meta/classes/sstate.bbclass |   11 ++++++++++-
>   1 files changed, 10 insertions(+), 1 deletions(-)
>
> diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
> index 504b099..5452a43 100644
> --- a/meta/classes/sstate.bbclass
> +++ b/meta/classes/sstate.bbclass
> @@ -10,7 +10,8 @@ SSTATE_PKGSPEC    = "sstate-${PN}-${PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}-$
>   SSTATE_PKGNAME    = "${SSTATE_PKGSPEC}${BB_TASKHASH}"
>   SSTATE_PKG        = "${SSTATE_DIR}/${SSTATE_PKGNAME}"
>
> -SSTATE_SCAN_CMD ?= "find ${SSTATE_BUILDDIR} \( -name "*.la" -o -name "*-config" \) -type f"
> +SSTATE_SCAN_FILES ?= "*.la *-config"
> +SSTATE_SCAN_CMD ?= "find ${SSTATE_BUILDDIR} \( ${SSTATE_FIND_CMD_FILES} \) -type f"
>
>   BB_HASHFILENAME = "${SSTATE_PKGNAME}"
>
> @@ -33,6 +34,13 @@ python () {
>       else:
>           d.setVar('SSTATE_MANMACH', bb.data.expand("${MACHINE}", d))
>
> +    find_cmd_files = ""
> +    for file in d.getVar('SSTATE_SCAN_FILES', True).split():
> +        find_file = "-o -name \"" + file + "\""
> +        find_cmd_files = find_cmd_files + " " + find_file
> +    d.setVar('SSTATE_FIND_CMD_FILES', find_cmd_files.replace("-o ", "", 1))
> +    bb.note("FIND_CMD_FILES = %s" % find_cmd_files)
> +
Just realized I left some debugging stuff here and below, this is fixed 
in the bracnh
>       # These classes encode staging paths into their scripts data so can only be
>       # reused if we manipulate the paths
>       if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('sdk', d) or bb.data.inherits_class('crosssdk', d):
> @@ -299,6 +307,7 @@ def sstate_hardcode_path(d):
>   	# Need to remove hardcoded paths and fix these when we install the
>   	# staging packages.
>   	sstate_scan_cmd = d.getVar('SSTATE_SCAN_CMD', True)
> +        bb.note("SCAN_CMD = %s" % sstate_scan_cmd)
Bad Sau! left debugging!

Sau!

>   	p = os.popen("%s" % sstate_scan_cmd)
>   	file_list = p.read()
>



^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH 7/7] perl: add .pl, pm, pod, sh files to SSTATE_SCANE_FILES
  2011-12-15  1:50 ` [PATCH 7/7] perl: add .pl, pm, pod, sh files to SSTATE_SCANE_FILES Saul Wold
@ 2011-12-15 10:26   ` Phil Blundell
  2011-12-15 11:14     ` Richard Purdie
  0 siblings, 1 reply; 16+ messages in thread
From: Phil Blundell @ 2011-12-15 10:26 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer

On Wed, 2011-12-14 at 17:50 -0800, Saul Wold wrote:
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  meta/recipes-devtools/perl/perl_5.14.2.bb |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)

This commit message is very terse.  What is SSTATE_SCAN[E]_FILES and why
do we want these things in it?

> +SSTATE_SCAN_FILES += "*.pm *.pod *.h *.pl *.sh"

p.






^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH 3/7] sstate: Add SSTATE_SCAN_FILES
  2011-12-15  1:50 ` [PATCH 3/7] sstate: Add SSTATE_SCAN_FILES Saul Wold
  2011-12-15  8:38   ` Saul Wold
@ 2011-12-15 11:12   ` Richard Purdie
  1 sibling, 0 replies; 16+ messages in thread
From: Richard Purdie @ 2011-12-15 11:12 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer

On Wed, 2011-12-14 at 17:50 -0800, Saul Wold wrote:
> This allows recipes to specify files that may be outside the normal set
> for inclusion when there are hardcoded paths that need to be fixmepathed
> to work correctly.
> 
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  meta/classes/sstate.bbclass |   11 ++++++++++-
>  1 files changed, 10 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
> index 504b099..5452a43 100644
> --- a/meta/classes/sstate.bbclass
> +++ b/meta/classes/sstate.bbclass
> @@ -10,7 +10,8 @@ SSTATE_PKGSPEC    = "sstate-${PN}-${PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}-$
>  SSTATE_PKGNAME    = "${SSTATE_PKGSPEC}${BB_TASKHASH}"
>  SSTATE_PKG        = "${SSTATE_DIR}/${SSTATE_PKGNAME}"
>  
> -SSTATE_SCAN_CMD ?= "find ${SSTATE_BUILDDIR} \( -name "*.la" -o -name "*-config" \) -type f"
> +SSTATE_SCAN_FILES ?= "*.la *-config"
> +SSTATE_SCAN_CMD ?= "find ${SSTATE_BUILDDIR} \( ${SSTATE_FIND_CMD_FILES} \) -type f"
>  
>  BB_HASHFILENAME = "${SSTATE_PKGNAME}"
>  
> @@ -33,6 +34,13 @@ python () {
>      else:
>          d.setVar('SSTATE_MANMACH', bb.data.expand("${MACHINE}", d))
>  
> +    find_cmd_files = ""
> +    for file in d.getVar('SSTATE_SCAN_FILES', True).split():
> +        find_file = "-o -name \"" + file + "\""
> +        find_cmd_files = find_cmd_files + " " + find_file
> +    d.setVar('SSTATE_FIND_CMD_FILES', find_cmd_files.replace("-o ", "", 1))
> +    bb.note("FIND_CMD_FILES = %s" % find_cmd_files)
> +
>      # These classes encode staging paths into their scripts data so can only be
>      # reused if we manipulate the paths
>      if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('sdk', d) or bb.data.inherits_class('crosssdk', d):

We could just do:

SSTATE_SCAN_CMD ?= 'find ${SSTATE_BUILDDIR} \( -name "${@"\" -o -name \"".join(d.getVar("SSTATE_SCAN_FILES", True).split())}" \) -type f'

which would save some of the anonymous python overhead and the temporary
variable.

Cheers,

Richard





^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH 7/7] perl: add .pl, pm, pod, sh files to SSTATE_SCANE_FILES
  2011-12-15 10:26   ` Phil Blundell
@ 2011-12-15 11:14     ` Richard Purdie
  0 siblings, 0 replies; 16+ messages in thread
From: Richard Purdie @ 2011-12-15 11:14 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer

On Thu, 2011-12-15 at 10:26 +0000, Phil Blundell wrote:
> On Wed, 2011-12-14 at 17:50 -0800, Saul Wold wrote:
> > Signed-off-by: Saul Wold <sgw@linux.intel.com>
> > ---
> >  meta/recipes-devtools/perl/perl_5.14.2.bb |    5 ++++-
> >  1 files changed, 4 insertions(+), 1 deletions(-)
> 
> This commit message is very terse.  What is SSTATE_SCAN[E]_FILES and why
> do we want these things in it?

This is basically some hints to the sstate code about which files need
relocation mangling. We process all files for the native/cross cases but
in the target case it's only been .la and binconfig files we've
processed.

An earlier patch is adding in a mechanism to extend this list and this
is adding in some problematic files for the perl case. We've been seeing
sstate failures from issues like this.

I agree this probably needs a little more explanation in the commit
message.

Cheers,

Richard




^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH 0/7] SSTATE_SCAN_FILES Fix with non-gplv3 and World fixes
  2011-12-15  1:50 [PATCH 0/7] SSTATE_SCAN_FILES Fix with non-gplv3 and World fixes Saul Wold
                   ` (6 preceding siblings ...)
  2011-12-15  1:50 ` [PATCH 7/7] perl: add .pl, pm, pod, sh files to SSTATE_SCANE_FILES Saul Wold
@ 2011-12-15 14:46 ` Richard Purdie
  7 siblings, 0 replies; 16+ messages in thread
From: Richard Purdie @ 2011-12-15 14:46 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer

On Wed, 2011-12-14 at 17:50 -0800, Saul Wold wrote:
> Richard,
> 
> This patch contains a couple of fixes for world and non-gplv3 along
> with the sstate fix for ensure we mangle (or "fixmepath") files that
> do not fall into the standard set.
> 
> SSTATE_SCAN_FILES is defaulted to "*.la and *-configs", recipes can
> append to it with SSTATE_SCAN_FILES += "<filename>".
> 
> 
> The following changes since commit b9dfccc018f32a47fc045f35d5f53d7269d791ed:
> 
>   gdk-pixbuf: Ensure the binaries can be relocated (2011-12-13 18:00:18 +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 (7):
>   qt-mobility: Fix QA error for debug files

Missing PR bump

>   ed: Fix EXTRA_OECONF to ensure right compiler is found

This has a question. I think the answer is that it doesn't use real
autoconf and had special issues of its own. I haven't checked yet though
so I've left this patch as queued.

>   sstate: Add SSTATE_SCAN_FILES

I've updated the above patch with some better syntax I came up with.

>   icu: Add Makefile.inc to SSTATE_SCAN_FILES
>   gmp: Add gmp.h to SSTATE_SCAN_FILES
>   libtool-cross: Add libtool & libtoolize to SSTATE_SCAN_FILES
>   perl: add .pl, pm, pod, sh files to SSTATE_SCANE_FILES

These are fine but needed better commit descriptions.

I made the above tweaks and merged these along with some of the other
commits batched up in MUT (already been on the list for a while). The
MUT build on the autobuilder was not in a good state due to the directfb
change. I've therefore selectively pulled in pieces of MUT into master
and restarted a test against master.

Cheers,

Richard




^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH 2/7] ed: Fix EXTRA_OECONF to ensure right compiler is found
  2011-12-15  8:37     ` Saul Wold
@ 2011-12-15 19:23       ` Saul Wold
  0 siblings, 0 replies; 16+ messages in thread
From: Saul Wold @ 2011-12-15 19:23 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer

On 12/15/2011 12:37 AM, Saul Wold wrote:
> On 12/14/2011 10:56 PM, Khem Raj wrote:
>> On Wed, Dec 14, 2011 at 5:50 PM, Saul Wold<sgw@linux.intel.com> wrote:
>>>
>>> +EXTRA_OECONF = "'CC=${CC}' 'CXX=${CXX}' 'CFLAGS=${CFLAGS}'
>>> 'CXXFLAGS=${CXXFLAGS}' 'CPPFLAGS=${CPPFLAGS}' 'LDFLAGS=${LDFLAGS}'"
>>> +
>>
>> hmm why doesnt it pick it from environment in configure ?
>>
> That's a really good question! But it does not seem to, when I do the
> build with non-gplv3, it gets CC=/usr/bin/gcc! So clearly it's not
> getting the environment, otherwise I would not have made this patch.
>
> This is an old-school configure script.
>
Just a further explanation of this comment, the configure script in ed 
is a very old script, not autotools based at all.  It hard codes the 
CC="" in the script so the environment is not picked up correct, but it 
does read those properly from the command line.

Sau!

> Sau!
>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>>
>
> _______________________________________________
> 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

end of thread, other threads:[~2011-12-15 19:30 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-12-15  1:50 [PATCH 0/7] SSTATE_SCAN_FILES Fix with non-gplv3 and World fixes Saul Wold
2011-12-15  1:50 ` [PATCH 1/7] qt-mobility: Fix QA error for debug files Saul Wold
2011-12-15  1:50 ` [PATCH 2/7] ed: Fix EXTRA_OECONF to ensure right compiler is found Saul Wold
2011-12-15  6:56   ` Khem Raj
2011-12-15  8:37     ` Saul Wold
2011-12-15 19:23       ` Saul Wold
2011-12-15  1:50 ` [PATCH 3/7] sstate: Add SSTATE_SCAN_FILES Saul Wold
2011-12-15  8:38   ` Saul Wold
2011-12-15 11:12   ` Richard Purdie
2011-12-15  1:50 ` [PATCH 4/7] icu: Add Makefile.inc to SSTATE_SCAN_FILES Saul Wold
2011-12-15  1:50 ` [PATCH 5/7] gmp: Add gmp.h " Saul Wold
2011-12-15  1:50 ` [PATCH 6/7] libtool-cross: Add libtool & libtoolize " Saul Wold
2011-12-15  1:50 ` [PATCH 7/7] perl: add .pl, pm, pod, sh files to SSTATE_SCANE_FILES Saul Wold
2011-12-15 10:26   ` Phil Blundell
2011-12-15 11:14     ` Richard Purdie
2011-12-15 14:46 ` [PATCH 0/7] SSTATE_SCAN_FILES Fix with non-gplv3 and World fixes 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.