[oe-commits] org.oe.dev merge of '35986a7295900068759ed5a0148b77d46c088c66'

[pfalcon commit]

merge of '35986a7295900068759ed5a0148b77d46c088c66'
     and '3afbe0b60ab4c00ea448ef08a1d2f4da08be3465'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: e43abb1ba2bcd0f87d46d2c138b2e7f20e06a2fe
ViewMTN: http://monotone.openembedded.org/revision/info/e43abb1ba2bcd0f87d46d2c138b2e7f20e06a2fe
Files:
1
classes/sanity.bbclass
packages/spandsp/spandsp_0.0.3.bb
Diffs:

#
# mt diff -r35986a7295900068759ed5a0148b77d46c088c66 -re43abb1ba2bcd0f87d46d2c138b2e7f20e06a2fe
#
# 
# 
# patch "classes/sanity.bbclass"
#  from [808f5e34043a37c456f2b223aace94f414b22349]
#    to [a81f2a3b9cc1e0daf9c88d6874dd369ef2c660b5]
# 
============================================================
--- classes/sanity.bbclass	808f5e34043a37c456f2b223aace94f414b22349
+++ classes/sanity.bbclass	a81f2a3b9cc1e0daf9c88d6874dd369ef2c660b5
@@ -70,8 +70,9 @@ def check_sanity(e):
 	if "diffstat-native" not in assume_provided:
 		messages = messages + 'Please use ASSUME_PROVIDED +=, not ASSUME_PROVIDED = in your local.conf\n'
 	
-	# Check that the MACHINE is valid
-	if not check_conf_exists("conf/machine/${MACHINE}.conf", e.data):
+	# Check that the MACHINE is valid, if it is set
+	if data.getVar('MACHINE', e.data, True):
+	    if not check_conf_exists("conf/machine/${MACHINE}.conf", e.data):
 		messages = messages + 'Please set a valid MACHINE in your local.conf\n'
 	
 	# Check that the DISTRO is valid


#
# mt diff -r3afbe0b60ab4c00ea448ef08a1d2f4da08be3465 -re43abb1ba2bcd0f87d46d2c138b2e7f20e06a2fe
#
# 
# 
# 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