From 596b105311891024aa1ea9cfa50401ee56e7a9e3 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Fri, 15 Apr 2011 18:48:29 +0200 Subject: fbgui start in inittab & debug mode & udhcpc in external script --- build/rootfs/bin/busybox | Bin 418068 -> 401212 bytes build/rootfs/bin/fbgui | Bin 1198771 -> 2448287 bytes build/rootfs/bin/load_fbgui.sh | 21 ++++++++++ build/rootfs/bin/run_udhcpc.sh | 1 + build/rootfs/etc/fbgui.conf | 7 +++- build/rootfs/etc/inittab | 3 +- build/rootfs/etc/udhcpc.default.script | 10 +++++ build/rootfs/init | 44 ++++++++++++++++----- build/rootfs/lib/libc.so.6 | Bin 1319176 -> 1319176 bytes build/rootfs/lib/libdl.so.2 | Bin 9736 -> 9736 bytes build/rootfs/lib/libgcc_s.so.1 | Bin 116600 -> 120368 bytes build/rootfs/lib/libglib-2.0.so.0 | Bin 0 -> 821768 bytes build/rootfs/lib/libm.so.6 | Bin 149392 -> 149392 bytes build/rootfs/lib/libpcre.so.3 | Bin 0 -> 193860 bytes build/rootfs/lib/libpthread.so.0 | Bin 117105 -> 117105 bytes build/rootfs/lib/librt.so.1 | Bin 30684 -> 30684 bytes build/rootfs/lib/libsysfs.so.2 | Bin 0 -> 42368 bytes build/rootfs/lib/libusb-1.0.so.0 | Bin 0 -> 46592 bytes build/rootfs/serial | 1 + build/rootfs/usr/lib/libQxtCore.so.0 | Bin 0 -> 544564 bytes build/rootfs/usr/lib/libgthread-2.0.so.0 | Bin 0 -> 17940 bytes build/rootfs/usr/lib/libqjson.so.0 | Bin 119896 -> 120800 bytes build/rootfs/usr/lib/libstdc++.so.6 | Bin 975012 -> 975088 bytes .../Trolltech/QtEmbedded-4.7.2/lib/libQtCore.so.4 | Bin 2839412 -> 2798840 bytes .../Trolltech/QtEmbedded-4.7.2/lib/libQtDBus.so.4 | Bin 0 -> 396524 bytes .../Trolltech/QtEmbedded-4.7.2/lib/libQtGui.so.4 | Bin 10305356 -> 9727440 bytes .../QtEmbedded-4.7.2/lib/libQtNetwork.so.4 | Bin 839224 -> 844848 bytes .../QtEmbedded-4.7.2/lib/libQtWebKit.so.4 | Bin 15755348 -> 16009368 bytes .../Trolltech/QtEmbedded-4.7.2/lib/libQtXml.so.4 | Bin 0 -> 215176 bytes .../Trolltech/QtEmbedded-4.7.2/lib/libphonon.so.4 | Bin 0 -> 286020 bytes 30 files changed, 74 insertions(+), 13 deletions(-) create mode 100755 build/rootfs/bin/load_fbgui.sh create mode 100755 build/rootfs/bin/run_udhcpc.sh create mode 100644 build/rootfs/lib/libglib-2.0.so.0 create mode 100644 build/rootfs/lib/libpcre.so.3 create mode 100644 build/rootfs/lib/libsysfs.so.2 create mode 100644 build/rootfs/lib/libusb-1.0.so.0 create mode 100644 build/rootfs/serial create mode 100755 build/rootfs/usr/lib/libQxtCore.so.0 create mode 100644 build/rootfs/usr/lib/libgthread-2.0.so.0 create mode 100755 build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtDBus.so.4 create mode 100755 build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtXml.so.4 create mode 100755 build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libphonon.so.4 (limited to 'build') diff --git a/build/rootfs/bin/busybox b/build/rootfs/bin/busybox index 39c55b3..a67f935 100755 Binary files a/build/rootfs/bin/busybox and b/build/rootfs/bin/busybox differ diff --git a/build/rootfs/bin/fbgui b/build/rootfs/bin/fbgui index c01d9a7..427cd31 100755 Binary files a/build/rootfs/bin/fbgui and b/build/rootfs/bin/fbgui differ diff --git a/build/rootfs/bin/load_fbgui.sh b/build/rootfs/bin/load_fbgui.sh new file mode 100755 index 0000000..f4f2fc1 --- /dev/null +++ b/build/rootfs/bin/load_fbgui.sh @@ -0,0 +1,21 @@ +#!/bin/sh + +export QWS_MOUSE_PROTO=IntelliMouse:/dev/mice +export QWS_KEYBOARD=TTY:/dev/tty0 +fbgui_options="" +[ $(grep -c debug /proc/cmdline) -ge 1 ] && fbgui_options="$fbgui_options -D 1" +/bin/fbgui $fbgui_options 2>/dev/null +[ -f "/tmp/debuglevel" ] && . /tmp/debuglevel + +[ $DEBUGLEVEL -ge 1 ] && /bin/sh + +. /tmp/kclip +kcl=$(cat /tmp/fbgui/kcl) +kcl="$kcl ip=$ip:10.8.4.3:$gateway:$subnet" + +echo "KCL: $kcl" + +echo "\n\n Run kexec" + +kexec -l /tmp/fbgui/kernel --initrd=/tmp/fbgui/initramfs --append="$kcl" +kexec -e diff --git a/build/rootfs/bin/run_udhcpc.sh b/build/rootfs/bin/run_udhcpc.sh new file mode 100755 index 0000000..1a24852 --- /dev/null +++ b/build/rootfs/bin/run_udhcpc.sh @@ -0,0 +1 @@ +#!/bin/sh diff --git a/build/rootfs/etc/fbgui.conf b/build/rootfs/etc/fbgui.conf index 9441b5f..168c1ac 100644 --- a/build/rootfs/etc/fbgui.conf +++ b/build/rootfs/etc/fbgui.conf @@ -1,3 +1,6 @@ [default] -url=http://m.openslx.org/ -downloadDirectory=/downloads +pbs_url=http://132.230.4.27 +download_directory=/tmp/fbgui +update_interval=5 +file_trigger=/tmp/fbgui/trigger +serial_location=/serial diff --git a/build/rootfs/etc/inittab b/build/rootfs/etc/inittab index 5a8a291..f7821c4 100644 --- a/build/rootfs/etc/inittab +++ b/build/rootfs/etc/inittab @@ -1,5 +1,5 @@ -#tty1::respawn:/sbin/getty -n -l /bin/ash 38400 tty1 +tty1::respawn:/bin/load_fbgui.sh tty2::respawn:/sbin/getty -n -l /bin/ash 38400 tty2 tty3::respawn:/sbin/getty -n -l /bin/ash 38400 tty3 tty4::respawn:/sbin/getty -n -l /bin/ash 38400 tty4 @@ -7,3 +7,4 @@ tty5::respawn:/sbin/getty -n -l /bin/ash 38400 tty5 tty6::respawn:/sbin/getty -n -l /bin/ash 38400 tty6 tty7::respawn:/sbin/getty -n -l /bin/ash 38400 tty7 tty8::respawn:/sbin/getty -n -l /bin/ash 38400 tty8 +::once:/bin/run_udhcpc.sh diff --git a/build/rootfs/etc/udhcpc.default.script b/build/rootfs/etc/udhcpc.default.script index 5afaa7a..e4f8539 100755 --- a/build/rootfs/etc/udhcpc.default.script +++ b/build/rootfs/etc/udhcpc.default.script @@ -13,15 +13,22 @@ case $1 in ip addr add $ip/$(ipcalc -s -p $ip $subnet|sed s/.*=//) dev $interface ip route add default via $router + + echo "ip=$ip" > /tmp/kclip + echo "subnet=$subnet" >> /tmp/kclip + echo "broadcast=$broadcast" >> /tmp/kclip + echo "gateway=$router" >> /tmp/kclip # Update resolver configuration file R="" [ -n "$domain" ] && R="domain $domain " + count=1; for i in $dns; do echo "$0: Adding DNS $i" R="${R}nameserver $i " + count=$((count+1)); done if [ -x /sbin/resolvconf ]; then @@ -29,6 +36,9 @@ case $1 in else echo -n "$R" > "$RESOLV_CONF" fi + trigger=$(cat /etc/fbgui.conf | grep file_trigger | cut -d '=' -f2) + + echo "gogo" >> $trigger ;; deconfig) diff --git a/build/rootfs/init b/build/rootfs/init index 04ca3fe..faec9ad 100755 --- a/build/rootfs/init +++ b/build/rootfs/init @@ -23,8 +23,29 @@ EOF mdev -s +export PATH=/bin:/sbin:/usr/bin/:/usr/sbin + export DEBUGLEVEL=0 +read KCMDLINE < /proc/cmdline +export KCMDLINE +# read the system wide initramfs-setup and then the kernel commandline +for opts in ${KCMDLINE} ; do +case ${opts} in + # single token for debugging ... + debug) + DEBUGLEVEL=1 + ;; + # ... or a specified debug level + debug=*) + DEBUGLEVEL=${opts#debug=} + syslogd -C2048 + klogd + ;; +esac +done + + # create basic device files an directories in dev for i in "/dev/mem c 1 1" "/dev/null c 1 3" "/dev/zero c 1 5" \ "/dev/urandom c 1 9" "/dev/kmsg c 1 11" "/dev/tty0 c 4 0" \ @@ -37,7 +58,10 @@ for i in "/dev/mem c 1 1" "/dev/null c 1 3" "/dev/zero c 1 5" \ [ -e $(echo $i | awk ' {print $1}') ] || mknod $i done mkdir -p ${devdir}/pts ${devdir}/shm -export PATH=/bin:/sbin:/usr/bin/:/usr/sbin + +loadkmap < /etc/keymaps/de_DE +echo "1" > /dev/mouse0 +echo "1" > /dev/tty0 echo "Starting shell, leaving it would continue init." getty -i -n -l /bin/cat 38400 tty10 & @@ -60,18 +84,18 @@ ip link set dev lo up ip addr add 127.0.0.1/8 dev lo ip link set dev $nwif up || echo "I did not find any usable network adaptor." -# run udhcpc and start a debug shell if no lease could be obtained -udhcpc -f -n -q -s /etc/udhcpc.default.script -i $nwif 2>/dev/null - -loadkmap < /etc/keymaps/de_DE +echo "/sbin/udhcpc -f -n -q -s /etc/udhcpc.default.script -i $nwif &>/dev/null &" \ + >> /bin/run_udhcpc.sh cat /etc/issue -export QWS_MOUSE_PROTO=MouseMan:/dev/mouse0 +#ntbdate time.uni-freiburg.de -$(/bin/fbgui && /bin/sh ) & +if [ $DEBUGLEVEL -ge 1 ]; then +echo "\$DEBUGLEVEL=$DEBUGLEVEL" > /tmp/debuglevel +echo "starting debug shell: " +/bin/sh +fi +echo "start init" > /dev/klog exec /sbin/init - - -#exec getty -n -l /bin/ash 38400 tty1 diff --git a/build/rootfs/lib/libc.so.6 b/build/rootfs/lib/libc.so.6 index b67439b..381c22f 100755 Binary files a/build/rootfs/lib/libc.so.6 and b/build/rootfs/lib/libc.so.6 differ diff --git a/build/rootfs/lib/libdl.so.2 b/build/rootfs/lib/libdl.so.2 index d103e20..f59835a 100644 Binary files a/build/rootfs/lib/libdl.so.2 and b/build/rootfs/lib/libdl.so.2 differ diff --git a/build/rootfs/lib/libgcc_s.so.1 b/build/rootfs/lib/libgcc_s.so.1 index d98dc71..6725638 100644 Binary files a/build/rootfs/lib/libgcc_s.so.1 and b/build/rootfs/lib/libgcc_s.so.1 differ diff --git a/build/rootfs/lib/libglib-2.0.so.0 b/build/rootfs/lib/libglib-2.0.so.0 new file mode 100644 index 0000000..e934c03 Binary files /dev/null and b/build/rootfs/lib/libglib-2.0.so.0 differ diff --git a/build/rootfs/lib/libm.so.6 b/build/rootfs/lib/libm.so.6 index b6c2c76..9a103ec 100644 Binary files a/build/rootfs/lib/libm.so.6 and b/build/rootfs/lib/libm.so.6 differ diff --git a/build/rootfs/lib/libpcre.so.3 b/build/rootfs/lib/libpcre.so.3 new file mode 100644 index 0000000..5661fff Binary files /dev/null and b/build/rootfs/lib/libpcre.so.3 differ diff --git a/build/rootfs/lib/libpthread.so.0 b/build/rootfs/lib/libpthread.so.0 index b3f574e..94ed81d 100755 Binary files a/build/rootfs/lib/libpthread.so.0 and b/build/rootfs/lib/libpthread.so.0 differ diff --git a/build/rootfs/lib/librt.so.1 b/build/rootfs/lib/librt.so.1 index 0829781..adde6bc 100644 Binary files a/build/rootfs/lib/librt.so.1 and b/build/rootfs/lib/librt.so.1 differ diff --git a/build/rootfs/lib/libsysfs.so.2 b/build/rootfs/lib/libsysfs.so.2 new file mode 100644 index 0000000..4f3e1f4 Binary files /dev/null and b/build/rootfs/lib/libsysfs.so.2 differ diff --git a/build/rootfs/lib/libusb-1.0.so.0 b/build/rootfs/lib/libusb-1.0.so.0 new file mode 100644 index 0000000..6b1b557 Binary files /dev/null and b/build/rootfs/lib/libusb-1.0.so.0 differ diff --git a/build/rootfs/serial b/build/rootfs/serial new file mode 100644 index 0000000..ed93a37 --- /dev/null +++ b/build/rootfs/serial @@ -0,0 +1 @@ +10-20-30-40-50 diff --git a/build/rootfs/usr/lib/libQxtCore.so.0 b/build/rootfs/usr/lib/libQxtCore.so.0 new file mode 100755 index 0000000..ec21c22 Binary files /dev/null and b/build/rootfs/usr/lib/libQxtCore.so.0 differ diff --git a/build/rootfs/usr/lib/libgthread-2.0.so.0 b/build/rootfs/usr/lib/libgthread-2.0.so.0 new file mode 100644 index 0000000..a74e5c5 Binary files /dev/null and b/build/rootfs/usr/lib/libgthread-2.0.so.0 differ diff --git a/build/rootfs/usr/lib/libqjson.so.0 b/build/rootfs/usr/lib/libqjson.so.0 index 2809c3c..8344f7f 100644 Binary files a/build/rootfs/usr/lib/libqjson.so.0 and b/build/rootfs/usr/lib/libqjson.so.0 differ diff --git a/build/rootfs/usr/lib/libstdc++.so.6 b/build/rootfs/usr/lib/libstdc++.so.6 index 9011b9a..621b5f3 100644 Binary files a/build/rootfs/usr/lib/libstdc++.so.6 and b/build/rootfs/usr/lib/libstdc++.so.6 differ diff --git a/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtCore.so.4 b/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtCore.so.4 index 214d046..c77d481 100755 Binary files a/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtCore.so.4 and b/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtCore.so.4 differ diff --git a/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtDBus.so.4 b/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtDBus.so.4 new file mode 100755 index 0000000..48a13dc Binary files /dev/null and b/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtDBus.so.4 differ diff --git a/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtGui.so.4 b/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtGui.so.4 index ab04415..75c5ad2 100755 Binary files a/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtGui.so.4 and b/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtGui.so.4 differ diff --git a/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtNetwork.so.4 b/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtNetwork.so.4 index c530b1e..e3bbb86 100755 Binary files a/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtNetwork.so.4 and b/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtNetwork.so.4 differ diff --git a/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtWebKit.so.4 b/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtWebKit.so.4 index 4e07c2c..759e272 100755 Binary files a/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtWebKit.so.4 and b/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtWebKit.so.4 differ diff --git a/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtXml.so.4 b/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtXml.so.4 new file mode 100755 index 0000000..a283450 Binary files /dev/null and b/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtXml.so.4 differ diff --git a/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libphonon.so.4 b/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libphonon.so.4 new file mode 100755 index 0000000..2a65f89 Binary files /dev/null and b/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libphonon.so.4 differ -- cgit v1.2.3-55-g7522