[oe-commits] org.oe.dev merge of '235d3c4d9fbc3aee4e352851f04eb4fa2da4a68f'

mickeyl commit openembedded-commits at lists.openembedded.org
Fri Sep 14 01:04:57 UTC 2007


merge of '235d3c4d9fbc3aee4e352851f04eb4fa2da4a68f'
     and '2d2fba06a82095954bfbae27ea7e7024c3604521'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: c3c391eb3a506332e2baf39f0412a362bf17add8
ViewMTN: http://monotone.openembedded.org/revision/info/c3c391eb3a506332e2baf39f0412a362bf17add8
Files:
1
packages/free42
packages/free42/files
conf/distro/include/insane-srcrevs.inc
conf/distro/include/moko-autorev.inc
packages/free42/files/free42-bcd-gtk-only.patch
packages/free42/files/free42-dont-declare-sincos.patch
packages/free42/files/free42-vga-skin.patch
packages/free42/files/free42dec.desktop
packages/free42/free42-vga_1.4.36.bb
packages/uclibc/bfin-uclibc_svn.bb
packages/uclibc/elf2flt_svn.bb
conf/bitbake.conf
conf/distro/angstrom-2007.1.conf
conf/distro/include/sane-srcrevs.inc
conf/distro/openmoko.conf
packages/linux/linux-2.6.21/gumstix-verdex/defconfig
packages/linux/linux-omap.inc
packages/linux/linux_2.6.21.bb
packages/starling/starling_0.2.bb
packages/tasks/task-openmoko-feed.bb
packages/gsm/files/fic-gta01
packages/gsm/files/fic-gta01/gsmd
packages/gsm/libgsmd_svn.bb
Diffs:

