All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/7] Pending patches - added even more patches
@ 2012-02-24 17:06 Martin Jansa
  2012-02-24 17:06 ` [PATCH 5/7] sstate.bbclass: improve performance of sstate package creation Martin Jansa
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Martin Jansa @ 2012-02-24 17:06 UTC (permalink / raw)
  To: openembedded-core

First 4 are the same, not resent (will try RP's suggestion for STAGING_DIR* variables first)

sstate.bbclass: improve performance of sstate package creation - updated ' position
shadow-sysroot: disable package creation - new patch discussed on #yocto
gst-plugin-bluetooth: upgrade to 4.98 and add checksums - old one was missing SRC_URI 
  checksums so was failing to build

The following changes since commit d3de5f7308b4a42b809884119a670af5bedde38f:

  psplash: allow building multiple splash executables (2012-02-24 16:44:37 +0000)

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

Eric BENARD (1):
  gdb-cross-canadian: build gdb with python support

Martin Jansa (6):
  bitbake.conf: use weak assignment for BB_CONSOLELOG
  bitbake.conf: introduce SDK_NAME_PREFIX and NATIVESDK_* variables
  gdb-cross-canadian: use NATIVESDK paths as it happens to be here
  sstate.bbclass: improve performance of sstate package creation
  shadow-sysroot: disable package creation
  gst-plugin-bluetooth: upgrade to 4.98 and add checksums

 meta/classes/sstate.bbclass                        |   39 ++++++++------------
 meta/conf/bitbake.conf                             |   16 +++++++-
 ...etooth_4.96.bb => gst-plugin-bluetooth_4.98.bb} |    3 +-
 meta/recipes-devtools/gdb/gdb-cross-canadian.inc   |   23 +++++++++++-
 .../recipes-devtools/gdb/gdb-cross-canadian_7.4.bb |    2 +-
 .../shadow/shadow-sysroot_4.1.4.3.bb               |    7 +++-
 6 files changed, 61 insertions(+), 29 deletions(-)
 rename meta/recipes-connectivity/bluez/{gst-plugin-bluetooth_4.96.bb => gst-plugin-bluetooth_4.98.bb} (77%)

-- 
1.7.8.4




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

* [PATCH 5/7] sstate.bbclass: improve performance of sstate package creation
  2012-02-24 17:06 [PATCH 0/7] Pending patches - added even more patches Martin Jansa
@ 2012-02-24 17:06 ` Martin Jansa
  2012-02-24 17:06 ` [PATCH 6/7] shadow-sysroot: disable " Martin Jansa
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Martin Jansa @ 2012-02-24 17:06 UTC (permalink / raw)
  To: openembedded-core

* also fixes replacing paths for perl where cmd line was probably
  too long for os.system(cmd) (it had 560410 characters because a lot of
  files from sstate_scan_cmd).
* also print those 2 commands so we can find them in log.do_package

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/classes/sstate.bbclass |   39 ++++++++++++++++-----------------------
 1 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index ee9bf05..d20b62a 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -304,38 +304,31 @@ python sstate_cleanall() {
 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)
-	p = os.popen("%s" % sstate_scan_cmd)
-	file_list = p.read()
-
-	if file_list == "":
-		p.close()
-		return
 
 	staging = d.getVar('STAGING_DIR', True)
 	staging_target = d.getVar('STAGING_DIR_TARGET', True)
 	staging_host = d.getVar('STAGING_DIR_HOST', True)
 	sstate_builddir = d.getVar('SSTATE_BUILDDIR', True)
 
-	files = " ".join(file_list.split('\n'))
-
 	if bb.data.inherits_class('native', d) or bb.data.inherits_class('nativesdk', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('cross-canadian', d):
-		cmd = "sed -i -e s:%s:FIXMESTAGINGDIR:g %s" % (staging, files)
+		sstate_sed_cmd = "sed -i -e 's:%s:FIXMESTAGINGDIR:g'" % (staging)
 	elif bb.data.inherits_class('cross', d):
-		cmd = "sed -i -e s:%s:FIXMESTAGINGDIRTARGET:g %s \
-			sed -i -e s:%s:FIXMESTAGINGDIR:g %s" % (staging_target, files, staging, files)
+		sstate_sed_cmd = "sed -i -e 's:%s:FIXMESTAGINGDIRTARGET:g; s:%s:FIXMESTAGINGDIR:g'" % (staging_target, staging)
 	else:
-		cmd = "sed -i -e s:%s:FIXMESTAGINGDIRHOST:g %s" % (staging_host, files)
-
-	if files:
-		os.system(cmd)
-		fix = open("%sfixmepath" % (sstate_builddir), "w")
-		fixme = []
-		for f in file_list.split('\n'):
-			fixme.append(f.replace(sstate_builddir, ""))
-		fix.write("\n".join(fixme))
-		fix.close()
-	p.close()
+		sstate_sed_cmd = "sed -i -e 's:%s:FIXMESTAGINGDIRHOST:g'" % (staging_host)
+	
+	sstate_scan_cmd = d.getVar('SSTATE_SCAN_CMD', True)
+	sstate_filelist_cmd = "tee %sfixmepath" % (sstate_builddir)
+
+	# fixmepath file needs relative paths, drop sstate_builddir prefix
+	sstate_filelist_relative_cmd = "sed -i -e 's:^%s::g' %sfixmepath" % (sstate_builddir, sstate_builddir)
+
+	sstate_hardcode_cmd = "%s | %s | xargs %s" % (sstate_scan_cmd, sstate_filelist_cmd, sstate_sed_cmd)
+
+	print "Removing hardcoded paths from sstate package: '%s'" % (sstate_hardcode_cmd)
+	os.system(sstate_hardcode_cmd)
+	print "Replacing absolute paths in fixmepath file: '%s'" % (sstate_filelist_relative_cmd)
+	os.system(sstate_filelist_relative_cmd)
 
 def sstate_package(ss, d):
     import oe.path
-- 
1.7.8.4




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

* [PATCH 6/7] shadow-sysroot: disable package creation
  2012-02-24 17:06 [PATCH 0/7] Pending patches - added even more patches Martin Jansa
  2012-02-24 17:06 ` [PATCH 5/7] sstate.bbclass: improve performance of sstate package creation Martin Jansa
