[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-181-gf20c526
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-181-gf20c526
|
From: jscheer <js...@us...> - 2010-12-21 16:15:53
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via f20c526fa0a0845f1a7c0ae2901f57dbde7fbe52 (commit)
from ec77fee42b05d11b6342650c8f970166bfe0fea3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f20c526fa0a0845f1a7c0ae2901f57dbde7fbe52
Author: Jeremie Scheer <jer...@ar...>
Date: Tue Dec 21 17:15:12 2010 +0100
[ROOTFS] Add GPL license to PPS init file S80gpios.
[TEST] Add correct indentations and carriage returns to PPS test script init_wpa.sh.
[U-BOOT] Change Buildroot 2010's U-boot config file with correct rootfs image name.
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/pps/apf27-u-boot-1.3.4.h | 2 +-
target/pps/init/S80gpios | 20 ++++++++
target/pps/scripts/init_wpa.sh | 49 +++++++++-----------
3 files changed, 43 insertions(+), 28 deletions(-)
diff --git a/buildroot/target/device/armadeus/pps/apf27-u-boot-1.3.4.h b/buildroot/target/device/armadeus/pps/apf27-u-boot-1.3.4.h
index 3b47270..e63208f 100644
--- a/buildroot/target/device/armadeus/pps/apf27-u-boot-1.3.4.h
+++ b/buildroot/target/device/armadeus/pps/apf27-u-boot-1.3.4.h
@@ -203,7 +203,7 @@
"download_kernel=tftpboot ${loadaddr} " \
" ${serverpath}${board_name}-linux.bin\0" \
"download_rootfs=tftpboot ${loadaddr} " \
- " ${serverpath}${board_name}-rootfs.arm.ubi\0" \
+ " ${serverpath}${board_name}-rootfs.ubi\0" \
"update_uboot=run download_uboot flash_uboot\0" \
"update_kernel=run download_kernel flash_kernel\0" \
"update_rootfs=run download_rootfs flash_rootfs\0" \
diff --git a/target/pps/init/S80gpios b/target/pps/init/S80gpios
index c760395..cd16dba 100755
--- a/target/pps/init/S80gpios
+++ b/target/pps/init/S80gpios
@@ -1,3 +1,23 @@
+#
+# THE ARMADEUS PROJECT
+#
+# Copyright (C) year The armadeus systems team [Jérémie Scheer]
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+
#!/bin/sh
#
# Script used to configure user space usable GPIOs on PPS
diff --git a/target/pps/scripts/init_wpa.sh b/target/pps/scripts/init_wpa.sh
index 1d31d96..c3637f5 100644
--- a/target/pps/scripts/init_wpa.sh
+++ b/target/pps/scripts/init_wpa.sh
@@ -24,8 +24,9 @@ source /etc/wpa_supplicant/networkConfig
if [ "$SSID" != "" -a "$PSK" != "" ]; then
-#create WPA configuration
-mkdir -p /etc/wpa_supplicant/
+ #create WPA configuration
+ mkdir -p /etc/wpa_supplicant/
+
echo "ctrl_interface=/var/run/wpa_supplicant
ctrl_interface_group=wheel
network={
@@ -37,43 +38,37 @@ pairwise=TKIP
psk=\"$PSK\"
}" > /etc/wpa_supplicant/wpa_supplicant.conf
-#Hardware reset of wi2wi chip
-sh /usr/local/pps/scripts/reset_wi2wi.sh
+ #Hardware reset of wi2wi chip
+ sh /usr/local/pps/scripts/reset_wi2wi.sh
-#Load mmc and libertas modules
-modprobe mxcmmc
-sleep 1
-modprobe libertas_sdio
+ #Load mmc and libertas modules
+ modprobe mxcmmc
+ sleep 1
+ modprobe libertas_sdio
-# shutdown other ports
-ifconfig usb0 down 2>/dev/null
-ifconfig eth0 down 2>/dev/null
-ifconfig usb1 down 2>/dev/null
+ # shutdown other ports
+ ifconfig usb0 down 2>/dev/null
+ ifconfig eth0 down 2>/dev/null
+ ifconfig usb1 down 2>/dev/null
-#Execute Wpa Supplicant
-ifconfig eth1 up
-wpa_supplicant -ieth1 -c /etc/wpa_supplicant/wpa_supplicant.conf -Dwext -B dhclient
+ #Execute Wpa Supplicant
+ ifconfig eth1 up
+ wpa_supplicant -ieth1 -c /etc/wpa_supplicant/wpa_supplicant.conf -Dwext -B dhclient
-ifconfig eth1 192.168.0.251
-sleep 1
-echo -e "\nTo check the wifi port (eth1), please enter the command \"ping 192.168.0.251\" on the host PC\n"
-echo -e "\nTo restart the WPA Supplicant, before entering the command \"sh init_wpa.sh\", or to stop it, run \"sh stop_wpa.sh\"\n"
+ ifconfig eth1 192.168.0.251
+ sleep 1
+ echo -e "\nTo check the wifi port (eth1), please enter the command \"ping 192.168.0.251\" on the host PC\n"
+ echo -e "\nTo restart the WPA Supplicant, before entering the command \"sh init_wpa.sh\", or to stop it, run \"sh stop_wpa.sh\"\n"
else #[ "$SSID" != "" -a "$PSK" != "" ]; print usage
-echo -e '\nThe variables $SSID and $PSK are not initialized in /etc/wpa_supplicant/networkConfig.
-To correctly run WPA Supplicant, you must fill these variables in like this:
-export SSID=mon_ssid
-export PSK=ma_passphrase\n'
+ echo -e '\nThe variables SSID and PSK are not initialized in /etc/wpa_supplicant/networkConfig.\nTo correctly run WPA Supplicant, you must fill these variables in like this:\nexport SSID=mon_ssid\nexport PSK=ma_passphrase\n'
fi
else #[ -f /etc/wpa_supplicant/networkConfig ]; print usage
-echo -e '\nThe file /etc/wpa_supplicant/networkConfig doesnt exist.
-To correctly run WPA Supplicant, you have to create this file and declare the variables $SSID and $PSK like this:
-export SSID=mon_ssid
-export PSK=ma_passphrase\n'
+ echo -e '\nThe file /etc/wpa_supplicant/networkConfig doesnt exist.\nTo correctly run WPA Supplicant, you have to create this file and declare the variables SSID and PSK like this:\nexport SSID=mon_ssid\nexport PSK=ma_passphrase\n'
fi
hooks/post-receive
--
armadeus
|
