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. r4792 - developers/werner/myroot ([EMAIL PROTECTED])
   3. r4793 - developers/werner/myroot ([EMAIL PROTECTED])
   4. r4794 - in developers/werner/fake-calup: . bin
      ([EMAIL PROTECTED])
--- Begin Message ---
 packages/tasks/task-openmoko-feed.bb |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

New commits:
commit ce76397b3ad156b1192df9c609bd0111c6260b07
Author: Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Date:   Sun Nov 16 02:50:39 2008 +0100

    tasks-openmoko-feed: Add wget for werner




--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-11-16 06:26:56 +0100 (Sun, 16 Nov 2008)
New Revision: 4792

Modified:
   developers/werner/myroot/README
   developers/werner/myroot/werner
Log:
- go with the flow and use tcptraceroute
- README: removed obsolete work-arounds for (now no longer) missing things



Modified: developers/werner/myroot/README
===================================================================
--- developers/werner/myroot/README     2008-11-15 23:09:39 UTC (rev 4791)
+++ developers/werner/myroot/README     2008-11-16 05:26:56 UTC (rev 4792)
@@ -49,17 +49,6 @@
   will add it to the host's /etc/passwd, not the one in the rootfs.
 
 
-Plugging the holes
-------------------
-
-Some executables are currently missing. They are crudely provided by
-copying items from an existing rootfs image:
-
-wget 
http://downloads.openmoko.org/releases/Om2008.9/Om2008.9-gta02-20080916.rootfs.tar.gz
-mkdir rootfs
-tar xCfz rootfs Om2008.9-gta02-20080916.rootfs.tar.gz
-
-
 Making the filesystem hierarchy
 -------------------------------
 
@@ -104,14 +93,6 @@
 a bit of time. Work is underway to make opkg cache this data.
 
 
-Missing files and packages
---------------------------
-
-For some programs, we only have a busybox version, either because the
-packge with the regular version is not in our feed or because the
-program in question seems to be missing from the package.
-
-
 Postinstall scripts
 -------------------
 

Modified: developers/werner/myroot/werner
===================================================================
--- developers/werner/myroot/werner     2008-11-15 23:09:39 UTC (rev 4791)
+++ developers/werner/myroot/werner     2008-11-16 05:26:56 UTC (rev 4792)
@@ -22,7 +22,7 @@
 pkg udev procps module-init-tools
 pkg coreutils grep sed gawk util-linux bash findutils debianutils psmisc
 pkg mtd-utils sysfsutils apm
-pkg net-tools iproute2 iputils-ping iputils-traceroute6 openssh ntpdate
+pkg net-tools iproute2 iputils-ping tcptraceroute 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




--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-11-16 07:53:30 +0100 (Sun, 16 Nov 2008)
New Revision: 4793

Modified:
   developers/werner/myroot/myroot
Log:
Oops, only worked if started from the "myroot" directory.



Modified: developers/werner/myroot/myroot
===================================================================
--- developers/werner/myroot/myroot     2008-11-16 05:26:56 UTC (rev 4792)
+++ developers/werner/myroot/myroot     2008-11-16 06:53:30 UTC (rev 4793)
@@ -15,7 +15,6 @@
 INSTALL="`which install`"
 
 CWD=$PWD
-restricted_bin=$PWD/restricted_bin
 root=$PWD/root
 
 remove_root=true
@@ -191,6 +190,8 @@
 # them a very limited PATH, containing only update-alternatives.
 #
 
+restricted_bin=$SVN/developers/werner/myroot/restricted_bin
+
 cd "$root/usr/lib/opkg/info"
 MYROOT_ROOT="$root"
 export MYROOT_ROOT




--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-11-16 08:57:38 +0100 (Sun, 16 Nov 2008)
New Revision: 4794

Added:
   developers/werner/fake-calup/calup.init
   developers/werner/fake-calup/calup.myroot
Modified:
   developers/werner/fake-calup/Makefile
   developers/werner/fake-calup/bin/cal-id-file
   developers/werner/fake-calup/bin/calup.sh
Log:
Rootfs for the firmware updater.

- calup.init: /sbin/init
- bin/cal-id-file: we also have names that end in -moko instead of _moko
- bin/calup.sh: xinit removes the PATH, reconstruct it
- calup.myroot: myroot customization script
- Makefile: added target "rootfs" to build a rootfs (root.jffs2)



Modified: developers/werner/fake-calup/Makefile
===================================================================
--- developers/werner/fake-calup/Makefile       2008-11-16 06:53:30 UTC (rev 
4793)
+++ developers/werner/fake-calup/Makefile       2008-11-16 07:57:38 UTC (rev 
4794)
@@ -1,3 +1,5 @@
+.PHONY:        test rootfs
+
 test:
        rm -rf bck
        mkdir -p bck
@@ -3,2 +5,6 @@
        cp current.start current
        PATH=$$PATH:$$PWD/bin calup.sh
+
+rootfs:
+       ../myroot/myroot calup.myroot
+       ../myroot/mkjffs2

Modified: developers/werner/fake-calup/bin/cal-id-file
===================================================================
--- developers/werner/fake-calup/bin/cal-id-file        2008-11-16 06:53:30 UTC 
(rev 4793)
+++ developers/werner/fake-calup/bin/cal-id-file        2008-11-16 07:57:38 UTC 
(rev 4794)
@@ -6,5 +6,5 @@
 # Prints the human-readable name of the GSM firmware in <file>.
 #
 
-id="`basename "$1" | sed 's/^gsm_.*_\(moko[^.]*\)\.m0$/\1/p;d'`"
+id="`basename "$1" | sed 's/^gsm_.*\(moko[^.]*\)\.m0$/\1/p;d'`"
 [ ! -z "$id" ] && echo "$id"

Modified: developers/werner/fake-calup/bin/calup.sh
===================================================================
--- developers/werner/fake-calup/bin/calup.sh   2008-11-16 06:53:30 UTC (rev 
4793)
+++ developers/werner/fake-calup/bin/calup.sh   2008-11-16 07:57:38 UTC (rev 
4794)
@@ -1,5 +1,9 @@
 #!/bin/sh -x
 
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:$HOME/bin
+export PATH
+
+
 # ----- Configuration ---------------------------------------------------------
 
 

Added: developers/werner/fake-calup/calup.init
===================================================================
--- developers/werner/fake-calup/calup.init                             (rev 0)
+++ developers/werner/fake-calup/calup.init     2008-11-16 07:57:38 UTC (rev 
4794)
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+PATH=/sbin:/bin/:/usr/bin:/usr/local/bin:/home/root/bin
+HOME=/home/root
+
+ldconfig
+
+# mounts
+>/etc/fstab
+mount -t proc none /proc
+mount -t sysfs none /sys
+mount -t tmpfs none /tmp
+
+# devices and sshd
+mount -t tmpfs none /dev
+mknod /dev/null c 1 3
+mknod /dev/tty c 5 0
+mknod /dev/tty0 c 4 0
+mknod /dev/ttySAC2 c 204 66
+mkdir /dev/pts
+mount -t devpts none /dev/pts
+
+echo STARTING ... >/dev/tty0
+udevd --daemon
+udevtrigger
+udevsettle
+/usr/sbin/sshd
+
+# network
+ifconfig usb0 192.168.0.202 up
+route add default gw 192.168.0.200
+
+# X
+TSLIB_TSDEVICE=/dev/input/touchscreen0
+export TSLIB_TSDEVICE
+
+cd $HOME
+xinit $HOME/bin/calup.sh -- \
+  /usr/bin/Xglamo -hide-cursor -fp /usr/lib/X11/fonts/100dpi,built-ins
+
+# shell
+PS1='con:\w\$ '
+cd $HOME
+export PS1 HOME
+exec setsid /bin/bash -l </dev/ttySAC2 >/dev/ttySAC2 2>&1


Property changes on: developers/werner/fake-calup/calup.init
___________________________________________________________________
Name: svn:executable
   + *

Added: developers/werner/fake-calup/calup.myroot
===================================================================
--- developers/werner/fake-calup/calup.myroot                           (rev 0)
+++ developers/werner/fake-calup/calup.myroot   2008-11-16 07:57:38 UTC (rev 
4794)
@@ -0,0 +1,140 @@
+#
+# Root FS of the Calypso updater.
+#
+
+
+debug=true
+
+
+# ----- paths -----------------------------------------------------------------
+
+
+root
+calypso=http://people.openmoko.org/joerg/calypso_moko_FW/
+my=$SVN/developers/werner
+wmiconfig=$SVN/trunk/src/target/AR6kSDK.build_sw.18/host/tools/wmiconfig/
+
+
+# ----- basic setup -----------------------------------------------------------
+
+
+pkg udev procps sysfsutils
+pkg coreutils grep sed gawk util-linux bash findutils
+pkg tk python python-tkinter
+pkg xserver-kdrive-glamo xset xinit font-adobe-100dpi
+
+if $debug; then
+    pkg debianutils
+    pkg net-tools
+    pkg openssh vim opkg
+fi
+
+
+# ----- general exploration tools ---------------------------------------------
+
+
+pkg s3c24xx-gpio
+
+ln -s /usr/sbin/s3c24xx-gpio usr/bin/gpio
+
+
+# ----- fun with GSM ----------------------------------------------------------
+
+
+pkg $calypso/fluid_0.0+svn20070817-r2_armv4t_eabi.ipk
+
+
+if $debug; then
+    pkg cu
+fi
+
+
+# ----- set up sshd -----------------------------------------------------------
+
+
+if $debug; then
+    mkdir -p etc/ssh
+    ssh-keygen -t rsa1 -f etc/ssh/ssh_host_key -N ""
+    ssh-keygen -t dsa -f etc/ssh/ssh_host_dsa_key -N "" 
+    ssh-keygen -t rsa -f etc/ssh/ssh_host_rsa_key -N "" 
+
+    echo "sshd:*:1:1:SSH:/:/bin/true" >>etc/passwd
+
+    mkdir -p var/run/sshd
+fi
+
+
+# ----- enable passwordless SSH entry -----------------------------------------
+
+
+if $debug; then
+    cd home/root
+    mkdir .ssh
+    chmod 700 .ssh
+    cp $HOME/.ssh/id_rsa.pub .ssh/authorized_keys
+    root
+fi
+
+
+# ----- shell init ------------------------------------------------------------
+
+
+sed -i 's|/bin/sh|/bin/bash|' etc/passwd
+
+cat <<EOF >home/root/.bash_profile
+[ "\${PS1#con}" = "\$PS1" ] && PS1='ssh:\w\\\$ '
+export PS1
+EOF
+
+
+# ----- save some space -------------------------------------------------------
+
+
+rm usr/lib/opkg/lists/*
+rm -rf usr/share/vim
+
+ln -sf uptime.procps usr/bin/uptime
+
+
+# ----- miscellaneous ---------------------------------------------------------
+
+
+ln -s bash bin/sh
+
+# vim gets a little confused on the console. Fortunately, this is easy to fix:
+# see http://vt100.net/docs/vt102-ug/chapter5.html
+# restore cursor, reset scrolling region, restore cursor
+
+if $debug; then
+    cat <<EOF >usr/bin/vi
+#!/bin/sh
+/usr/bin/vim "\$@"
+code=\$?
+echo -ne '\e7\e[;r\e8'
+exit \$?
+EOF
+    chmod 755 usr/bin/vi
+fi
+
+mkfontdir usr/lib/X11/fonts/100dpi
+mkfontscale usr/lib/X11/fonts/100dpi
+
+
+# ----- installer -------------------------------------------------------------
+
+
+cp $my/fake-calup/calup.init sbin/init
+mkdir -p home/root/bin
+cp $my/fake-calup/bin/* home/root/bin
+
+mkdir home/root/bck
+mkdir home/root/fw
+
+prelude=http://people.openmoko.org/joerg/calypso_moko_FW/
+prelude=$prelude/gsm_ac_gp_fd_pu_em_cph_ds_vc_cal35_ri_36_amd8_ts0
+
+cd ..
+wget -nc $prelude-gta02bv6-moko8.m0
+wget -nc $prelude-moko9-beta1.m0
+cp *.m0 root/home/root/fw/
+cp current.start root/home/root/current


Property changes on: developers/werner/fake-calup/calup.myroot
___________________________________________________________________
Name: svn:executable
   + *




--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog

Reply via email to