r4842 - developers/werner/wlan-trial

[werner at docs.openmoko.org]

Author: werner
Date: 2008-12-03 02:20:12 +0100 (Wed, 03 Dec 2008)
New Revision: 4842

Modified:
   developers/werner/wlan-trial/Makefile
   developers/werner/wlan-trial/wlan-trial.init
   developers/werner/wlan-trial/wlan-trial.myroot
Log:
- wlan-trial.myroot: added bind-utils and nano
- wlan-trial.myroot, wlan-trial.init, Makefile: provide detailed kernel version
  information, including git and quilt status



Modified: developers/werner/wlan-trial/Makefile
===================================================================
--- developers/werner/wlan-trial/Makefile	2008-12-02 11:53:05 UTC (rev 4841)
+++ developers/werner/wlan-trial/Makefile	2008-12-03 01:20:12 UTC (rev 4842)
@@ -1,7 +1,7 @@
 # This is where my kernel lives. Edit or use
 # make KERNEL=/your/kernel/uImage sd
 
-VERSION=11-28
+VERSION=12-02
 ID=wlan-trial-$(VERSION)
 
 KERNEL=/home/moko/git/ktrack/arch/arm/boot/uImage
@@ -18,8 +18,11 @@
 	@echo "make what ?" 1>&2
 	@exit 1
 
-rootfs:	rootfs
-	VERSION=$(VERSION) ../myroot/myroot wlan-trial.myroot
+rootfs:
+	{ k=$(KERNEL); while [ ! -d $$k/.git ]; do \
+	  [ -z "$$k" -o "$$k" = / ] && exit 1; \
+	  k=`echo "$$k" | sed 's|/[^/]*$$||'`; done; } && \
+	  VERSION=$(VERSION) KERNEL_DIR=$$k ../myroot/myroot wlan-trial.myroot
 
 jffs2:
 	../myroot/mkjffs2

Modified: developers/werner/wlan-trial/wlan-trial.init
===================================================================
--- developers/werner/wlan-trial/wlan-trial.init	2008-12-02 11:53:05 UTC (rev 4841)
+++ developers/werner/wlan-trial/wlan-trial.init	2008-12-03 01:20:12 UTC (rev 4842)
@@ -39,11 +39,12 @@
 
 cat <<EOF >/etc/motd
 *
-*  WLAN Trial System, version `cat /VERSION`
+*  WLAN Trial System, version `sed '1p;d' /VERSION`
 *
-* (kernel `uname -rv`)
-*
+*  Kernel `uname -rv`,
 EOF
+sed '1d;s/^/*  /' /VERSION >>/etc/motd
+echo '*' >>/etc/motd
 
 # shell
 PS1='con:\w\$ '

Modified: developers/werner/wlan-trial/wlan-trial.myroot
===================================================================
--- developers/werner/wlan-trial/wlan-trial.myroot	2008-12-02 11:53:05 UTC (rev 4841)
+++ developers/werner/wlan-trial/wlan-trial.myroot	2008-12-03 01:20:12 UTC (rev 4842)
@@ -26,10 +26,11 @@
 
 pkg grep bash debianutils
 pkg mtd-utils sysfsutils apm
-pkg openssh ntpdate netkit-telnet
+pkg openssh ntpdate netkit-telnet bind-utils
 pkg dhcp-client wireless-tools wpa-supplicant
 pkg portmap ppp rsync
 pkg file
+pkg nano
 pkg opkg gzip
 
 
@@ -81,6 +82,8 @@
 
 cp $my/wlan-trial/wlan-trial.init sbin/init
 echo $VERSION >VERSION
+GIT_DIR=$KERNEL_DIR/.git git show | sed 1q >>VERSION
+sed 's/^/+ /' $KERNEL_DIR/.pc/applied-patches >>VERSION
 
 
 # ----- set up sshd -----------------------------------------------------------