@ 2012-02-24 17:06 ` Martin Jansa
  2012-02-24 17:06 ` [PATCH 7/7] gst-plugin-bluetooth: upgrade to 4.98 and add checksums Martin Jansa
  2012-02-24 18:24 ` [PATCH 0/7] Pending patches - added even more patches Saul Wold
  3 siblings, 0 replies; 5+ messages in thread
From: Martin Jansa @ 2012-02-24 17:06 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../shadow/shadow-sysroot_4.1.4.3.bb               |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-extended/shadow/shadow-sysroot_4.1.4.3.bb b/meta/recipes-extended/shadow/shadow-sysroot_4.1.4.3.bb
index fbffb84..1fb6c56 100644
--- a/meta/recipes-extended/shadow/shadow-sysroot_4.1.4.3.bb
+++ b/meta/recipes-extended/shadow/shadow-sysroot_4.1.4.3.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://login.defs_shadow-sysroot;md5=25e2f2de4dfc8f966ac5cdf
 
 DEPENDS = "base-passwd"
 
-PR = "r1"
+PR = "r2"
 
 # The sole purpose of this recipe is to provide the /etc/login.defs
 # file for the target sysroot - needed so the shadow-native utilities
@@ -28,3 +28,8 @@ do_install() {
 sysroot_stage_all() {
 	sysroot_stage_dir ${D} ${SYSROOT_DESTDIR}
 }
+
+# don't create any packages
+# otherwise: dbus-dev depends on shadow-sysroot-dev which depends on shadow-sysroot 
+# and this has another copy of /etc/login.defs already provided by shadow
+PACKAGES = ""
-- 
1.7.8.4




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

* [PATCH 7/7] gst-plugin-bluetooth: upgrade to 4.98 and add checksums
  2012-02-24 17:06 [PATCH 0/7] Pending patches - added even more patches Martin Jansa
  2012-02-24 17:06 ` [PATCH 5/7] sstate.bbclass: improve performance of sstate package creation Martin Jansa
  2012-02-24 17:06 ` [PATCH 6/7] shadow-sysroot: disable " Martin Jansa
@ 2012-02-24 17:06 ` Martin Jansa
  2012-02-24 18:24 ` [PATCH 0/7] Pending patches - added even more patches Saul Wold
  3 siblings, 0 replies; 5+ messages in thread
From: Martin Jansa @ 2012-02-24 17:06 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 ...etooth_4.96.bb => gst-plugin-bluetooth_4.98.bb} |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
 rename meta/recipes-connectivity/bluez/{gst-plugin-bluetooth_4.96.bb => gst-plugin-bluetooth_4.98.bb} (77%)

diff --git a/meta/recipes-connectivity/bluez/gst-plugin-bluetooth_4.96.bb b/meta/recipes-connectivity/bluez/gst-plugin-bluetooth_4.98.bb
similarity index 77%
rename from meta/recipes-connectivity/bluez/gst-plugin-bluetooth_4.96.bb
rename to meta/recipes-connectivity/bluez/gst-plugin-bluetooth_4.98.bb
index d60827a..fa74d34 100644
--- a/meta/recipes-connectivity/bluez/gst-plugin-bluetooth_4.96.bb
+++ b/meta/recipes-connectivity/bluez/gst-plugin-bluetooth_4.98.bb
@@ -1,7 +1,8 @@
 require bluez4.inc
 require recipes-multimedia/gstreamer/gst-plugins-package.inc
 
-PR = "r1"
+SRC_URI[md5sum] = "362864b716950baa04797de735fc237b"
+SRC_URI[sha256sum] = "9a5b655bada7c7a1921cb3bac83b8a32bbe49893e4c7a1377cdc1b0d35f7d233"
 
 DEPENDS = "bluez4 gst-plugins-base"
 
-- 
1.7.8.4




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

* Re: [PATCH 0/7] Pending patches - added even more patches
  2012-02-24 17:06 [PATCH 0/7] Pending patches - added even more patches Martin Jansa
                   ` (2 preceding siblings ...)
  2012-02-24 17:06 ` [PATCH 7/7] gst-plugin-bluetooth: upgrade to 4.98 and add checksums Martin Jansa
@ 2012-02-24 18:24 ` Saul Wold
  3 siblings, 0 replies; 5+ messages in thread
