[oe-commits] org.oe.dev merge of '6a6524b2edba4ee2d273bc4114c24767b9e78a8e'

[pfalcon commit]

merge of '6a6524b2edba4ee2d273bc4114c24767b9e78a8e'
     and 'a936edc2be00c83e35e647a91a0923ea2e0ee3ce'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: d1724dba18ec9c4f91d2e99399c1f1bbc244b62a
ViewMTN: http://monotone.openembedded.org/revision/info/d1724dba18ec9c4f91d2e99399c1f1bbc244b62a
Files:
1
classes/base.bbclass
conf/distro/angstrom-2007.1.conf
contrib/angstrom/build-release.sh
packages/apache2/apache2-native_2.2.3.bb
packages/images/minimal-gpe-image.bb
packages/qmake/qmake2-native_2.10a.bb
packages/spandsp/spandsp_0.0.3.bb
Diffs:

#
# mt diff -r6a6524b2edba4ee2d273bc4114c24767b9e78a8e -rd1724dba18ec9c4f91d2e99399c1f1bbc244b62a
#
# 
# 
# patch "classes/base.bbclass"
#  from [a42a0cea14f8090cf64528a459fa8b5795e36327]
#    to [5efb30de935081fe56703b6432d636a3668d4823]
# 
============================================================
--- classes/base.bbclass	a42a0cea14f8090cf64528a459fa8b5795e36327
+++ classes/base.bbclass	5efb30de935081fe56703b6432d636a3668d4823
@@ -848,6 +848,12 @@ def base_after_parse(d):
     bb.data.delVarFlag('MACHINE', 'export', d)
     bb.data.setVarFlag('MACHINE', 'unexport', 1, d)
     
+    # Make sure TARGET_ARCH isn't exported
+    # (breaks Makefiles using implicit rules, e.g. quilt, as GNU make has this 
+    # in them, undocumented)
+    bb.data.delVarFlag('TARGET_ARCH', 'export', d)
+    bb.data.setVarFlag('TARGET_ARCH', 'unexport', 1, d)
+    
     # Make sure DISTRO isn't exported
     # (breaks sysvinit at least)
     bb.data.delVarFlag('DISTRO', 'export', d)


#
# mt diff -ra936edc2be00c83e35e647a91a0923ea2e0ee3ce -rd1724dba18ec9c4f91d2e99399c1f1bbc244b62a
#
# 
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [3d10520a0111676c1e609a3731b65ea0c93d41e4]
#    to [c9c69c3a8cfe32c296bc6533bfbe7d1245734ef7]
# 
# patch "contrib/angstrom/build-release.sh"
#  from [063085f7fea8b84ad5d548c22c48e61a73e934d2]
#    to [6e9b6db12a381f8be056191a2a70904f430255a4]
# 
# patch "packages/apache2/apache2-native_2.2.3.bb"
#  from [c3cb0bbb21cd4a5129f91f294cc0fa72a617f93f]
#    to [244f75f7866e4b1273b09482f434d6dafa38ca65]
# 
# patch "packages/images/minimal-gpe-image.bb"
#  from [e8665528258e599e44b51e8574508562e66d7af9]
#    to [a0dd38c53ff0c3542cb4fb56d015979b65935ee1]
# 
# patch "packages/qmake/qmake2-native_2.10a.bb"
#  from [4e99113b60782b4965c8f34d69ca62a338f36078]
#    to [d941635b01c58764ba76d411ea57f1b33b4d22eb]
# 
# patch "packages/spandsp/spandsp_0.0.3.bb"
#  from [1d5a36b9e734be02557707c1ed2a60c5e03db3e6]
#    to [9b248bfa60d8847873395df1ae5b309eecaaf91f]
# 
============================================================
--- conf/distro/angstrom-2007.1.conf	3d10520a0111676c1e609a3731b65ea0c93d41e4
+++ conf/distro/angstrom-2007.1.conf	c9c69c3a8cfe32c296bc6533bfbe7d1245734ef7
@@ -6,9 +6,9 @@
 #@MAINTAINER: Michael 'Mickey' Lauer <mickey at Vanille.de>
 #@--------------------------------------------------------------------
 
-#DISTRO_VERSION = "2007.9"
-DISTRO_VERSION = "2007.9-test-${DATE}"
-DISTRO_REVISION = "47"
+# The release will the 2007.12
+DISTRO_VERSION = "2007.11RC1"
+DISTRO_REVISION = "48"
 
 require conf/distro/include/sane-srcdates.inc
 require conf/distro/include/sane-srcrevs.inc
============================================================
--- contrib/angstrom/build-release.sh	063085f7fea8b84ad5d548c22c48e61a73e934d2
+++ contrib/angstrom/build-release.sh	6e9b6db12a381f8be056191a2a70904f430255a4
@@ -69,7 +69,6 @@ do
 do
 	BUILD_MACHINE=$machine
 	BUILD_TARGETS="x11-gpe-image x11-pimlico-image x11-office-image"
-	BUILD_CLEAN="qmake2-native"
 	do_build
 done 
 
@@ -78,7 +77,6 @@ do
 do
 	BUILD_MACHINE=$machine
 	BUILD_TARGETS="minimal-openmoko-image openmoko-image"
-	BUILD_CLEAN="qmake2-native"
 	do_build
 done	
 
@@ -87,7 +85,7 @@ do
 do
         BUILD_MACHINE=$machine
         BUILD_TARGETS="meta-angstrom-2007"
-        do_build
+	do_build
 done
 
 #cross toolchain
============================================================
--- packages/apache2/apache2-native_2.2.3.bb	c3cb0bbb21cd4a5129f91f294cc0fa72a617f93f
+++ packages/apache2/apache2-native_2.2.3.bb	244f75f7866e4b1273b09482f434d6dafa38ca65
@@ -1,9 +1,9 @@ DEPENDS = "expat pcre"
 SECTION = "net"
 DEPENDS = "expat pcre"
 
-inherit  native
+inherit cross 
 
-PR="r5"
+PR="r6"
 SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2"
 
 S = "${WORKDIR}/httpd-${PV}"
============================================================
--- packages/images/minimal-gpe-image.bb	e8665528258e599e44b51e8574508562e66d7af9
+++ packages/images/minimal-gpe-image.bb	a0dd38c53ff0c3542cb4fb56d015979b65935ee1
@@ -6,11 +6,13 @@ export IMAGE_BASENAME = "minimalist-gpe-
 
 export IMAGE_BASENAME = "minimalist-gpe-image"
 
+PR = "r1"
+
 DEPENDS = "task-boot"
 IMAGE_INSTALL = "\
     ${XSERVER} \
     task-boot \
-    gpe-session-scripts gpe-login \
+    gpe-dm gpe-session-scripts gpe-login \
     matchbox-wm \
     angstrom-feed-configs \
     ipkg \
============================================================
--- packages/qmake/qmake2-native_2.10a.bb	4e99113b60782b4965c8f34d69ca62a338f36078
+++ packages/qmake/qmake2-native_2.10a.bb	d941635b01c58764ba76d411ea57f1b33b4d22eb
@@ -1,9 +1,9 @@ LICENSE = "GPL"
 DESCRIPTION = "TrollTech Makefile Generator"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 SECTION = "devel"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 QTVER = "qtopia-core-opensource-src-4.3.2"
 
@@ -15,7 +15,7 @@ CROSS_SYS := "${TARGET_SYS}"
 
 # we need the real target system here
 CROSS_SYS := "${TARGET_SYS}"
-inherit autotools native
+inherit autotools cross 
 
 export QTDIR = "${S}"
 EXTRA_OEMAKE = "-e"
============================================================
--- 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