[oe-commits] org.oe.dev merge of '2d0e7ded96559d4c71de1153762dd0879fa16697'

[oe commit]

merge of '2d0e7ded96559d4c71de1153762dd0879fa16697'
     and '3b0348e0f932d88b5a93caf068cae7af759a6339'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 0c283b255707b9957249bfba5f3b83d97cbe8c32
ViewMTN: http://monotone.openembedded.org/revision/info/0c283b255707b9957249bfba5f3b83d97cbe8c32
Files:
1
conf/distro/include/sane-srcrevs.inc
conf/machine/om-gta01.conf
conf/machine/om-gta02.conf
packages/freesmartphone/gsmd2_git.bb
Diffs:

#
# mt diff -r2d0e7ded96559d4c71de1153762dd0879fa16697 -r0c283b255707b9957249bfba5f3b83d97cbe8c32
#
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [aeccd2cc07a122231cd66b08e8769dba7c271812]
#    to [a6040c27e849359c20c484582c9820647a58683f]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc	aeccd2cc07a122231cd66b08e8769dba7c271812
+++ conf/distro/include/sane-srcrevs.inc	a6040c27e849359c20c484582c9820647a58683f
@@ -156,7 +156,7 @@ SRCREV_pn-opkg ?= "4488"
 SRCREV_pn-openocd ?= "517"
 SRCREV_pn-openocd-native ?= "517"
 SRCREV_pn-opkg ?= "4488"
-SRCREV_pn-opkg-native ?= "4488"
+SRCREV_pn-opkg-native ?= "4452"
 SRCREV_pn-opkg-sdk ?= "4488"
 SRCREV_pn-oprofileui ?= "160"
 SRCREV_pn-packagekit ?= "813fa8cfb139246cf180d52895b52b28616ae2f5"


#
# mt diff -r3b0348e0f932d88b5a93caf068cae7af759a6339 -r0c283b255707b9957249bfba5f3b83d97cbe8c32
#
#
#
# patch "conf/machine/om-gta01.conf"
#  from [cc17dd2af3bf99c8765951f82b0c4e16e41b3d43]
#    to [8bb36def5ae31dc19a1eff1f14caf9bc51906d8f]
# 
# patch "conf/machine/om-gta02.conf"
#  from [11ccb7175df71581f7b6aa92b0065dcae04d5151]
#    to [1320182b35aa623d42f9cb99022c0533b54d5996]
# 
# patch "packages/freesmartphone/gsmd2_git.bb"
#  from [eb494ab0a34eb1eb05405be07913484edac19752]
#    to [02f55bd7839997d6afe7032a9c3f8fb0ce1a89d1]
#
============================================================
--- conf/machine/om-gta01.conf	cc17dd2af3bf99c8765951f82b0c4e16e41b3d43
+++ conf/machine/om-gta01.conf	8bb36def5ae31dc19a1eff1f14caf9bc51906d8f
@@ -8,7 +8,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t fic-gta01 
 MACHINE_CLASS = "neo1973"
 PACKAGE_EXTRA_ARCHS = "armv4t fic-gta01 ${MACHINE_CLASS}"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko"
 UBOOT_ENTRYPOINT = "30008000"
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat ext2"
============================================================
--- conf/machine/om-gta02.conf	11ccb7175df71581f7b6aa92b0065dcae04d5151
+++ conf/machine/om-gta02.conf	1320182b35aa623d42f9cb99022c0533b54d5996
@@ -8,7 +8,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t fic-gta02 
 MACHINE_CLASS = "neo1973"
 PACKAGE_EXTRA_ARCHS = "armv4t fic-gta02 ${MACHINE_CLASS}"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-glamo"
 UBOOT_ENTRYPOINT = "30008000"
 
============================================================
--- packages/freesmartphone/gsmd2_git.bb	eb494ab0a34eb1eb05405be07913484edac19752
+++ packages/freesmartphone/gsmd2_git.bb	02f55bd7839997d6afe7032a9c3f8fb0ce1a89d1
@@ -1,14 +1,17 @@ HOMEPAGE = "http://www.freesmartphone.or
 DESCRIPTION = "GSM 07.07 phone server"
 HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/gsm0710muxd"
-AUTHOR = "Ixonos"
+AUTHOR = "Ixonos Team"
 SECTION = "console/network"
 DEPENDS = "dbus dbus-glib"
 RDEPENDS = "gsm0710muxd"
 LICENSE = "GPL"
-PV = "0.0.0+gitr${SRCREV}"
+PV = "0.1.0+gitr${SRCREV}"
 PR = "r0"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/gsmd2.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
 
 inherit autotools
+
+EXTRA_OECONF = "--disable-tests"
+