[oe-commits] org.oe.dev merge of '30fd35ee6ce559cd4ecf5885980ec31563708c87'

[rwhitby commit]

merge of '30fd35ee6ce559cd4ecf5885980ec31563708c87'
     and 'c0c6fbf1b52e5b3dc94b1e33e9622d2431debebd'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 7b2fee514f1bd349db33e0ceee663a9ebdd06afa
ViewMTN: http://monotone.openembedded.org/revision.psp?id=7b2fee514f1bd349db33e0ceee663a9ebdd06afa
Files:
1
packages/lm_sensors/files/iconv.patch
packages/lm_sensors/lmsensors-apps_2.10.1.bb
packages/openmoko-base/openmoko-libs_svn.bb
packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb
packages/opensync/libopensync-plugin-irmc-sync_0.22.bb
packages/uboot/uboot-gta01_svn.bb
Diffs:

#
# mt diff -r30fd35ee6ce559cd4ecf5885980ec31563708c87 -r7b2fee514f1bd349db33e0ceee663a9ebdd06afa
#
# 
# no changes
# 


#
# mt diff -rc0c6fbf1b52e5b3dc94b1e33e9622d2431debebd -r7b2fee514f1bd349db33e0ceee663a9ebdd06afa
#
# 
# 
# add_file "packages/lm_sensors/files/iconv.patch"
#  content [3c2cc55264f94cfbb57b6feac18ab990164fb443]
# 
# patch "packages/lm_sensors/lmsensors-apps_2.10.1.bb"
#  from [29f3445e114221a0424c4db6855ce1266833f3f6]
#    to [77da97f05946e612c7e93275f599fd5891b3876c]
# 
# patch "packages/openmoko-base/openmoko-libs_svn.bb"
#  from [905facea629dfecc5798fd88b63826641b979bbb]
#    to [db951ebe54cc145da20311319769bf32610e0be6]
# 
# patch "packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb"
#  from [96e318aa923456d5903bb9a54ba1d322d94e761d]
#    to [9e3bcc0a584850f07d72044109a2899acd5f3b67]
# 
# patch "packages/opensync/libopensync-plugin-irmc-sync_0.22.bb"
#  from [31a926deec10dc0d36b34a309c03aa5834afa63f]
#    to [ed4aa06a73f2070c86b6582a08fd51b3b9dc913f]
# 
# patch "packages/uboot/uboot-gta01_svn.bb"
#  from [9ae962e22bf2ce38860a8a843fcc1b6a7cde7f4e]
#    to [99839c5d6e1423ba68d992f0dfc835c2927b72c6]
# 
============================================================
--- packages/lm_sensors/files/iconv.patch	3c2cc55264f94cfbb57b6feac18ab990164fb443
+++ packages/lm_sensors/files/iconv.patch	3c2cc55264f94cfbb57b6feac18ab990164fb443
@@ -0,0 +1,13 @@
+Index: lm_sensors-2.10.1/prog/sensors/Module.mk
+===================================================================
+--- lm_sensors-2.10.1.orig/prog/sensors/Module.mk	2006-09-24 22:30:10.000000000 +0000
++++ lm_sensors-2.10.1/prog/sensors/Module.mk	2007-04-14 22:11:47.000000000 +0000
+@@ -36,7 +36,7 @@
+ REMOVESENSORSBIN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(BINDIR)/%,$(PROGSENSORSTARGETS))
+ REMOVESENSORSMAN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(PROGSENSORSMAN1DIR)/%,$(PROGSENSORSMAN1FILES))
+ 
+-LIBICONV := $(shell if /sbin/ldconfig -p | grep -q libiconv\\.so ; then echo \-liconv; else echo; fi)
++LIBICONV := -liconv
+ 
+ $(PROGSENSORSTARGETS): $(PROGSENSORSSOURCES:.c=.ro) lib/$(LIBSHBASENAME)
+ 	$(CC) $(EXLDFLAGS) -o $@ $(PROGSENSORSSOURCES:.c=.ro) $(LIBICONV) -Llib -lsensors
============================================================
--- packages/lm_sensors/lmsensors-apps_2.10.1.bb	29f3445e114221a0424c4db6855ce1266833f3f6
+++ packages/lm_sensors/lmsensors-apps_2.10.1.bb	77da97f05946e612c7e93275f599fd5891b3876c
@@ -1,13 +1,15 @@ HOMEPAGE = "http://secure.netroedge.com/
 # lmsensors-apps .bb build file
 # Copyright (C) 2006, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see /COPYING)
 
 DESCRIPTION = "Hardware health monitoring applications"
 HOMEPAGE = "http://secure.netroedge.com/~lm78/"
-DEPENDS = "libsysfs"
+DEPENDS = "libsysfs virtual/libiconv"
 LICENSE = "GPL"
