Send commitlog mailing list submissions to
commitlog@lists.openmoko.org
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. Openmoko's OpenEmbedded repository. This is used to build the
Openmoko distribution: Changes to 'org.openmoko.dev'
([EMAIL PROTECTED])
2. r4788 - in developers/werner: . fake-calup fake-calup/bin
fake-calup/fw ([EMAIL PROTECTED])
3. r4789 - in developers/werner/fake-calup: . bin
([EMAIL PROTECTED])
4. r4790 - developers/werner/myroot ([EMAIL PROTECTED])
5. r4791 - developers/werner/bin ([EMAIL PROTECTED])
--- Begin Message ---
conf/checksums.ini | 156 ++++++++++++++++++++++++++++
packages/tasks/task-openmoko-feed.bb | 37 +++++++-
packages/xorg-lib/libxfont-native_1.3.0.bb | 1 +
3 files changed, 193 insertions(+), 1 deletions(-)
New commits:
commit 1e40726f07573b5ec3f42c5f331fbef55b248174
Author: Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Date: Sat Nov 15 15:39:58 2008 +0100
task-openmoko-feed: Add a bunch of Xorg server side fonts
These are needed for TKinter and Werner's work. Client side
rendering is overrated anyway, right? *giggles*
commit b02d066a2171d75f9243b177ff429ac661addcac
Author: Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Date: Sat Nov 15 15:38:53 2008 +0100
checksums.ini: Add a bunch of font checksums
This is already in OE and does not need to be merged
commit 717c4ff7d79660d209d2663dc157c2472ee6ebc3
Author: Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Date: Sat Nov 15 02:38:35 2008 +0100
checksums.ini: Add font-isas-misc 1.0.0
commit 6d2f41080cf88edcffc2f81927333f8c768b4a9f
Author: Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Date: Sat Nov 15 02:38:09 2008 +0100
checksums.ini: Add font-ibm-type1 1.0.0
commit ce492ef796322d2892420578cdb53d5bc0cce06f
Author: Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Date: Sat Nov 15 02:37:40 2008 +0100
checksums.ini: Add font-jis-misc 1.0.0
commit 1875fcd5ae4bbb92a0396f10b5ca2b71ee0bb8d5
Author: Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Date: Sat Nov 15 02:37:26 2008 +0100
checksums.ini: Add font-micro-misc 1.0.0
commit fcb194d5100f06384cce222ac4e518ec9f1edbef
Author: Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Date: Sat Nov 15 02:31:39 2008 +0100
checksums.ini: Add font-misc-meltho 1.0.0
commit c70ac500c563b5d3f88574c1e9cdfd672a610aa9
Author: Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Date: Sat Nov 15 02:31:20 2008 +0100
checksums.ini: Add font-misc-ethiopic 1.0.0
commit c21ffe5a55ae91ca67daf1ad80a6d1db07fda0f0
Author: Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Date: Sat Nov 15 02:30:46 2008 +0100
checksums.ini: Add font-misc-cyrillic 1.0.0
commit 6ae813d93a0088056fd3b1ea8c4f75c2135417d4
Author: Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Date: Sat Nov 15 02:30:22 2008 +0100
checksums.ini: Add font-misc-misc 1.0.0
commit efad6189fd5a376c2c002486b166fd6fb7f4acd5
Author: Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Date: Sat Nov 15 02:21:13 2008 +0100
checksums.ini: Add font-schumacher-misc 1.0.0
commit 1226b8e051f10a212e20975ee37f1dd75763bc7a
Author: Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Date: Sat Nov 15 02:18:16 2008 +0100
checksums.ini: Add font-mutt-misc 1.0.0
commit a75e3dccca6df78b4f21e5dc1e31768f2e5c5974
Author: Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Date: Sat Nov 15 02:17:38 2008 +0100
checksums.ini: Add font-screen-cyrillic 1.0.0
commit 149d850fa47a1adb8f57f13355cd4063b181b654
Author: Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Date: Sat Nov 15 02:14:57 2008 +0100
checksums.ini: Add font-sun-misc 1.0.0
commit b3297003b55351ad59054db75f69197c22f0b1b9
Author: Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Date: Sat Nov 15 02:14:30 2008 +0100
checksums.ini: Add font-sony-misc 1.0.0
commit 2242bfe687311a800c7ea8afb7b93fbe9a1adf43
Author: Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Date: Sat Nov 15 02:12:32 2008 +0100
libxfont-native: Do not provide xfont...
The libxfont_1.3.0.bb file is included which is setting PROVIDES
to xfont (it maybe should be xfont) this leads to a native package
providing xfont which can not be right.
commit a67a674cd72b0970fee0be6f59d11c8e62044f15
Author: Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Date: Sat Nov 15 01:39:21 2008 +0100
checksums.ini: Add font-winitzki-cyrillic 1.0.0
commit f4b0e62ac08a23cb67de2136c199217ddfc102a1
Author: Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Date: Sat Nov 15 01:38:44 2008 +0100
checksums.ini: Add font-xfree86-type1 1.0.1
commit be4b261fb34f652baf27a96dc5afb48701644a05
Author: Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Date: Sat Nov 15 01:33:37 2008 +0100
checksums.ini: Add font-alias 1.0.1
commit 87a43954d250b807baab0c68ece67d51c4796332
Author: Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Date: Sat Nov 15 01:31:36 2008 +0100
checksums.ini: Add bdftopcf 1.0.0
commit 5b102941aa0b3cc96407b826b1864d5c8dc66862
Author: Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Date: Sat Nov 15 01:29:01 2008 +0100
checksums.ini: Add font-util 1.0.1
commit 2fe0b67ab776c7a15386136682d01cdfb3385e24
Author: Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Date: Sat Nov 15 01:25:43 2008 +0100
checksums.ini: Add mkfontscale 1.0.5 to it
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-11-15 21:08:34 +0100 (Sat, 15 Nov 2008)
New Revision: 4788
Added:
developers/werner/fake-calup/
developers/werner/fake-calup/Makefile
developers/werner/fake-calup/bin/
developers/werner/fake-calup/bin/cal-backup
developers/werner/fake-calup/bin/cal-flash
developers/werner/fake-calup/bin/cal-id-file
developers/werner/fake-calup/bin/cal-id-installed
developers/werner/fake-calup/bin/cal-poweroff
developers/werner/fake-calup/bin/cal-sum-file
developers/werner/fake-calup/bin/cal-sum-installed
developers/werner/fake-calup/bin/calup.sh
developers/werner/fake-calup/bin/gui.py
developers/werner/fake-calup/current.start
developers/werner/fake-calup/fw/
developers/werner/fake-calup/fw/gsm_blah_moko8.m0
developers/werner/fake-calup/fw/gsm_blah_moko9_beta2.m0
developers/werner/fake-calup/fw/gsm_blah_moko9beta1.m0
Log:
Calypso FW updating environment. (Wrapper script and templates.)
Added: developers/werner/fake-calup/Makefile
===================================================================
--- developers/werner/fake-calup/Makefile (rev 0)
+++ developers/werner/fake-calup/Makefile 2008-11-15 20:08:34 UTC (rev
4788)
@@ -0,0 +1,5 @@
+test:
+ rm -rf bck
+ mkdir -p bck
+ cp current.start current
+ PATH=$$PATH:$$PWD/bin calup.sh
Added: developers/werner/fake-calup/bin/cal-backup
===================================================================
--- developers/werner/fake-calup/bin/cal-backup (rev 0)
+++ developers/werner/fake-calup/bin/cal-backup 2008-11-15 20:08:34 UTC (rev
4788)
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+#
+# cal-backup <file>
+#
+# Backups the current GSM Flash content to <file>
+#
+
+cp current "$1"
+
+exit 0
Property changes on: developers/werner/fake-calup/bin/cal-backup
___________________________________________________________________
Name: svn:executable
+ *
Added: developers/werner/fake-calup/bin/cal-flash
===================================================================
--- developers/werner/fake-calup/bin/cal-flash (rev 0)
+++ developers/werner/fake-calup/bin/cal-flash 2008-11-15 20:08:34 UTC (rev
4788)
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+#
+# cal-flash <file>
+#
+
+Installs the firmware <file> on the Calypso.
+
+echo "$1" >current
+
+exit 0
Property changes on: developers/werner/fake-calup/bin/cal-flash
___________________________________________________________________
Name: svn:executable
+ *
Added: developers/werner/fake-calup/bin/cal-id-file
===================================================================
--- developers/werner/fake-calup/bin/cal-id-file
(rev 0)
+++ developers/werner/fake-calup/bin/cal-id-file 2008-11-15 20:08:34 UTC
(rev 4788)
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+#
+# cal-id-file <file>
+#
+# Prints the human-readable name of the GSM firmware in <file>.
+#
+
+id="`basename "$1" | sed 's/^gsm_.*_\(moko[^.]*\)\.m0$/\1/p;d'`"
+[ ! -z "$id" ] && echo "$id"
Property changes on: developers/werner/fake-calup/bin/cal-id-file
___________________________________________________________________
Name: svn:executable
+ *
Added: developers/werner/fake-calup/bin/cal-id-installed
===================================================================
--- developers/werner/fake-calup/bin/cal-id-installed
(rev 0)
+++ developers/werner/fake-calup/bin/cal-id-installed 2008-11-15 20:08:34 UTC
(rev 4788)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+#
+# cal-id-installed
+#
+# Prints the human-readable name of the current GSM firmware.
+#
+
+cal-id-file "`cat current`"
Property changes on: developers/werner/fake-calup/bin/cal-id-installed
___________________________________________________________________
Name: svn:executable
+ *
Added: developers/werner/fake-calup/bin/cal-poweroff
===================================================================
--- developers/werner/fake-calup/bin/cal-poweroff
(rev 0)
+++ developers/werner/fake-calup/bin/cal-poweroff 2008-11-15 20:08:34 UTC
(rev 4788)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+echo "Powering down."
+
+# /sbin/halt -f
Property changes on: developers/werner/fake-calup/bin/cal-poweroff
___________________________________________________________________
Name: svn:executable
+ *
Added: developers/werner/fake-calup/bin/cal-sum-file
===================================================================
--- developers/werner/fake-calup/bin/cal-sum-file
(rev 0)
+++ developers/werner/fake-calup/bin/cal-sum-file 2008-11-15 20:08:34 UTC
(rev 4788)
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+#
+# cal-sum-file <file>
+#
+# Prints a unique checksum of the firmware file <file>. This number must be
+# identical to the one cal-sum-installed produces for the same firmware.
+#
+
+cal-id-file "$1" | md5sum
Property changes on: developers/werner/fake-calup/bin/cal-sum-file
___________________________________________________________________
Name: svn:executable
+ *
Added: developers/werner/fake-calup/bin/cal-sum-installed
===================================================================
--- developers/werner/fake-calup/bin/cal-sum-installed
(rev 0)
+++ developers/werner/fake-calup/bin/cal-sum-installed 2008-11-15 20:08:34 UTC
(rev 4788)
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+#
+# cal-sum-installed
+#
+# Prints a unique checksum of the installed firmware. This number must be
+# identical to the one cal-sum-file produces for the same firmware.
+#
+
+cat current | md5sum
Property changes on: developers/werner/fake-calup/bin/cal-sum-installed
___________________________________________________________________
Name: svn:executable
+ *
Added: developers/werner/fake-calup/bin/calup.sh
===================================================================
--- developers/werner/fake-calup/bin/calup.sh (rev 0)
+++ developers/werner/fake-calup/bin/calup.sh 2008-11-15 20:08:34 UTC (rev
4788)
@@ -0,0 +1,114 @@
+#!/bin/sh -x
+
+# ----- Configuration ---------------------------------------------------------
+
+
+#FW_DIR=$HOME/fw
+#BCK_DIR=$HOME/bck
+FW_DIR=$PWD/fw
+BCK_DIR=$PWD/bck
+
+
+# ----- Global variables ------------------------------------------------------
+
+
+# Item to add to the list of available firmware images (for unknown installed
+# firmware)
+add=
+
+# Human-readable name of the current firmware.
+curr=
+
+
+# ----- Try to identify the current firmware image ----------------------------
+
+
+identify()
+{
+ local n sum
+
+ add=
+ if ! curr=`cal-sum-installed`; then
+ echo "cannot get checksum of installed firmware" 1>&2
+ exit 1
+ fi
+
+ for n in $FW_DIR/*.m0; do
+ if ! sum=`cal-sum-file "$n"`; then
+ echo "cannot get checksum of $n" 1>&2
+ exit 1
+ fi
+ if [ "$sum" = "$curr" ]; then
+ if ! curr=`cal-id-file "$n"`; then
+ echo "cannot identify $n" 1>&2
+ exit 1
+ fi
+ return
+ fi
+ done
+
+ if ! curr=`cal-id-installed`; then
+ echo "cannot identify installed firmware" 1>&2
+ exit 1
+ fi
+
+ add="$curr"
+}
+
+
+# ----- Run the GUI -----------------------------------------------------------
+
+
+run_gui()
+{
+ local n id
+
+ set -- -t "$title" -c "$curr" -o
+ if [ ! -z "$add" ]; then
+ set -- "$@" "$add" XXX
+ fi
+ for n in $FW_DIR/*.m0; do
+ if ! id=`cal-id-file "$n"`; then
+ echo "cannot identify $n" 1>&2
+ exit 1
+ fi
+ set -- "$@" "$id" "$n"
+ done
+ if ! gui.py "$@"; then
+ echo "gui failed" 2>&1
+ exit 1
+ fi
+}
+
+
+title="GSM FW UPDATER"
+while true; do
+ identify || exit
+
+ cmd=`run_gui` || exit
+ if [ "$cmd" = off ]; then
+ cal-poweroff
+ exit 0
+ fi
+ if [ "${cmd#install }" = "$cmd" ]; then
+ echo "unrecognized command \"$cmd\"" 1>&2
+ exit 1
+ fi
+ file=`echo "${cmd#install }"`
+
+ n=1
+ while [ -e "$BCK_DIR/$n" ]; do
+ n=`expr $n + 1`
+ done
+ if ! cal-backup "$BCK_DIR/$n"; then
+ title="CANNOT BACKUP"
+ continue
+ fi
+
+ if ! cal-flash "$file"; then
+ title="FLASH FAILED"
+ continue
+ fi
+
+ title="FIRMWARE UPDATED"
+done
Property changes on: developers/werner/fake-calup/bin/calup.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: developers/werner/fake-calup/bin/gui.py
===================================================================
--- developers/werner/fake-calup/bin/gui.py (rev 0)
+++ developers/werner/fake-calup/bin/gui.py 2008-11-15 20:08:34 UTC (rev
4788)
@@ -0,0 +1,160 @@
+#!/usr/bin/python
+
+#
+# Usage example:
+#
+# Available images are moko 8-beta3 and moko 9-omega666. The currently
+# installed version is moko 8-beta3.
+#
+# ./gui.py \
+# -t "TITLE" \
+# -o "moko 8-beta3" "my_data/gsm_foo_blah_moko8beta3.m0" \
+# "moko 9-omega666" "my_data/gsm_blargh.m0" \
+# -c "moko 8-beta3"
+#
+# Exits with command on stdout, e.g.,
+# off
+# or
+# install my_data/gsm_blargh.m0
+#
+# The already installed version cannot be selected. Note that, if the currently
+# installed version is not among the list of available items, it is not shown.
+# (So if you want to include it for indication purposes, add it explicitly.)
+#
+# The title can be used to indicate the status of the previous operation, e.g.,
+# -t "FAILED"
+# or
+# -t "UPDATED" (and change -c)
+#
+# Known issues:
+# - there's a "old" and a "new" list. They have no functional differences,
+# except that "old" items are shown before "new" items.
+#
+
+from Tkinter import *
+from sys import argv
+
+font = "-*-helvetica-bold-r-*-*-32-*-*-*-*-*-*-*"
+pady = 24
+
+g_cmd = ""
+g_current = None
+g_but = {}
+
+def mark(button):
+ button.config(bg = "#800080", activebackground = "#800080", state = NORMAL)
+
+def unmark(button):
+ button.config(bg = "black", activebackground = "black", state = NORMAL)
+
+def desarrayize(var):
+ if len(var) == 0:
+ return None
+ if isinstance(var[0], str):
+ return var[0]
+ return var[0][0]
+
+def select(label, arg):
+ global g_cmd, g_current
+ g_cmd = "install "+arg
+ if g_current:
+ unmark(g_current)
+ g_current = g_but[label]
+ mark(g_current)
+ if label == curr:
+ bi.config(state = DISABLED, text = "INSTALLED",
+ bg = "black", activebackground = "black")
+ else:
+ bi.config(state = NORMAL, text = "INSTALL",
+ bg = "red", activebackground = "red")
+
+def power_off():
+ global g_cmd
+ g_cmd = "off"
+ root.quit()
+
+def button(w, label, arg):
+ #f = Frame(w, bg = "black")
+ #l = Label(f, text = type, fg = "white", bg = "green")
+ #l.pack(side = LEFT, expand = 0)
+ #b.pack(expand = 1, fill = "x")
+ b = Button(f, relief = FLAT, anchor = W, text = label,
+ font = font, fg = "white", bg = "black",
+ activeforeground = "white", activebackground = "black",
+ disabledforeground = "yellow",
+ pady = pady, command = lambda: select(label, arg))
+ if label == curr:
+ b.config(fg = "yellow")
+ b.pack(side = TOP, fill = "x")
+ g_but[label] = b
+
+def buttons(w, list):
+ for b in list:
+ button(w, b[0], b[1])
+
+old = []
+new = []
+curr = []
+title = []
+
+# parse command line:
+#
+# -o [label argument] ...
+# -n [label argument] ...
+# -c label
+
+set = new
+for arg in argv[1:]:
+ if arg == "-o":
+ set = old
+ elif arg == "-n":
+ set = new
+ elif arg == "-c":
+ set = curr
+ elif arg == "-t":
+ set = title
+ elif len(set) and isinstance(set[-1], str):
+ set[-1] = (set[-1], arg)
+ else:
+ set.append(arg)
+
+curr = desarrayize(curr)
+title = desarrayize(title)
+
+if title is None:
+ title = "GSM FW UPDATER"
+
+root = Tk()
+root.overrideredirect(1)
+w, h = root.winfo_screenwidth(), root.winfo_screenheight()
+root.geometry("%dx%d+0+0" % (w, h))
+
+f = Frame(root, bg = "black")
+l = Label(f, text = title, fg = "white", bg = "blue", font = font)
+l.pack(expand = 1, fill = "x")
+f.pack(expand = 1, fill = "both")
+
+buttons(f, old)
+buttons(f, new)
+
+fa = Frame(f, bg = "black")
+bi = Button(fa, text = "", width = 9,
+ fg = "white", bg = "black", font = font,
+ activeforeground = "white", activebackground = "black",
+ pady = pady, state = DISABLED, command = root.quit)
+bp = Button(fa, text = "POWER OFF",
+ fg = "white", bg = "blue", font = font,
+ activeforeground = "white", activebackground = "blue",
+ pady = pady, command = power_off)
+bi.pack(side = LEFT)
+bp.pack(side = LEFT)
+
+if curr is not None and curr in g_but:
+ g_current = g_but[curr]
+ mark(g_current)
+ bi.config(text = "INSTALLED")
+
+fa.pack(expand = 1, side = TOP)
+
+root.mainloop()
+print g_cmd
Property changes on: developers/werner/fake-calup/bin/gui.py
___________________________________________________________________
Name: svn:executable
+ *
Added: developers/werner/fake-calup/current.start
===================================================================
--- developers/werner/fake-calup/current.start (rev 0)
+++ developers/werner/fake-calup/current.start 2008-11-15 20:08:34 UTC (rev
4788)
@@ -0,0 +1 @@
+gsm_blabla_moko4.m0
Added: developers/werner/fake-calup/fw/gsm_blah_moko8.m0
===================================================================
Added: developers/werner/fake-calup/fw/gsm_blah_moko9_beta2.m0
===================================================================
Added: developers/werner/fake-calup/fw/gsm_blah_moko9beta1.m0
===================================================================
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-11-15 21:35:55 +0100 (Sat, 15 Nov 2008)
New Revision: 4789
Added:
developers/werner/fake-calup/README
Modified:
developers/werner/fake-calup/bin/cal-backup
developers/werner/fake-calup/bin/cal-flash
developers/werner/fake-calup/bin/cal-sum-installed
Log:
A few small fixes and a README.
Added: developers/werner/fake-calup/README
===================================================================
--- developers/werner/fake-calup/README (rev 0)
+++ developers/werner/fake-calup/README 2008-11-15 20:35:55 UTC (rev 4789)
@@ -0,0 +1,59 @@
+Testing (on the host):
+
+make test
+
+The file "current" contains the currently "installed" firmware.
+
+
+Templates
+---------
+
+bin/cal-id-installed
+ Prints the human-readable name of the current GSM firmware.
+
+bin/cal-id-file <file>
+ Prints the human-readable name of the GSM firmware in <file>.
+
+bin/cal-sum-installed
+ Prints a unique checksum of the installed firmware.
+
+bin/cal-sim-file <file>
+ Prints a unique checksum of the firmware file <file>.
+
+bin/cal-flash <file>
+ Installs the firmware <file> on the Calypso.
+
+bin/cal-backup <file>
+ Backups the current GSM Flash content to <file>
+
+
+Note: the following equalities should hold true:
+
+ foo=`cal-id-file fw/whatever`
+ cal-flash fw/whatever
+ [ $foo = `cal-id-installed` ]
+
+and
+
+ foo=`cal-sum-file fw/whatever`
+ cal-flash fw/whatever
+ [ $foo = `cal-sum-installed` ]
+
+cal-sum-* should compare the file content file cal-id-* can use some
+less reliable mechanism, e.g., the file name or an AT command.
+
+
+Recovery
+--------
+
+There is no automatic way to restore a backup. This is intentional.
+The idea is that the firmware update image contains not only the
+latest firmeware (or maybe even multiple new versions), but also a
+suitably safe fallback firmware, e.g., moko8.
+
+Thus the backup would only be used if there's a problem in the
+flashing process itself or if there is an unexpected incompatibility
+between the phone and even the fallback firmware.
+
+If a backup needs to be restore, we'll have to devise a suitable
+manual procedure.
Modified: developers/werner/fake-calup/bin/cal-backup
===================================================================
--- developers/werner/fake-calup/bin/cal-backup 2008-11-15 20:08:34 UTC (rev
4788)
+++ developers/werner/fake-calup/bin/cal-backup 2008-11-15 20:35:55 UTC (rev
4789)
@@ -7,5 +7,6 @@
#
cp current "$1"
+sync
exit 0
Modified: developers/werner/fake-calup/bin/cal-flash
===================================================================
--- developers/werner/fake-calup/bin/cal-flash 2008-11-15 20:08:34 UTC (rev
4788)
+++ developers/werner/fake-calup/bin/cal-flash 2008-11-15 20:35:55 UTC (rev
4789)
@@ -3,9 +3,10 @@
#
# cal-flash <file>
#
+#
+# Installs the firmware <file> on the Calypso.
+#
-Installs the firmware <file> on the Calypso.
-
echo "$1" >current
exit 0
Modified: developers/werner/fake-calup/bin/cal-sum-installed
===================================================================
--- developers/werner/fake-calup/bin/cal-sum-installed 2008-11-15 20:08:34 UTC
(rev 4788)
+++ developers/werner/fake-calup/bin/cal-sum-installed 2008-11-15 20:35:55 UTC
(rev 4789)
@@ -7,4 +7,4 @@
# identical to the one cal-sum-file produces for the same firmware.
#
-cat current | md5sum
+cal-id-file "`cat current`" | md5sum
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-11-15 23:06:53 +0100 (Sat, 15 Nov 2008)
New Revision: 4790
Modified:
developers/werner/myroot/werner
Log:
Most of my wishes have been granted. Get rid of Busybox now.
Modified: developers/werner/myroot/werner
===================================================================
--- developers/werner/myroot/werner 2008-11-15 20:35:55 UTC (rev 4789)
+++ developers/werner/myroot/werner 2008-11-15 22:06:53 UTC (rev 4790)
@@ -20,9 +20,9 @@
pkg udev procps module-init-tools
-pkg coreutils grep sed gawk util-linux bash findutils
+pkg coreutils grep sed gawk util-linux bash findutils debianutils psmisc
pkg mtd-utils sysfsutils apm
-pkg net-tools iproute openssh ntpdate
+pkg net-tools iproute2 iputils-ping iputils-traceroute6 openssh ntpdate
pkg dhcp-client wireless-tools wpa-supplicant
pkg portmap ppp rsync
pkg alsa-state alsa-utils-alsamixer alsa-utils-alsactl alsa-utils-aplay
@@ -119,20 +119,9 @@
# ----- install things we don't have in the feed yet --------------------------
-# crudely install busybox
+# only df is missing now !
-cp $CWD/rootfs/bin/busybox bin
-ln -s /bin/busybox sbin/ifconfig
-ln -s /bin/busybox sbin/route
-ln -s /bin/busybox bin/ip
-ln -s /bin/busybox bin/ping
-ln -s /bin/busybox bin/tar
-ln -s /bin/busybox bin/df
-ln -s /bin/busybox bin/env
-ln -s /bin/busybox usr/bin/killall
-ln -s /bin/busybox usr/bin/which
-
# ----- copy configuration files from the host --------------------------------
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-11-16 00:09:39 +0100 (Sun, 16 Nov 2008)
New Revision: 4791
Added:
developers/werner/bin/comm3
developers/werner/bin/layout3
developers/werner/bin/work3
Log:
Layout with three long (100 lines) xterms.
Added: developers/werner/bin/comm3
===================================================================
--- developers/werner/bin/comm3 (rev 0)
+++ developers/werner/bin/comm3 2008-11-15 23:09:39 UTC (rev 4791)
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+FONT=6x10
+
+sleep 2
+
+. layout3
+
+xterm -fn $FONT -geometry $X1 -e bash-init 'mutt -f =arm' &
+xterm -fn $FONT -geometry $X2 -e bash-init 'mutt -f =mtd' &
+xterm -fn $FONT -geometry $X3 -e bash-init 'mutt -f =wlan' &
Property changes on: developers/werner/bin/comm3
___________________________________________________________________
Name: svn:executable
+ *
Added: developers/werner/bin/layout3
===================================================================
--- developers/werner/bin/layout3 (rev 0)
+++ developers/werner/bin/layout3 2008-11-15 23:09:39 UTC (rev 4791)
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# source this with
+# . layout3
+
+FONT=6x10
+
+RES="`xdpyinfo | awk '/dimensions:/{print $2}' | sed 1q`"
+case $RES in
+ 1024x600)
+ # not yet
+ ;;
+ 1280x1024)
+ # not yet
+ ;;
+ 1680x1050)
+ X1=80x100+5-5
+ X2=80x100+525-5
+ X3=80x100+1045-5
+ ;;
+ 1600x1200)
+ # not yet
+ ;;
+ *) ;;
+esac
Property changes on: developers/werner/bin/layout3
___________________________________________________________________
Name: svn:executable
+ *
Added: developers/werner/bin/work3
===================================================================
--- developers/werner/bin/work3 (rev 0)
+++ developers/werner/bin/work3 2008-11-15 23:09:39 UTC (rev 4791)
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+FONT=6x10
+
+sleep 2
+
+. layout3
+
+xterm -fn $FONT -geometry $X1 &
+xterm -fn $FONT -geometry $X2 &
+xterm -fn $FONT -geometry $X3 &
Property changes on: developers/werner/bin/work3
___________________________________________________________________
Name: svn:executable
+ *
--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog
