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

[coredump2 commit]

merge of '2df396d3c9bb3f2afb58c9ecb59aba197323bf87'
     and '9bda98155004c06ada379ea6494e26df0e41c6fe'

Author: coredump2 at openembedded.org
Branch: org.openembedded.dev
Revision: 15ad25c2df41e72ad281610da11230b4d0c9bd20
ViewMTN: http://monotone.openembedded.org/revision/info/15ad25c2df41e72ad281610da11230b4d0c9bd20
Files:
1
packages/gpsd/files/fic-gta01/restart_gllin.sh
packages/gpsd/gpsd.inc
packages/gpsd/gpsd_2.28.bb
packages/gpsd/gpsd_2.34.bb
packages/gpsd/gpsd_2.36.bb
packages/u-boot/u-boot-openmoko_svn.bb
Diffs:

#
# mt diff -r2df396d3c9bb3f2afb58c9ecb59aba197323bf87 -r15ad25c2df41e72ad281610da11230b4d0c9bd20
#
# 
# 
# add_file "packages/gpsd/files/fic-gta01/restart_gllin.sh"
#  content [1dd563bb0bc587c3b75094aef643c8ddc47c7942]
# 
# patch "packages/gpsd/gpsd.inc"
#  from [650373a23ddc8159bfc209e03a8bb60a2f5c46e4]
#    to [31c98872bb132b08fab52b701f0d91b961f71d9b]
# 
# patch "packages/gpsd/gpsd_2.28.bb"
#  from [19dc03378642fa1ee106c4bf1ba4f49118860903]
#    to [55b0e4d9cd1f621bd6f0f8049044f2512a411011]
# 
# patch "packages/gpsd/gpsd_2.34.bb"
#  from [d07d745ca471b1b1cfe875690c9278e223ca2c9c]
#    to [968a1c12ab0cf22874a5a029daa69b00eedac21c]
# 
# patch "packages/gpsd/gpsd_2.36.bb"
#  from [9cabcd04b6334d04f5b20d7585ad5d051f19a06f]
#    to [e7423c783c6edfa634685a22f2821e44fa28c764]
# 
============================================================
--- packages/gpsd/files/fic-gta01/restart_gllin.sh	1dd563bb0bc587c3b75094aef643c8ddc47c7942
+++ packages/gpsd/files/fic-gta01/restart_gllin.sh	1dd563bb0bc587c3b75094aef643c8ddc47c7942
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+/etc/init.d/gps-hardware stop
+sleep 1
+/etc/init.d/gps-hardware start
+
============================================================
--- packages/gpsd/gpsd.inc	650373a23ddc8159bfc209e03a8bb60a2f5c46e4
+++ packages/gpsd/gpsd.inc	31c98872bb132b08fab52b701f0d91b961f71d9b
@@ -15,6 +15,10 @@ SRC_URI = "http://download.berlios.de/gp
 	   file://gps-hardware \
            file://gpsd"
 
+SRC_URI_append_fic-gta01 = " \
+			    file://restart_gllin.sh \
+			   "
+			   
 inherit autotools update-rc.d
 
 INITSCRIPT_NAME = "gpsd"
@@ -48,6 +52,11 @@ do_install_append() {
         install -m 0644 ${WORKDIR}/gpsd-default ${D}/${sysconfdir}/default/gpsd.default
 }
 
+do_install_append_fic-gta01() {
+	install -d ${D}/${sysconfdir}/apm/resume.d
+	install -m 755 ${WORKDIR}/restart_gllin.sh ${D}/${sysconfdir}/apm/resume.d
+}
+
 pkg_postinst_${PN}-conf() {
 	update-alternatives --install ${sysconfdir}/default/gpsd gpsd-defaults ${sysconfdir}/default/gpsd.default 10
 	update-alternatives --install ${sysconfdir}/init.d/gps-hardware gps-hardware ${sysconfdir}/init.d/gps-hardware.default 10
============================================================
--- packages/gpsd/gpsd_2.28.bb	19dc03378642fa1ee106c4bf1ba4f49118860903
+++ packages/gpsd/gpsd_2.28.bb	55b0e4d9cd1f621bd6f0f8049044f2512a411011
@@ -1,2 +1,2 @@ require gpsd.inc
 require gpsd.inc
+PR = "r8"
-PR = "r5"
============================================================
--- packages/gpsd/gpsd_2.34.bb	d07d745ca471b1b1cfe875690c9278e223ca2c9c
+++ packages/gpsd/gpsd_2.34.bb	968a1c12ab0cf22874a5a029daa69b00eedac21c
@@ -1,4 +1,4 @@ require gpsd.inc
 require gpsd.inc
 
-PR = "r7"
+PR = "r8"
 
============================================================
--- packages/gpsd/gpsd_2.36.bb	9cabcd04b6334d04f5b20d7585ad5d051f19a06f
+++ packages/gpsd/gpsd_2.36.bb	e7423c783c6edfa634685a22f2821e44fa28c764
@@ -1,3 +1,3 @@ require gpsd.inc
 require gpsd.inc
 
+PR = "r2"
-PR = "r1"


#
# mt diff -r9bda98155004c06ada379ea6494e26df0e41c6fe -r15ad25c2df41e72ad281610da11230b4d0c9bd20
#
# 
# 
# patch "packages/u-boot/u-boot-openmoko_svn.bb"
#  from [67ec27434d36f171aedd9fb4e06f390505792635]
#    to [d812cd2b7484ad3d696a1616eea6e3e80706d31c]
# 
============================================================
--- packages/u-boot/u-boot-openmoko_svn.bb	67ec27434d36f171aedd9fb4e06f390505792635
+++ packages/u-boot/u-boot-openmoko_svn.bb	d812cd2b7484ad3d696a1616eea6e3e80706d31c
@@ -6,7 +6,7 @@ PV = "1.3.1${LOCALVERSION}"
 PROVIDES = "virtual/bootloader"
 LOCALVERSION = "+git${SRCDATE}+svnr${SRCREV}"
 PV = "1.3.1${LOCALVERSION}"
-PR = "r2"
+PR = "r3"
 
 SRCREV_FORMAT = "patches"
 
@@ -17,7 +17,7 @@ SRC_URI = "\
 SRC_URI = "\
   git://www.denx.de/git/u-boot.git/;protocol=git;name=upstream \
   svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http;name=patches \
-  file://uboot-eabi-fix-HACK.patch \
+  file://uboot-eabi-fix-HACK.patch;patch=1;maxrev=3773 \
   file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
   file://makefile-no-dirafter.patch;patch=1 \
   file://boot-menu-gfx-fix-openmoko-bug-1140.patch;patch=1 \