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. r4835 - in developers/werner: . wlan-trial
([EMAIL PROTECTED])
2. r4836 - developers/werner/wlan-trial ([EMAIL PROTECTED])
3. r4837 - developers/werner/wlan-trial ([EMAIL PROTECTED])
4. Holger's qtopia repo: Changes to 'master' ([EMAIL PROTECTED])
5. Openmoko's OpenEmbedded repository. This is used to build the
Openmoko distribution: Changes to 'org.openmoko.dev'
([EMAIL PROTECTED])
--- Begin Message ---
Author: werner
Date: 2008-11-27 23:18:43 +0100 (Thu, 27 Nov 2008)
New Revision: 4835
Added:
developers/werner/wlan-trial/
developers/werner/wlan-trial/Makefile
developers/werner/wlan-trial/wlan-trial.init
developers/werner/wlan-trial/wlan-trial.myroot
Log:
Branch myroot customization for WLAN trial images.
Added: developers/werner/wlan-trial/Makefile
===================================================================
--- developers/werner/wlan-trial/Makefile (rev 0)
+++ developers/werner/wlan-trial/Makefile 2008-11-27 22:18:43 UTC (rev
4835)
@@ -0,0 +1,19 @@
+# This is where my kernel lives. Edit or use
+# make KERNEL=/your/kernel/uImage sd
+
+KERNEL=/home/moko/git/ktrack/arch/arm/boot/uImage
+
+.PHONY: all rootfs sd
+
+all:
+ @echo "make what ?" 1>&2
+ @exit 1
+
+rootfs:
+ ../myroot/myroot wlan-trial.myroot
+ ../myroot/mkjffs2
+
+sd:
+ ../myroot/myroot wlan-trial.myroot
+ ../myroot/mkext2
+ ../myroot/mksd -u $(KERNEL)
Added: developers/werner/wlan-trial/wlan-trial.init
===================================================================
--- developers/werner/wlan-trial/wlan-trial.init
(rev 0)
+++ developers/werner/wlan-trial/wlan-trial.init 2008-11-27 22:18:43 UTC
(rev 4835)
@@ -0,0 +1,40 @@
+#!/bin/sh
+PATH=/sbin:/bin/:/usr/bin:/usr/local/bin
+
+# if booting from microSD, rootfs may be read-only
+mount -n -o remount,rw /
+
+ldconfig
+mod_dir=/lib/modules/`uname -r`
+mkdir -p $mod_dir
+touch $mod_dir/modules.dep
+
+# mounts
+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/ttySAC2 c 204 66
+mkdir /dev/pts
+mount -t devpts none /dev/pts
+( udevd --daemon; udevtrigger && udevsettle && /usr/sbin/sshd;
+ echo "<*** System initialization complete ***>" >/dev/console ) &
+
+# 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
+
+# shell
+PS1='con:\w\$ '
+HOME=/home/root
+cd $HOME
+export PS1 HOME
+exec setsid /bin/bash -l </dev/ttySAC2 >/dev/ttySAC2 2>&1
Property changes on: developers/werner/wlan-trial/wlan-trial.init
___________________________________________________________________
Name: svn:executable
+ *
Added: developers/werner/wlan-trial/wlan-trial.myroot
===================================================================
--- developers/werner/wlan-trial/wlan-trial.myroot
(rev 0)
+++ developers/werner/wlan-trial/wlan-trial.myroot 2008-11-27 22:18:43 UTC
(rev 4835)
@@ -0,0 +1,196 @@
+#
+# Werner's customized development root FS.
+#
+# Highlights:
+# - no GUI or fancy system daemons
+# - has lots of exploration tools used (only) for system-level development
+# - wherever possible, installs full versions of programs, not busybox
+#
+
+# ----- paths -----------------------------------------------------------------
+
+
+root
+calypso=http://people.openmoko.org/joerg/calypso_moko_FW/
+my=$SVN/developers/werner
+
+
+# ----- basic setup -----------------------------------------------------------
+
+
+pkg udev procps
+pkg task-proper-tools
+
+# OE.net's talk-proper-tools already has the following packages in
+# task-proper-tools, but OM.org hasn't caught up with it yet
+pkg net-tools iproute2 iputils-ping psmisc debianutils tcptraceroute
+
+pkg grep bash debianutils
+pkg mtd-utils sysfsutils apm
+pkg openssh ntpdate netkit-telnet
+pkg dhcp-client wireless-tools wpa-supplicant
+pkg portmap ppp rsync
+pkg alsa-state alsa-utils-alsamixer alsa-utils-alsactl alsa-utils-aplay
+pkg file
+pkg opkg gzip
+pkg perl python make
+pkg xserver-kdrive-glamo xset xhost xdpyinfo
+
+
+# ----- general exploration tools ---------------------------------------------
+
+
+pkg s3c24xx-gpio
+pkg gdb strace ldd
+
+make -C $my/poke clean all
+cp $my/poke/poke usr/bin
+
+make -C $my/pmu clean all
+cp $my/pmu/pmu usr/bin
+
+make -C $my/wkalrm clean all
+cp $my/wkalrm/wkalrm usr/bin
+
+ln -s /usr/sbin/s3c24xx-gpio usr/bin/gpio
+
+
+# ----- fun with GSM ----------------------------------------------------------
+
+
+pkg $calypso/fluid_0.0+svn20070817-r2_armv4t_eabi.ipk
+pkg cu
+
+#echo "uucp:*:2:2:uucp:/:/bin/true" >>etc/passwd
+#chown 2 dev/ttySAC0
+
+
+# ----- network testing -------------------------------------------------------
+
+
+pkg tcpdump wmiconfig
+
+make -C $my/ttcp clean all
+cp $my/ttcp/ttcp-1.12/ttcp usr/bin
+
+make -C $my/owping clean all
+cp $my/owping/owping usr/bin
+
+cp $my/bin/wlanscan usr/bin
+
+
+# ----- for u-boot ------------------------------------------------------------
+
+
+make -C $SVN/trunk/src/host/envedit clean all
+cp $SVN/trunk/src/host/envedit/envedit usr/bin
+
+cp $my/neobin/envi usr/bin
+
+
+# ----- create /sbin/init -----------------------------------------------------
+
+
+# inspired by kboot's scripts/kboot
+
+cp $my/myroot/werner.init sbin/init
+
+
+# ----- set up sshd -----------------------------------------------------------
+
+# @@@ cache the keys ?
+
+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
+
+
+# ----- enable passwordless SSH entry -----------------------------------------
+
+
+cd home/root
+mkdir .ssh
+chmod 700 .ssh
+cp $HOME/.ssh/id_rsa.pub .ssh/authorized_keys
+root
+
+
+# ----- install things we don't have in the feed yet --------------------------
+
+
+# only df is missing now !
+
+
+# ----- copy configuration files from the host --------------------------------
+
+
+cp /etc/hosts etc/hosts
+cp /etc/services etc/services
+
+# cp /etc/resolv.conf etc/resolv.conf
+
+# prefer to hard-code it here
+
+cat <<EOF >>etc/resolv.conf
+# opendns
+nameserver 208.67.222.222
+nameserver 208.67.220.220
+EOF
+# prevent DHCP from messing with it
+chmod 444 etc/resolv.conf
+
+
+# ----- 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
+
+cat <<EOF >usr/bin/vi
+#!/bin/sh
+/usr/bin/vim "\$@"
+code=\$?
+echo -ne '\e7\e[;r\e8'
+exit \$?
+EOF
+chmod 755 usr/bin/vi
+
+
+# seems that we've reached the limits of the update-alternatives hack ;-)
+
+for n in sbin/*.26; do
+ mv $n sbin/`basename $n .26`
+done
+
+echo "audio:*:10:" >>etc/group
+
+
+# -----------------------------------------------------------------------------
Property changes on: developers/werner/wlan-trial/wlan-trial.myroot
___________________________________________________________________
Name: svn:executable
+ *
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-11-27 23:32:15 +0100 (Thu, 27 Nov 2008)
New Revision: 4836
Modified:
developers/werner/wlan-trial/wlan-trial.myroot
Log:
Adapt rootfs for public WLAN trial.
- wlan-trial.myroot: use customized init script
- wlan-trial.myroot: remove all the GSM, audio, X, and programming stuff
- wlan-trial.myroot: don't grant Werner passwordless entry to the Neos of the
world
- wlan-trial.myroot: don't globally share his hosts file either
- wlan-trial.myroot: removed some speculative comments - we're sure about what
we want here
Modified: developers/werner/wlan-trial/wlan-trial.myroot
===================================================================
--- developers/werner/wlan-trial/wlan-trial.myroot 2008-11-27 22:18:43 UTC
(rev 4835)
+++ developers/werner/wlan-trial/wlan-trial.myroot 2008-11-27 22:32:15 UTC
(rev 4836)
@@ -11,7 +11,6 @@
root
-calypso=http://people.openmoko.org/joerg/calypso_moko_FW/
my=$SVN/developers/werner
@@ -30,18 +29,15 @@
pkg openssh ntpdate netkit-telnet
pkg dhcp-client wireless-tools wpa-supplicant
pkg portmap ppp rsync
-pkg alsa-state alsa-utils-alsamixer alsa-utils-alsactl alsa-utils-aplay
pkg file
pkg opkg gzip
-pkg perl python make
-pkg xserver-kdrive-glamo xset xhost xdpyinfo
# ----- general exploration tools ---------------------------------------------
pkg s3c24xx-gpio
-pkg gdb strace ldd
+pkg strace ldd
make -C $my/poke clean all
cp $my/poke/poke usr/bin
@@ -55,16 +51,6 @@
ln -s /usr/sbin/s3c24xx-gpio usr/bin/gpio
-# ----- fun with GSM ----------------------------------------------------------
-
-
-pkg $calypso/fluid_0.0+svn20070817-r2_armv4t_eabi.ipk
-pkg cu
-
-#echo "uucp:*:2:2:uucp:/:/bin/true" >>etc/passwd
-#chown 2 dev/ttySAC0
-
-
# ----- network testing -------------------------------------------------------
@@ -93,12 +79,11 @@
# inspired by kboot's scripts/kboot
-cp $my/myroot/werner.init sbin/init
+cp $my/wlan-trial/wlan-trial.init sbin/init
# ----- set up sshd -----------------------------------------------------------
-# @@@ cache the keys ?
mkdir -p etc/ssh
ssh-keygen -t rsa1 -f etc/ssh/ssh_host_key -N ""
@@ -110,32 +95,12 @@
mkdir -p var/run/sshd
-# ----- enable passwordless SSH entry -----------------------------------------
-
-
-cd home/root
-mkdir .ssh
-chmod 700 .ssh
-cp $HOME/.ssh/id_rsa.pub .ssh/authorized_keys
-root
-
-
-# ----- install things we don't have in the feed yet --------------------------
-
-
-# only df is missing now !
-
-
# ----- copy configuration files from the host --------------------------------
-cp /etc/hosts etc/hosts
+echo 127.0.0.1 localhost >etc/hosts
cp /etc/services etc/services
-# cp /etc/resolv.conf etc/resolv.conf
-
-# prefer to hard-code it here
-
cat <<EOF >>etc/resolv.conf
# opendns
nameserver 208.67.222.222
@@ -190,7 +155,5 @@
mv $n sbin/`basename $n .26`
done
-echo "audio:*:10:" >>etc/group
-
# -----------------------------------------------------------------------------
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-11-28 03:11:39 +0100 (Fri, 28 Nov 2008)
New Revision: 4837
Added:
developers/werner/wlan-trial/opkg-cache/
Modified:
developers/werner/wlan-trial/Makefile
developers/werner/wlan-trial/wlan-trial.init
developers/werner/wlan-trial/wlan-trial.myroot
Log:
Further customization for WLAN trial.
Modified: developers/werner/wlan-trial/Makefile
===================================================================
--- developers/werner/wlan-trial/Makefile 2008-11-27 22:32:15 UTC (rev
4836)
+++ developers/werner/wlan-trial/Makefile 2008-11-28 02:11:39 UTC (rev
4837)
@@ -1,19 +1,39 @@
# This is where my kernel lives. Edit or use
# make KERNEL=/your/kernel/uImage sd
+VERSION=11-28
+ID=wlan-trial-$(VERSION)
+
KERNEL=/home/moko/git/ktrack/arch/arm/boot/uImage
-.PHONY: all rootfs sd
[EMAIL PROTECTED]
+UPLOAD_DIR=public_html/wlan-trial/.upload
+FINAL_DIR=public_html/wlan-trial/$(VERSION)
+UPLOAD=$(UPLOAD_ACCOUNT):$(UPLOAD_DIR)
+
+.PHONY: all rootfs jffs2 sd
+
all:
@echo "make what ?" 1>&2
@exit 1
-rootfs:
- ../myroot/myroot wlan-trial.myroot
+rootfs: rootfs
+ VERSION=$(VERSION) ../myroot/myroot wlan-trial.myroot
+
+jffs2:
../myroot/mkjffs2
sd:
- ../myroot/myroot wlan-trial.myroot
../myroot/mkext2
../myroot/mksd -u $(KERNEL)
+
+upload:
+ ssh $(UPLOAD_ACCOUNT) test ! -d $(FINAL_DIR)
+ ssh $(UPLOAD_ACCOUNT) rm -rf $(UPLOAD_DIR)
+ ssh $(UPLOAD_ACCOUNT) mkdir -p $(UPLOAD_DIR)
+ scp root.jffs2 $(UPLOAD)/$(ID).jffs2
+ scp $(KERNEL) $(UPLOAD)/$(ID).uImage
+ bzip2 -9 <sd_image | \
+ ssh $(UPLOAD_ACCOUNT) "cat >$(UPLOAD_DIR)/$(ID).sd_image.bz2"
+ ssh $(UPLOAD_ACCOUNT) mv $(UPLOAD_DIR) $(FINAL_DIR)
Modified: developers/werner/wlan-trial/wlan-trial.init
===================================================================
--- developers/werner/wlan-trial/wlan-trial.init 2008-11-27 22:32:15 UTC
(rev 4836)
+++ developers/werner/wlan-trial/wlan-trial.init 2008-11-28 02:11:39 UTC
(rev 4837)
@@ -14,27 +14,41 @@
mount -t sysfs none /sys
mount -t tmpfs none /tmp
-# devices and sshd
+# devices
mount -t tmpfs none /dev
+mknod /dev/mem c 1 1
mknod /dev/null c 1 3
mknod /dev/tty c 5 0
+mknod /dev/urandom c 1 9
mknod /dev/ttySAC2 c 204 66
mkdir /dev/pts
mount -t devpts none /dev/pts
-( udevd --daemon; udevtrigger && udevsettle && /usr/sbin/sshd;
- echo "<*** System initialization complete ***>" >/dev/console ) &
# 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
+# sshd
+date >/dev/urandom
+/usr/sbin/sshd
+
+# udevd is still needed for MTD and miscellaneous devices (/dev/mem, etc.)
+udevd --daemon
+udevtrigger
+
+cat <<EOF >/etc/motd
+*
+* WLAN Trial System, version `cat /VERSION`
+*
+* (kernel `uname -rv`)
+*
+EOF
+
# shell
PS1='con:\w\$ '
HOME=/home/root
cd $HOME
export PS1 HOME
+cat /etc/motd
exec setsid /bin/bash -l </dev/ttySAC2 >/dev/ttySAC2 2>&1
Modified: developers/werner/wlan-trial/wlan-trial.myroot
===================================================================
--- developers/werner/wlan-trial/wlan-trial.myroot 2008-11-27 22:32:15 UTC
(rev 4836)
+++ developers/werner/wlan-trial/wlan-trial.myroot 2008-11-28 02:11:39 UTC
(rev 4837)
@@ -80,6 +80,7 @@
# inspired by kboot's scripts/kboot
cp $my/wlan-trial/wlan-trial.init sbin/init
+echo $VERSION >VERSION
# ----- set up sshd -----------------------------------------------------------
@@ -92,6 +93,8 @@
echo "sshd:*:1:1:SSH:/:/bin/true" >>etc/passwd
+echo "PermitEmptyPasswords yes" >>etc/ssh/sshd_config
+
mkdir -p var/run/sshd
@@ -155,5 +158,4 @@
mv $n sbin/`basename $n .26`
done
-
# -----------------------------------------------------------------------------
--- End Message ---
--- Begin Message ---
.../phonevendors/ficgta01/vendor_ficgta01.cpp | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
New commits:
commit 2a4c63c26bafd02791769980eb6446e010aecd64
Author: I-Fan, Chen <[EMAIL PROTECTED]>
Date: Fri Nov 28 17:12:37 2008 +0800
remove unnecessary setting of default value.
--- End Message ---
--- Begin Message ---
conf/distro/include/sane-srcrevs.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
New commits:
commit e34bc453af8e6f5083b2d6f9c62d5bdc5da53c49
Author: I-Fan, Chen <[EMAIL PROTECTED]>
Date: Fri Nov 28 17:16:08 2008 +0800
Qtopia: Bump up version.
Adding callVolume in QPhoneProfile and using it.
--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog
