Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

17 files changed, 231 insertions, 35 deletions

diff --git a/recipes/automake/automake-native.inc b/recipes/automake/automake-native.inc
index 7b69252ff0..5ced30d5df 100644
--- a/recipes/automake/automake-native.inc
+++ b/recipes/automake/automake-native.inc
@@ -1,5 +1,5 @@
 SECTION = "devel"
-include automake_${PV}.bb
+require automake_${PV}.bb
 DEPENDS = "autoconf-native"
 RDEPENDS_automake-native = "autoconf-native perl-native-runtime"
 
diff --git a/recipes/bzip2/bzip2-full-native_1.0.5.bb b/recipes/bzip2/bzip2-full-native_1.0.5.bb
index 13bebbb3d5..53e0c112cc 100644
--- a/recipes/bzip2/bzip2-full-native_1.0.5.bb
+++ b/recipes/bzip2/bzip2-full-native_1.0.5.bb
@@ -16,7 +16,6 @@ inherit autotools native
 do_configure_prepend () {
 	cp ${WORKDIR}/configure.ac ${S}/
 	cp ${WORKDIR}/Makefile.am ${S}/
-	cp ${STAGING_DATADIR_NATIVE}/automake*/install-sh ${S}/
 }
 
 do_stage () {
diff --git a/recipes/console-tools/console-tools_0.3.2.bb b/recipes/console-tools/console-tools_0.3.2.bb
index 9e48c2c572..46c8a28ffc 100644
--- a/recipes/console-tools/console-tools_0.3.2.bb
+++ b/recipes/console-tools/console-tools_0.3.2.bb
@@ -9,17 +9,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \
            file://compile.patch;patch=1 \
            file://kbdrate.patch;patch=1 \
            file://uclibc-fileno.patch;patch=1 \
-           file://config/*.m4"
+           file://config"
 
 export SUBDIRS = "fontfiletools vttools kbdtools screenfonttools contrib \
 		  examples po intl compat"
 
-acpaths = "-I config"
-do_configure_prepend () {
-	mkdir -p config
-	cp ${WORKDIR}/config/*.m4 config/
-}
-
 do_compile () {
 	oe_runmake -C lib
 	oe_runmake 'SUBDIRS=${SUBDIRS}'
@@ -27,6 +21,8 @@ do_compile () {
 
 inherit autotools
 
+acpaths = "-I ${WORKDIR}/config"
+
 do_install () {
 	autotools_do_install
 	mv ${D}${bindir}/chvt ${D}${bindir}/chvt.${PN}
diff --git a/recipes/ffmpeg/ffmpeg.inc b/recipes/ffmpeg/ffmpeg.inc
index 33e7d7aaf7..3f93765e45 100644
--- a/recipes/ffmpeg/ffmpeg.inc
+++ b/recipes/ffmpeg/ffmpeg.inc
@@ -53,7 +53,7 @@ do_stage() {
 
 		for h in adler32.h avstring.h avutil.h base64.h bswap.h \
                  common.h crc.h fifo.h integer.h intfloat_readwrite.h \
-                 log.h lzo.h mathematics.h md5.h mem.h random.h \
+                 log.h lzo.h mathematics.h md5.h mem.h pixfmt.h random.h \
                  rational.h sha1.h
 		do
            install -m 0644 ${S}/libavutil/$h        ${STAGING_INCDIR}/ffmpeg/$h
diff --git a/recipes/ffmpeg/ffmpeg_0.5.bb b/recipes/ffmpeg/ffmpeg_0.5.bb
index e49478a215..698f45c83b 100644
--- a/recipes/ffmpeg/ffmpeg_0.5.bb
+++ b/recipes/ffmpeg/ffmpeg_0.5.bb
@@ -3,7 +3,7 @@ require ffmpeg.inc
 DEPENDS += "schroedinger libgsm"
 
 PE = "1"
-PR = "r0"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "1"
 
diff --git a/recipes/ffmpeg/ffmpeg_git.bb b/recipes/ffmpeg/ffmpeg_git.bb
index b2b854aed8..fa82fb2044 100644
--- a/recipes/ffmpeg/ffmpeg_git.bb
+++ b/recipes/ffmpeg/ffmpeg_git.bb
@@ -4,7 +4,7 @@ DEPENDS += "schroedinger libgsm"
 
 PE = "1"
 PV = "0.4.9+${PR}+gitr${SRCREV}" 
-PR = "r38"
+PR = "r39"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_arm = "1"
diff --git a/recipes/ffmpeg/ffmpeg_svn.bb b/recipes/ffmpeg/ffmpeg_svn.bb
index 5d8c775e93..c7aaa7127c 100644
--- a/recipes/ffmpeg/ffmpeg_svn.bb
+++ b/recipes/ffmpeg/ffmpeg_svn.bb
@@ -6,7 +6,7 @@ SRCREV = "16396"
 
 PE = "1"
 PV = "0.4.9+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/recipes/freesmartphone/frameworkd/htc-msm7/frameworkd.conf b/recipes/freesmartphone/frameworkd/htc-msm7/frameworkd.conf
new file mode 100644
index 0000000000..a50172c7f5
--- /dev/null
+++ b/recipes/freesmartphone/frameworkd/htc-msm7/frameworkd.conf
@@ -0,0 +1,152 @@
+[frameworkd]
+# indicates this configuration version, do not change
+version = 1
+# the default log_level, if not specified per module
+log_level = INFO
+# the global log_destination. Uncomment to enable
+log_to = stderr
+#log_to = file
+#log_to = syslog
+# if logging to a file, specify the destination
+log_destination = /tmp/frameworkd.log
+# persistance format, one of "pickle", "yaml"
+persist_format = pickle
+rootdir = ../etc/freesmartphone:/etc/freesmartphone:/usr/etc/freesmartphone
+# specify how subsystems scan for their plugins,
+# either "auto" (via filesystem scan) or "config" (via config section check)
+# the default is "auto" (slow).
+scantype = auto
+
+#
+# Subsystem configuration for oeventsd
+#
+[odeviced]
+# set log level for a subsystem or for an individual module
+# available log levels are: DEBUG, INFO, WARNING, ERROR, CRITICAL
+log_level = INFO
+
+[odeviced.accelerometer]
+disable = 1
+
+[odeviced.audio]
+# set directory where the alsa audio scenarios are stored
+scenario_dir = /usr/share/openmoko/scenarios
+# set default scenario loaded at startup
+default_scenario = stereoout
+
+[odeviced.idlenotifier]
+# configure timeouts (in seconds) here. A value of 0
+# means 'never fall into this state' (except programatically)
+idle = 10
+idle_dim = 20
+idle_prelock = 12
+lock = 2
+suspend = 2
+
+[odeviced.input]
+# format is <keyname>,<type>,<input device keycode>,<report held seconds in addition to press/release>
+report1 = AUX,key,169,1
+report2 = POWER,key,116,1
+report3 = CHARGER,key,356,0
+report4 = HEADSET,switch,2,0
+
+[odeviced.kernel26]
+# set 1 to disable a module
+disable = 0
+# poll capacity once every 5 minutes
+# (usually, you do not have to change this)
+capacity_check_timeout = 300
+# set 0 to disable FB_BLANK ioctl to blank framebuffer
+# (if you have problems on Openmoko GTA02)
+fb_blank = 1
+
+[odeviced.powercontrol_ibm]
+disable = 1
+
+[odeviced.powercontrol_neo]
+disable = 1
+
+#
+# Subsystem configuration for oeventsd
+#
+[oeventsd]
+log_level = DEBUG
+disable = 0
+
+[oeventsd.oevents]
+
+#
+# Subsystem configuration for ogspd
+#
+[ogpsd]
+# possible options are NMEADevice, UBXDevice, GTA02Device, EtenDevice
+device = GTA02Device
+# possible options are SerialChannel, GllinChannel, UDPChannel, FileChannel
+channel = SerialChannel
+# For UDPChannel the path defines the port to listen to
+path = /dev/ttySAC1
+log_level = INFO
+
+[ogpsd.factory]
+
+#
+# Subsystem configuration for ogsmd
+#
+[ogsmd]
+disable = 0
+modemtype = qualcomm_msm
+
+#
+# Subsystem configuration for onetworkd
+#
+[onetworkd]
+
+[onetworkd.network]
+
+#
+# Subsystem configuration for ophoned
+#
+[ophoned]
+
+[ophoned.ophoned]
+
+#
+# Subsystem configuration for opimd
+#
+[opimd]
+contacts_default_backend = CSV-Contacts
+messages_default_folder = Unfiled
+messages_trash_folder = Trash
+sim_messages_default_folder = SMS
+rootdir = ../etc/freesmartphone/opim:/etc/freesmartphone/opim:/usr/etc/freesmartphone/opim
+
+[opimd.opimd]
+
+#
+# Subsystem configuration for opreferencesd
+#
+[opreferencesd]
+log_level = DEBUG
+disable = 0
+# log_level = DEBUG
+
+[opreferencesd.opreferences]
+
+#
+# Subsystem configuration for otimed
+#
+[otimed]
+# a list of time/zone sources to use or NONE
+timesources = GPS,NTP
+zonesources = GSM
+
+[otimed.otimed]
+
+#
+# Subsystem configuration for ousaged
+#
+[ousaged]
+# choose whether resources should be disabled at startup, at shutdown, always (default), or never.
+sync_resources_with_lifecycle = always
+
+[ousaged.generic]
diff --git a/recipes/freesmartphone/frameworkd/a780/frameworkd.conf b/recipes/freesmartphone/frameworkd/motorola-ezx/frameworkd.conf
index 36359a9f34..36359a9f34 100644
--- a/recipes/freesmartphone/frameworkd/a780/frameworkd.conf
+++ b/recipes/freesmartphone/frameworkd/motorola-ezx/frameworkd.conf
diff --git a/recipes/freesmartphone/frameworkd_git.bb b/recipes/freesmartphone/frameworkd_git.bb
index 14aa183d94..d658fd092a 100644
--- a/recipes/freesmartphone/frameworkd_git.bb
+++ b/recipes/freesmartphone/frameworkd_git.bb
@@ -4,7 +4,7 @@ AUTHOR = "FreeSmartphone.Org Development Team"
 SECTION = "console/network"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
-PV = "0.8.5.1+gitr${SRCREV}"
+PV = "0.8.5.2+gitr${SRCREV}"
 PR = "r0"
 
 inherit distutils update-rc.d
diff --git a/recipes/freesmartphone/fsodeviced_git.bb b/recipes/freesmartphone/fsodeviced_git.bb
index e8a77fd617..4cb61c7c29 100644
--- a/recipes/freesmartphone/fsodeviced_git.bb
+++ b/recipes/freesmartphone/fsodeviced_git.bb
@@ -10,6 +10,4 @@ SRC_URI = "\
 "
 S = "${WORKDIR}/git/fsodeviced"
 
-inherit autotools
-
-FILES_${PN} += "${datadir}"
+inherit autotools fso-plugin vala
diff --git a/recipes/freesmartphone/libeflvala_git.bb b/recipes/freesmartphone/libeflvala_git.bb
new file mode 100644
index 0000000000..f35c6c6187
--- /dev/null
+++ b/recipes/freesmartphone/libeflvala_git.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Vala meets the Enlightenment Foundation Libraries"
+AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
+LICENSE = "LGPL"
+SECTION = "devel"
+DEPENDS = "vala-native glib-2.0 dbus dbus-glib eina eet evas ecore edje elementary"
+PV = "0.0.0.0+gitr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "${FREESMARTPHONE_GIT}/libeflvala;protocol=git;branch=master"
+S = "${WORKDIR}/git"
+
+inherit autotools_stage pkgconfig vala
+
+PACKAGES =+ "${PN}-examples"
+FILES_${PN}-examples = "${datadir}/libeflvala ${bindir}"
+
diff --git a/recipes/gnome/libproxy_0.2.3.bb b/recipes/gnome/libproxy_0.2.3.bb
index 2a2ee51cd7..c04be6b5f3 100644
--- a/recipes/gnome/libproxy_0.2.3.bb
+++ b/recipes/gnome/libproxy_0.2.3.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "A library handling all the details of proxy configuration"
 LICENSE = "LGPL"
-DEPENDS = "gconf virtual/libx11"
+DEPENDS = "libxmu gconf virtual/libx11"
 
 SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz"
 
diff --git a/recipes/linux/linux-msm7xxxx/htcraphael/defconfig b/recipes/linux/linux-msm7xxxx/htcraphael/defconfig
index 64a6044a8d..22d8fe93dc 100644
--- a/recipes/linux/linux-msm7xxxx/htcraphael/defconfig
+++ b/recipes/linux/linux-msm7xxxx/htcraphael/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.27
-# Wed Feb 25 00:43:45 2009
+# Thu Mar 19 20:02:34 2009
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -201,6 +201,7 @@ CONFIG_MACH_HTCRAPHAEL=y
 CONFIG_MACH_HTCRAPHAEL_CDMA=y
 CONFIG_MACH_HTCDIAMOND=y
 CONFIG_MACH_HTCDIAMOND_CDMA=y
+# CONFIG_MACH_HTCBLACKSTONE is not set
 # CONFIG_TROUT_H2W is not set
 # CONFIG_TROUT_PWRSINK is not set
 CONFIG_MSM7X00A_USE_GP_TIMER=y
@@ -226,6 +227,7 @@ CONFIG_MSM_IDLE_STATS_BUCKET_COUNT=10
 CONFIG_MSM_FIQ_SUPPORT=y
 # CONFIG_MSM_SERIAL_DEBUGGER is not set
 CONFIG_MSM_SMD=y
+# CONFIG_MSM_SMD_7500 is not set
 # CONFIG_MSM_ONCRPCROUTER is not set
 # CONFIG_MSM_CPU_FREQ_ONDEMAND is not set
 # CONFIG_MSM_CPU_FREQ_SCREEN is not set
@@ -303,7 +305,7 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="mem=76M console=ttyMSM2,115200n8"
+CONFIG_CMDLINE=" debug "
 # CONFIG_XIP_KERNEL is not set
 # CONFIG_KEXEC is not set
 
@@ -570,6 +572,7 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI=y
 # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
 CONFIG_TOUCHSCREEN_MSM=y
 # CONFIG_MSM_VIRTUAL_KEYBOARD is not set
+# CONFIG_MSM_BLACKSTONE_PAD is not set
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_ATI_REMOTE is not set
 # CONFIG_INPUT_ATI_REMOTE2 is not set
@@ -769,11 +772,7 @@ CONFIG_FONT_8x8=y
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-# CONFIG_LOGO_LINUX_CLUT224 is not set
-CONFIG_LOGO_DIAMRAPH_CLUT224=y
+# CONFIG_LOGO is not set
 # CONFIG_SOUND is not set
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
@@ -926,7 +925,7 @@ CONFIG_JBD=y
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-# CONFIG_FS_POSIX_ACL is not set
+CONFIG_FS_POSIX_ACL=y
 # CONFIG_XFS_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_DNOTIFY is not set
@@ -984,10 +983,32 @@ CONFIG_TMPFS=y
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
-# CONFIG_NFS_FS is not set
-# CONFIG_NFSD is not set
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+# CONFIG_NFS_V4 is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+# CONFIG_NFSD_V4 is not set
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_NFS_ACL_SUPPORT=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
-# CONFIG_CIFS is not set
+CONFIG_CIFS=y
+CONFIG_CIFS_STATS=y
+# CONFIG_CIFS_STATS2 is not set
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_EXPERIMENTAL is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
@@ -995,8 +1016,24 @@ CONFIG_NETWORK_FILESYSTEMS=y
 #
 # Partition Types
 #
-# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
 CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_NLS_CODEPAGE_437=y
diff --git a/recipes/linux/linux-msm7xxxx_git.bb b/recipes/linux/linux-msm7xxxx_git.bb
index d4571d1d97..4751c99876 100644
--- a/recipes/linux/linux-msm7xxxx_git.bb
+++ b/recipes/linux/linux-msm7xxxx_git.bb
@@ -3,7 +3,7 @@ require linux.inc
 PV = "2.6.25+${PR}+gitr${SRCREV}"
 PV_htcraphael = "2.6.27+${PR}+gitr${SRCREV}"
 PV_htcdiamond = "2.6.27+${PR}+gitr${SRCREV}"
-PR = "r4"
+PR = "r6"
 
 COMPATIBLE_MACHINE = "htckaiser|htcpolaris|htcvogue|htctitan|htcnike|htcraphael|htcdiamond|htcblackstone"
 
diff --git a/recipes/meta/slugos-packages.bb b/recipes/meta/slugos-packages.bb
index 1428fdcd7b..8ad95d6f3f 100644
--- a/recipes/meta/slugos-packages.bb
+++ b/recipes/meta/slugos-packages.bb
@@ -110,7 +110,6 @@ SLUGOS_PACKAGES = "\
 	ipkg-utils \
 	iptables \
 	ircp \
-	irssi \
 	joe \
 	jpeg \
 	kexec-tools \
@@ -258,6 +257,7 @@ SLUGOS_BROKEN_PACKAGES = "\
 	dsniff \
 	eciadsl \
 	gspcav1 \
+	irssi \
 	linphone \
 	lirc-modules lirc \
 	madfu \
diff --git a/recipes/openmoko-3rdparty/omext_0.2.bb b/recipes/openmoko-3rdparty/omext_0.2.bb
index 203b84e3df..96f7ff51f6 100644
--- a/recipes/openmoko-3rdparty/omext_0.2.bb
+++ b/recipes/openmoko-3rdparty/omext_0.2.bb
@@ -7,6 +7,4 @@ SRC_URI = "http://www.devzero.net/openmoko/dist/omext-${PV}.tar.gz"
 
 inherit autotools pkgconfig
 
-S = "{WORKDIR}/openmoko-extensionhandler"
-
-
+S = "${WORKDIR}/openmoko-extensionhandler"