#
# mt diff -r235d3c4d9fbc3aee4e352851f04eb4fa2da4a68f -rc3c391eb3a506332e2baf39f0412a362bf17add8
#
# 
# 
# add_dir "packages/free42"
# 
# add_dir "packages/free42/files"
# 
# add_file "conf/distro/include/insane-srcrevs.inc"
#  content [63ea6dbb957d94e0f729963a34f021d69c8a2f5a]
# 
# add_file "conf/distro/include/moko-autorev.inc"
#  content [72eda7924347374e0ab868c3b35454bafd3d93d0]
# 
# add_file "packages/free42/files/free42-bcd-gtk-only.patch"
#  content [5e700cd97adced79c681f2aa6e9bd8e4f89ff895]
# 
# add_file "packages/free42/files/free42-dont-declare-sincos.patch"
#  content [5e18862aa104d378555e3795e0d218cabe753e80]
# 
# add_file "packages/free42/files/free42-vga-skin.patch"
#  content [303f7bc3ae4924f88ea2694a9a1156f4f783bc97]
# 
# add_file "packages/free42/files/free42dec.desktop"
#  content [e1163c16c574864f887fa6786337cf60c2da4fac]
# 
# add_file "packages/free42/free42-vga_1.4.36.bb"
#  content [affee0392f2e9a5336abf00c6e4fd71d74c796cc]
# 
# add_file "packages/uclibc/bfin-uclibc_svn.bb"
#  content [1eb6937a681df9e862a1770a754b337f98f02833]
# 
# add_file "packages/uclibc/elf2flt_svn.bb"
#  content [339525a526bf04879f8f94a238602fe87870a1a0]
# 
# patch "conf/bitbake.conf"
#  from [a8197c7ad74ff611be8da0b870956c6aeaab6419]
#    to [51abbfe5d5cdfa25444a755852f26e72fd9b6964]
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [f80ce125a5ef3aebeae958991bd46ac98794cd9b]
#    to [7504c0e4038b21e36b2ea2b0841ca06e9083685d]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [7952ad133c0859c06c215c8350b98178c9377660]
#    to [d8a4aae44c305a13e168a2f3641648fe0671207d]
# 
# patch "conf/distro/openmoko.conf"
#  from [f11e22bc56a237fa548e77d0512477cb02da9a98]
#    to [c246d427631dbd56b159221956899cc2f40f3b06]
# 
# patch "packages/linux/linux-2.6.21/gumstix-verdex/defconfig"
#  from [000a3c21d871acfac60d70faca4943121dc77e67]
#    to [d30c1b6220264072c4381f7f1942780b702a3a01]
# 
# patch "packages/linux/linux-omap.inc"
#  from [2d2e1563073a9c9e272aca35faa2b007040acc6e]
#    to [ddb0989b0eff634d3c86b2b86fc04e7c795ae8c1]
# 
# patch "packages/linux/linux_2.6.21.bb"
#  from [476d26ea7c5cbc48a8347d9c8d5297561b2ce2df]
#    to [d17402966b36edab990d122a0bdf917175c16bff]
# 
# patch "packages/starling/starling_0.2.bb"
#  from [9d0522f1342ae339228f0a79a466835a9483cb9c]
#    to [a03b1e9d48277355287cfd137c098256c14819b1]
# 
# patch "packages/tasks/task-openmoko-feed.bb"
#  from [44daf5badff88f9c9cd129df8d27998b67606cb4]
#    to [732cc2b15ee798ca00f5bf1855e650be36e08741]
# 
============================================================
--- conf/distro/include/insane-srcrevs.inc	63ea6dbb957d94e0f729963a34f021d69c8a2f5a
+++ conf/distro/include/insane-srcrevs.inc	63ea6dbb957d94e0f729963a34f021d69c8a2f5a
@@ -0,0 +1,80 @@
+SRCREV_pn-dfu-util ?= "${AUTOREV}"
+SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
+SRCREV_pn-eglibc ?= "${AUTOREV}"
+SRCREV_pn-eglibc-initial ?= "${AUTOREV}"
+SRCREV_pn-eglibc-intermediate ?= "${AUTOREV}"
+SRCREV_pn-ezxd ?= "${AUTOREV}"
+SRCREV_pn-fbgrab-viewer-native ?= "${AUTOREV}"
+SRCREV_pn-fstests ?= "${AUTOREV}"
+SRCREV_pn-gnuradio ?= "${AUTOREV}"
+SRCREV_pn-hildon-1 ?= "${AUTOREV}"
+SRCREV_pn-libgsmd ?= "${AUTOREV}"
+SRCREV_pn-libmokogsmd2 ?= "${AUTOREV}"
+SRCREV_pn-libmokojournal2 ?= "${AUTOREV}"
+SRCREV_pn-libmokopanelui2 ?= "${AUTOREV}"
+SRCREV_pn-libmokoui2 ?= "${AUTOREV}"
+SRCREV_pn-libowl ?= "${AUTOREV}"
+SRCREV_pn-libxosd ?= "${AUTOREV}"
+SRCREV_pn-llvm-gcc4 ?= "${AUTOREV}"
+SRCREV_pn-llvm-gcc4-cross ?= "${AUTOREV}"
+SRCREV_pn-maemo-mapper ?= "${AUTOREV}"
+SRCREV_pn-matchbox-desktop-2 ?= "${AUTOREV}"
+SRCREV_pn-matchbox-keyboard ?= "${AUTOREV}"
+SRCREV_pn-matchbox-keyboard-inputmethod ?= "${AUTOREV}"
+SRCREV_pn-matchbox-panel-2 ?= "${AUTOREV}"
+SRCREV_pn-neod ?= "${AUTOREV}"
+SRCREV_pn-oh-puzzles ?= "${AUTOREV}"
+SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}"
+SRCREV_pn-openmoko-calculator ?= "${AUTOREV}"
+SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-common ?= "${AUTOREV}"
+SRCREV_pn-openmoko-common2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-contacts ?= "${AUTOREV}"
+SRCREV_pn-openmoko-contacts2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-dates ?= "${AUTOREV}"
+SRCREV_pn-openmoko-dates2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-dialer ?= "${AUTOREV}"
+SRCREV_pn-openmoko-dialer2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-feedreader2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-finger-demo ?= "${AUTOREV}"
+SRCREV_pn-openmoko-firststart2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-footer ?= "${AUTOREV}"
+SRCREV_pn-openmoko-icon-theme-standard ?= "${AUTOREV}"
+SRCREV_pn-openmoko-icon-theme-standard2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-keyboard ?= "${AUTOREV}"
+SRCREV_pn-openmoko-libs ?= "${AUTOREV}"
+SRCREV_pn-openmoko-mediaplayer2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-messages ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-battery ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-bt ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-clock ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-demo ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-demo-simple ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-gps ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}"
+SRCREV_pn-openmoko-session ?= "${AUTOREV}"
+SRCREV_pn-openmoko-simplemediaplayer ?= "${AUTOREV}"
+SRCREV_pn-openmoko-sound-theme-standard ?= "${AUTOREV}"
+SRCREV_pn-openmoko-stylus-demo ?= "${AUTOREV}"
+SRCREV_pn-openmoko-stylus-demo-simple ?= "${AUTOREV}"
+SRCREV_pn-openmoko-taskmanager ?= "${AUTOREV}"
+SRCREV_pn-openmoko-tasks ?= "${AUTOREV}"
+SRCREV_pn-openmoko-tasks2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-terminal2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-theme-standard ?= "${AUTOREV}"
+SRCREV_pn-openmoko-theme-standard-qvga ?= "${AUTOREV}"
+SRCREV_pn-openmoko-theme-standard2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}"
+SRCREV_pn-openmoko-today ?= "${AUTOREV}"
+SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
+SRCREV_pn-psplash ?= "${AUTOREV}"
+SRCREV_pn-settings-daemon ?= "${AUTOREV}"
+SRCREV_pn-sjf2410-linux-native ?= "${AUTOREV}"
+SRCREV_pn-sphyrna ?= "${AUTOREV}"
+SRCREV_pn-webkit-gtk ?= "${AUTOREV}"
+SRCREV_pn-xoo ?= "${AUTOREV}"
+
+SRCREV ?= "${AUTOREV}"
============================================================
--- conf/distro/include/moko-autorev.inc	72eda7924347374e0ab868c3b35454bafd3d93d0
+++ conf/distro/include/moko-autorev.inc	72eda7924347374e0ab868c3b35454bafd3d93d0
@@ -0,0 +1,46 @@
+SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}"
+SRCREV_pn-openmoko-calculator ?= "${AUTOREV}"
+SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-common ?= "${AUTOREV}"
+SRCREV_pn-openmoko-common2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-contacts ?= "${AUTOREV}"
+SRCREV_pn-openmoko-contacts2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-dates ?= "${AUTOREV}"
+SRCREV_pn-openmoko-dates2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-dialer ?= "${AUTOREV}"
+SRCREV_pn-openmoko-dialer2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-feedreader2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-finger-demo ?= "${AUTOREV}"
+SRCREV_pn-openmoko-firststart2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-footer ?= "${AUTOREV}"
+SRCREV_pn-openmoko-icon-theme-standard ?= "${AUTOREV}"
+SRCREV_pn-openmoko-icon-theme-standard2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-keyboard ?= "${AUTOREV}"
+SRCREV_pn-openmoko-libs ?= "${AUTOREV}"
+SRCREV_pn-openmoko-mediaplayer2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-messages ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-battery ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-bt ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-clock ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-demo ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-demo-simple ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-gps ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}"
+SRCREV_pn-openmoko-session ?= "${AUTOREV}"
+SRCREV_pn-openmoko-simplemediaplayer ?= "${AUTOREV}"
+SRCREV_pn-openmoko-sound-theme-standard ?= "${AUTOREV}"
+SRCREV_pn-openmoko-stylus-demo ?= "${AUTOREV}"
+SRCREV_pn-openmoko-stylus-demo-simple ?= "${AUTOREV}"
+SRCREV_pn-openmoko-taskmanager ?= "${AUTOREV}"
+SRCREV_pn-openmoko-tasks ?= "${AUTOREV}"
+SRCREV_pn-openmoko-tasks2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-terminal2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-theme-standard ?= "${AUTOREV}"
+SRCREV_pn-openmoko-theme-standard-qvga ?= "${AUTOREV}"
+SRCREV_pn-openmoko-theme-standard2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}"
+SRCREV_pn-openmoko-today ?= "${AUTOREV}"
+SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
============================================================
--- packages/free42/files/free42-bcd-gtk-only.patch	5e700cd97adced79c681f2aa6e9bd8e4f89ff895
+++ packages/free42/files/free42-bcd-gtk-only.patch	5e700cd97adced79c681f2aa6e9bd8e4f89ff895
@@ -0,0 +1,100 @@
+--- free42-orig/gtk/Makefile	2007-01-06 09:37:55.000000000 -0800
++++ free42gtk/gtk/Makefile	2007-09-02 23:54:34.000000000 -0700
+@@ -35,20 +35,14 @@
+ 	core_math2.o core_phloat.o core_sto_rcl.o core_tables.o \
+ 	core_variables.o
+ 
+-ifdef BCD_MATH
+ CXXFLAGS += -DBCD_MATH
+ SRCS += bcdfloat.cc bcd.cc bcdmath.cc
+ OBJS += bcdfloat.o bcd.o bcdmath.o
+ EXE = free42dec
+-else
+-EXE = free42bin
+-endif
+ 
+ $(EXE): $(OBJS)
+ 	$(CXX) -o $(EXE) $(LDFLAGS) $(OBJS) $(LIBS)
+ 
+-$(SRCS): symlinks
+-
+ .cc.o:
+ 	$(CXX) $(CXXFLAGS) -c -o $@ $<
+ 
+@@ -64,74 +58,18 @@
+ keymap.cc: keymap2cc keymap.txt
+ 	./keymap2cc
+ 
+-symlinks:
+-	ln -s ../common/free42.h
+-	ln -s ../common/core_commands1.cc
+-	ln -s ../common/core_commands1.h
+-	ln -s ../common/core_commands2.cc
+-	ln -s ../common/core_commands2.h
+-	ln -s ../common/core_commands3.cc
+-	ln -s ../common/core_commands3.h
+-	ln -s ../common/core_commands4.cc
+-	ln -s ../common/core_commands4.h
+-	ln -s ../common/core_commands5.cc
+-	ln -s ../common/core_commands5.h
+-	ln -s ../common/core_commands6.cc
+-	ln -s ../common/core_commands6.h
+-	ln -s ../common/core_display.cc
+-	ln -s ../common/core_display.h
+-	ln -s ../common/core_globals.cc
+-	ln -s ../common/core_globals.h
+-	ln -s ../common/core_helpers.cc
+-	ln -s ../common/core_helpers.h
+-	ln -s ../common/core_keydown.cc
+-	ln -s ../common/core_keydown.h
+-	ln -s ../common/core_linalg1.cc
+-	ln -s ../common/core_linalg1.h
+-	ln -s ../common/core_linalg2.cc
+-	ln -s ../common/core_linalg2.h
+-	ln -s ../common/core_math1.cc
+-	ln -s ../common/core_math1.h
+-	ln -s ../common/core_math2.cc
+-	ln -s ../common/core_math2.h
+-	ln -s ../common/core_main.cc
+-	ln -s ../common/core_main.h
+-	ln -s ../common/core_phloat.cc
+-	ln -s ../common/core_phloat.h
+-	ln -s ../common/core_sto_rcl.cc
+-	ln -s ../common/core_sto_rcl.h
+-	ln -s ../common/core_tables.cc
+-	ln -s ../common/core_tables.h
+-	ln -s ../common/core_variables.cc
+-	ln -s ../common/core_variables.h
+-	ln -s ../common/shell.h
+-	ln -s ../common/shell_loadimage.cc
+-	ln -s ../common/shell_loadimage.h
+-	ln -s ../common/shell_spool.cc
+-	ln -s ../common/shell_spool.h
+-	ln -s ../common/skin2cc.cc
+-	ln -s ../common/skin2cc.conf
+-	ln -s ../common/keymap2cc.cc
+-	ln -s ../common/bcd.cc
+-	ln -s ../common/bcd.h
+-	ln -s ../common/bcdfloat.cc
+-	ln -s ../common/bcdfloat.h
+-	ln -s ../common/bcdmath.cc
+-	ln -s ../common/bcdmath.h
+-	touch symlinks
+-
+ clean: FORCE
+ 	rm -f `find . -type l` \
+ 		skin2cc skin2cc.exe skins.cc \
+ 		keymap2cc keymap2cc.exe keymap.cc \
+-		*.o *.d *.i *.ii *.s symlinks core.*
++		*.o *.d *.i *.ii *.s core.*
+ 
+ cleaner: FORCE
+ 	rm -f `find . -type l` \
+ 		free42bin free42bin.exe free42dec free42dec.exe \
+ 		skin2cc skin2cc.exe skins.cc \
+ 		keymap2cc keymap2cc.exe keymap.cc \
+-		*.o *.d *.i *.ii *.s symlinks core.*
++		*.o *.d *.i *.ii *.s core.*
+ 
+ FORCE:
+ 
============================================================
--- packages/free42/files/free42-dont-declare-sincos.patch	5e18862aa104d378555e3795e0d218cabe753e80
+++ packages/free42/files/free42-dont-declare-sincos.patch	5e18862aa104d378555e3795e0d218cabe753e80
@@ -0,0 +1,11 @@
+--- free42-orig/common/free42.h	2007-01-06 09:37:50.000000000 -0800
++++ free42gtk/common/free42.h	2007-09-03 22:39:14.000000000 -0700
+@@ -150,7 +150,7 @@
+  * provided by MathLib.
+  */
+ #ifndef PALMOS
+-extern "C" void sincos(double x, double *sinx, double *cosx) HELPERS_SECT;
++
+ #endif
+ //#define NO_SINCOS 1
+ 
============================================================
--- packages/free42/files/free42-vga-skin.patch	303f7bc3ae4924f88ea2694a9a1156f4f783bc97
+++ packages/free42/files/free42-vga-skin.patch	303f7bc3ae4924f88ea2694a9a1156f4f783bc97
@@ -0,0 +1,12 @@
+--- free42-orig/common/skin2cc.conf	2006-03-22 11:33:35.000000000 -0800
++++ free42gtk/common/skin2cc.conf	2007-09-02 23:52:27.000000000 -0700
+@@ -1,4 +1,4 @@
+-skins/Standard
+-Standard
+-skins/Ehrling42sl
+-Realistic
++skins/Ehrling42ssv
++Portrait
++skins/42ct
++Landscape
+
============================================================
--- packages/free42/files/free42dec.desktop	e1163c16c574864f887fa6786337cf60c2da4fac
+++ packages/free42/files/free42dec.desktop	e1163c16c574864f887fa6786337cf60c2da4fac
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Free42
+Comment=RPN Calculator
+Exec=free42dec
+Icon=free42.xpm
+StartupNotify=true
+SingleInstance=true
+Terminal=false
+Type=Application
+Categories=Application
============================================================
--- packages/free42/free42-vga_1.4.36.bb	affee0392f2e9a5336abf00c6e4fd71d74c796cc
+++ packages/free42/free42-vga_1.4.36.bb	affee0392f2e9a5336abf00c6e4fd71d74c796cc
@@ -0,0 +1,44 @@
+DESCRIPTION = "Free42 RPN Calculator"
+SECTION = "openmoko/applications"
+DEPENDS = "gtk+"
+PV = "1.4.36"
+PR = "r1"
+
+SRC_URI = "http://home.planet.nl/~demun000/thomas_projects/free42/free42.tgz \
+           http://sense.net/zc/free42/42c_skins.tgz \
+           file://free42-bcd-gtk-only.patch;patch=1 \
+           file://free42-vga-skin.patch;patch=1 \
+           file://free42-dont-declare-sincos.patch;patch=1 \
+           file://free42dec.desktop"
+
+S = "${WORKDIR}/free42"
+
+TARGET_CXXFLAGS_append = " -fsigned-char"
+TARGET_CXXFLAGS_append += "-DVERSION=\\"${PV}\\" -DBCD_MATH"
+TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/gtk-2.0"
+TARGET_CXXFLAGS_append += "-I${STAGING_LIBDIR}/gtk-2.0/include"
+TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/cairo"
+TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/glib-2.0"
+TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/pango-1.0"
+TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/atk-1.0"
+
+do_compile() {
+        cp -fv ${S}/common/* ${S}/gtk
+        cp -fv ${S}/ppcskins/Ehrling42ssv.* ${S}/skins/ 
+        cp ${WORKDIR}/42ct.* ${S}/skins/
+        cd ${S}/gtk/
+        ${BUILD_CXX} -o skin2cc skin2cc.cc ${BUILD_CXXFLAGS}
+        ${BUILD_CXX} -o keymap2cc keymap2cc.cc ${BUILD_CXXFLAGS}
+        oe_runmake
+}
+
+do_install() {
+        install -d ${D}${bindir}
+        install -m 0755 ${S}/gtk/free42dec ${D}${bindir}/free42dec
+        install -d ${D}${datadir}/applications
+        install -m 0644 ${WORKDIR}/free42dec.desktop ${D}${datadir}/applications/
+        install -d ${D}${datadir}/pixmaps
+        install -m 0644 ${S}/gtk/icon.xpm ${D}${datadir}/pixmaps/free42.xpm
+}
+
+
============================================================
--- packages/uclibc/bfin-uclibc_svn.bb	1eb6937a681df9e862a1770a754b337f98f02833
+++ packages/uclibc/bfin-uclibc_svn.bb	1eb6937a681df9e862a1770a754b337f98f02833
@@ -0,0 +1,34 @@
+# UCLIBC_BASE should be the latest released revision of uclibc (that way
+# the config files will typically be correct!)  uclibc-cvs takes precedence
+# over uclibc-${UCLIBC_BASE}, if a config file in uclibc-cvs is out of date
+# try removing it
+#
+# UCLIBC_BASE can be set in a distro file, but whether this works depends
+# on whether the base patches apply to the selected (SRCDATE) svn release.
+#
+UCLIBC_BASE ?= "0.9.29"
+PR = "r0"
+PV = "${UCLIBC_BASE}+svnr${SRCREV}"
+
+require uclibc.inc
+
+PROVIDES_append_bfin = " virtual/${TARGET_PREFIX}libc-for-gcc "
+
+#recent versions uclibc require real kernel headers
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_HOST = "bfin.*-uclinux"
+
+#as stated above, uclibc needs real kernel-headers
+#however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking ....
+KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}"
+
+SRC_URI = "svn://sources.blackfin.u%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -r2d2fba06a82095954bfbae27ea7e7024c3604521 -rc3c391eb3a506332e2baf39f0412a362bf17add8
#
# 
# 
# add_dir "packages/gsm/files/fic-gta01"
# 
# add_file "packages/gsm/files/fic-gta01/gsmd"
#  content [4b34b4d0ea3c93fd4db2389a4f1ebd9a7e8c4e22]
# 
# patch "packages/gsm/libgsmd_svn.bb"
#  from [f40a2af6cf0a3f96d564ff62dd07830973d9154a]
#    to [9aa39b60aa04ee474e8c277bf9337a9194ce32a7]
# 
============================================================
--- packages/gsm/files/fic-gta01/gsmd	4b34b4d0ea3c93fd4db2389a4f1ebd9a7e8c4e22
+++ packages/gsm/files/fic-gta01/gsmd	4b34b4d0ea3c93fd4db2389a4f1ebd9a7e8c4e22
@@ -0,0 +1,51 @@
+##!/bin/sh
+#
+# gsmd  This shell script starts and stops gsmd.
+#
+# chkconfig: 345 90 40
+# description: Gsmd manages access to a serial- or USB-connected GSM
+# processname: gsmd
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+
+[ -f /etc/default/rcS ] && . /etc/default/rcS
+[ -f /etc/default/gsmd ] && . /etc/default/gsmd
+
+case "$1" in
+    start)
+        stty -F "$GSM_DEV" -crtscts
+        [ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 )
+        [ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 )
+        [ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 )
+        [ -n "$GSM_RES" ] && ( echo "0" >$GSM_RES; sleep 2 )
+
+        echo -n "Starting GSM daemon: "
+        start-stop-daemon -S -x /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS >/tmp/gsm.log 2>&1 &
+
+        if [ $? = 0 ]; then
+            echo "gsmd."
+        else
+            echo "(failed.)"
+        fi
+        ;;
+    stop)
+        [ -n "$GSM_POW" ] && echo "0" >$GSM_POW
+
+        echo -n "Stopping GSM daemon: "
+        start-stop-daemon -K -x /usr/sbin/gsmd
+        stty -F "$GSM_DEV" -crtscts
+        echo "gsmd."
+        ;;
+    restart|force-reload)
+        $0 stop
+        $0 start
+        exit
+        ;;
+    *)
+        echo "Usage: /etc/init.d/apmd {start|stop|restart|force-reload}"
+        exit 1
+        ;;
+esac
+
+exit 0
+
============================================================
--- packages/gsm/libgsmd_svn.bb	f40a2af6cf0a3f96d564ff62dd07830973d9154a
+++ packages/gsm/libgsmd_svn.bb	9aa39b60aa04ee474e8c277bf9337a9194ce32a7
@@ -1,10 +1,10 @@ PV = "0.1+svnr${SRCREV}"
 DESCRIPTION = "GSM libraries and daemons implementing the 07.10 specification"
 HOMEPAGE = "http://www.openmoko.org"
 LICENSE = "GPL LGPL"
 SECTION = "libs/gsm"
 PROVIDES += "gsmd"
 PV = "0.1+svnr${SRCREV}"
-PR = "r25"
+PR = "r26"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
            file://gsmd \






More information about the Openembedded-commits mailing list