+PR = "r1"
 
 SRC_URI = "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${PV}.tar.gz \
+           file://iconv.patch;patch=1 \
            file://add-sysfs-ldflags.patch;patch=1"
 
 S = "${WORKDIR}/lm_sensors-${PV}"
============================================================
--- packages/openmoko-base/openmoko-libs_svn.bb	905facea629dfecc5798fd88b63826641b979bbb
+++ packages/openmoko-base/openmoko-libs_svn.bb	db951ebe54cc145da20311319769bf32610e0be6
@@ -1,24 +1,36 @@ LICENSE = "LGPL"
 DESCRIPTION = "openmoko-libs is a set of libraries implementing a Gtk+ based application framework for mobile communication applications"
 SECTION = "openmoko/libs"
 LICENSE = "LGPL"
-DEPENDS += "gtk+ eds-dbus"
+DEPENDS += "gtk+ eds-dbus libgsmd"
 PV = "0.0.1+svn${SRCDATE}"
-PR = "r2"
+PR = "r5"
 
 inherit openmoko
 
-do_configure_prepend() {
-	touch libmokocore/Makefile.in
-	touch libmokopim/Makefile.in
-	touch libmokonet/Makefile.in
-}
-
 do_stage() {
 	autotools_stage_all
 }
 
-PACKAGES =+ "libmokojournal libmokojournal-dev libmokojournal-dbg"
+PACKAGES =+ " \
+             libmokojournal libmokojournal-dev libmokojournal-dbg \
+	     libmokogsmd libmokogsmd-dev libmokogsmd-dbg \
+	     libmokocore libmokocore-dev libmokocore-dbg \
+	     libmokoui libmokoui-dev libmokoui-dbg \
+	     "
 
 FILES_libmokojournal = "${libdir}/libmokojournal.so.*"
 FILES_libmokojournal-dev = "${libdir}/libmokojournal.so ${libdir}/libmokojournal.*a ${includedir}/${PN}/libmokojournal"
 FILES_libmokojournal-dbg = "${libdir}/.debug/libmokojournal.so.*"
+
+FILES_libmokogsmd = "${libdir}/libmokogsmd.so.*"
+FILES_libmokogsmd-dev = "${libdir}/libmokogsmd.so ${libdir}/libmokogsmd.*a ${includedir}/${PN}/libmokogsmd"
+FILES_libmokogsmd-dbg = "${libdir}/.debug/libmokogsmd.so.*"
+
+FILES_libmokocore = "${libdir}/libmokocore.so.*"
+FILES_libmokocore-dev = "${libdir}/libmokocore.so ${libdir}/libmokocore.*a ${includedir}/${PN}/libmokocore"
+FILES_libmokocore-dbg = "${libdir}/.debug/libmokocore.so.*"
+ 	 
+FILES_libmokoui = "${libdir}/libmokoui.so.*"
+FILES_libmokoui-dev = "${libdir}/libmokoui.so ${libdir}/libmokoui.*a ${includedir}/${PN}/libmokoui"
+FILES_libmokoui-dbg = "${libdir}/.debug/libmokoui.so.*"
+  	 
============================================================
--- packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb	96e318aa923456d5903bb9a54ba1d322d94e761d
+++ packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb	9e3bcc0a584850f07d72044109a2899acd5f3b67
@@ -1,4 +1,5 @@ DESCRIPTION = "Shows the battery/AC stat
 DESCRIPTION = "Shows the battery/AC status in the OpenMoko panel"
+DEPENDS = "apmd"
 PV = "0.0.1+svn${SRCDATE}"
 
 inherit openmoko-panel-plugin
============================================================
--- packages/opensync/libopensync-plugin-irmc-sync_0.22.bb	31a926deec10dc0d36b34a309c03aa5834afa63f
+++ packages/opensync/libopensync-plugin-irmc-sync_0.22.bb	ed4aa06a73f2070c86b6582a08fd51b3b9dc913f
@@ -1,2 +1,4 @@ require libopensync-plugin_0.22.inc
 require libopensync-plugin.inc
 require libopensync-plugin_0.22.inc
+
+DEPENDS += "openobex bluez-libs"
============================================================
--- packages/uboot/uboot-gta01_svn.bb	9ae962e22bf2ce38860a8a843fcc1b6a7cde7f4e
+++ packages/uboot/uboot-gta01_svn.bb	99839c5d6e1423ba68d992f0dfc835c2927b72c6
@@ -18,7 +18,9 @@ do_quilt() {
 UBOOT_MACHINES = "gta01v3 gta01v4 gta01bv2 gta01bv3"
 
 do_quilt() {
-        mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
+        mv ${WORKDIR}/patches ${S}/patches 
+        cd ${S}
+        quilt push -av
         rm -Rf patches .pc
 }