[oe-commits] org.oe.dev merge of '7830f5e90162b4508a3948a7473f7d5ce3323e61'

[pfalcon commit]

merge of '7830f5e90162b4508a3948a7473f7d5ce3323e61'
     and 'e8d47d4912ea1a12367d5e883eed7934351adda2'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 35986a7295900068759ed5a0148b77d46c088c66
ViewMTN: http://monotone.openembedded.org/revision/info/35986a7295900068759ed5a0148b77d46c088c66
Files:
1
packages/spandsp/spandsp_0.0.3.bb
classes/package.bbclass
conf/documentation.conf
packages/tasks/task-devimage.bb
Diffs:

#
# mt diff -r7830f5e90162b4508a3948a7473f7d5ce3323e61 -r35986a7295900068759ed5a0148b77d46c088c66
#
# 
# 
# patch "packages/spandsp/spandsp_0.0.3.bb"
#  from [1d5a36b9e734be02557707c1ed2a60c5e03db3e6]
#    to [9b248bfa60d8847873395df1ae5b309eecaaf91f]
# 
============================================================
--- packages/spandsp/spandsp_0.0.3.bb	1d5a36b9e734be02557707c1ed2a60c5e03db3e6
+++ packages/spandsp/spandsp_0.0.3.bb	9b248bfa60d8847873395df1ae5b309eecaaf91f
@@ -1,13 +1,11 @@ HOMEPAGE = "http://www.soft-switch.org"
 DESCRIPTION = "A library of many DSP functions for telephony."
 HOMEPAGE = "http://www.soft-switch.org"
-DEPENDS = "tiff libxml2"
 SECTION = "voip"
 LICENSE = "GPL"
-PV = "0.0.3"
-PSUBV = "pre27"
-PR = "r0"
+DEPENDS = "tiff libxml2"
+PR = "r1"
 
-SRC_URI = "http://www.soft-switch.org/downloads/snapshots/spandsp/spandsp-20070123.tar.gz"
+SRC_URI = "http://www.soft-switch.org/downloads/spandsp/spandsp-${PV}.tgz"
 
 inherit autotools
 


#
# mt diff -re8d47d4912ea1a12367d5e883eed7934351adda2 -r35986a7295900068759ed5a0148b77d46c088c66
#
# 
# 
# patch "classes/package.bbclass"
#  from [64623cb5ec9aca92b3faacf2075e146fcce623d9]
#    to [540a6836514d7f26b1ef8be9ce1d15f0396f6e29]
# 
# patch "conf/documentation.conf"
#  from [39b05416fe91d4b5812b04d933b9da47d2659c73]
#    to [bdfe2a042dd570980cb40a9e27a56cb7e06f2a57]
# 
# patch "packages/tasks/task-devimage.bb"
#  from [63338e74dabf0db1286b9ec7c451d8c5d74f36bd]
#    to [c195fca95cba58010289c012a9ea93f27f2db4dd]
# 
============================================================
--- classes/package.bbclass	64623cb5ec9aca92b3faacf2075e146fcce623d9
+++ classes/package.bbclass	540a6836514d7f26b1ef8be9ce1d15f0396f6e29
@@ -694,6 +694,16 @@ python package_do_shlibs() {
 				for l in lines:
 					shlib_provider[l.rstrip()] = (dep_pkg, lib_ver)
 
+	assumed_libs = bb.data.getVar('ASSUME_SHLIBS', d, 1)
+	if assumed_libs:
+	    for e in assumed_libs.split():
+		l, dep_pkg = e.split(":")
+		lib_ver = None
+		dep_pkg = dep_pkg.rsplit("_", 1)
+		if len(dep_pkg) == 2:
+		    lib_ver = dep_pkg[1]
+		dep_pkg = dep_pkg[0]
+		shlib_provider[l] = (dep_pkg, lib_ver)
 
 	for pkg in packages.split():
 		bb.debug(2, "calculating shlib requirements for %s" % pkg)
============================================================
--- conf/documentation.conf	39b05416fe91d4b5812b04d933b9da47d2659c73
+++ conf/documentation.conf	bdfe2a042dd570980cb40a9e27a56cb7e06f2a57
@@ -34,6 +34,11 @@ for hardware floating point instructions
 TARGET_FPU[doc] = "Floating point option (mostly for FPU-less systems), can be 'soft' or empty \
 for hardware floating point instructions."
 
+ASSUME_PROVIDED[doc] = "List of packages (recipes actually) which are assumed to be implicitly available.\
+ These packages won't be built by bitbake."
+ASSUME_SHLIBS[doc] = "List of shlib:package[_version] mappings. Useful for lib packages in ASSUME_PROVIDED,\
+ for which automatic shlib dependency tracking doesn't work."
+
 PACKAGE_ARCH[doc] = 'The architecture needed for using a resulting package. If you have \
 machine dependant configuration options in your bitbake file add a \
 PACKAGE_ARCH  = "${MACHINE_ARCH}" to the file.'
============================================================
--- packages/tasks/task-devimage.bb	63338e74dabf0db1286b9ec7c451d8c5d74f36bd
+++ packages/tasks/task-devimage.bb	c195fca95cba58010289c012a9ea93f27f2db4dd
@@ -1,5 +1,5 @@ DESCRIPTION = "Image for development tes
 DESCRIPTION = "Image for development testing"
-PR = "r1"
+PR = "r2"
 LICENSE = "MIT"
 
 inherit task
@@ -14,6 +14,7 @@ RDEPENDS = "\
     module-init-tools pcmciautils \
     wireless-tools wpa-supplicant \
     irda-utils acx-firmware \
+    kexec-tools \
     ${DEVIMAGE_EXTRA_RDEPENDS} \
     "