From: Saul Wold @ 2012-02-24 18:24 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa

On 02/24/2012 09:06 AM, Martin Jansa wrote:
> First 4 are the same, not resent (will try RP's suggestion for STAGING_DIR* variables first)
>
> sstate.bbclass: improve performance of sstate package creation - updated ' position
> shadow-sysroot: disable package creation - new patch discussed on #yocto
> gst-plugin-bluetooth: upgrade to 4.98 and add checksums - old one was missing SRC_URI
>    checksums so was failing to build
>
> The following changes since commit d3de5f7308b4a42b809884119a670af5bedde38f:
>
>    psplash: allow building multiple splash executables (2012-02-24 16:44:37 +0000)
>
> are available in the git repository at:
>    git://git.openembedded.org/openembedded-core-contrib jansa/pull
>    http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull
>
> Eric BENARD (1):
>    gdb-cross-canadian: build gdb with python support
>
> Martin Jansa (6):
>    bitbake.conf: use weak assignment for BB_CONSOLELOG
>    bitbake.conf: introduce SDK_NAME_PREFIX and NATIVESDK_* variables
>    gdb-cross-canadian: use NATIVESDK paths as it happens to be here
>    sstate.bbclass: improve performance of sstate package creation
>    shadow-sysroot: disable package creation
>    gst-plugin-bluetooth: upgrade to 4.98 and add checksums
>
These last three have been merged into OE-core

Thanks
	Sau!


>   meta/classes/sstate.bbclass                        |   39 ++++++++------------
>   meta/conf/bitbake.conf                             |   16 +++++++-
>   ...etooth_4.96.bb =>  gst-plugin-bluetooth_4.98.bb} |    3 +-
>   meta/recipes-devtools/gdb/gdb-cross-canadian.inc   |   23 +++++++++++-
>   .../recipes-devtools/gdb/gdb-cross-canadian_7.4.bb |    2 +-
>   .../shadow/shadow-sysroot_4.1.4.3.bb               |    7 +++-
>   6 files changed, 61 insertions(+), 29 deletions(-)
>   rename meta/recipes-connectivity/bluez/{gst-plugin-bluetooth_4.96.bb =>  gst-plugin-bluetooth_4.98.bb} (77%)
>



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

end of thread, other threads:[~2012-02-24 18:33 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-24 17:06 [PATCH 0/7] Pending patches - added even more patches Martin Jansa
2012-02-24 17:06 ` [PATCH 5/7] sstate.bbclass: improve performance of sstate package creation Martin Jansa
2012-02-24 17:06 ` [PATCH 6/7] shadow-sysroot: disable " Martin Jansa
2012-02-24 17:06 ` [PATCH 7/7] gst-plugin-bluetooth: upgrade to 4.98 and add checksums Martin Jansa
2012-02-24 18:24 ` [PATCH 0/7] Pending patches - added even more patches Saul Wold

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.