Attempt to use 15.05.1 + 9a1fd3e on dev.

2 files changed, 33 insertions, 39 deletions

diff --git a/build-openwrt-dev.sh b/build-openwrt-dev.sh
index 43acdbf..bc6194c 100755
--- a/build-openwrt-dev.sh
+++ b/build-openwrt-dev.sh
@@ -22,12 +22,10 @@ echo -n "$0 - " ; date
 # Directories and source file URL
 BUILD_DIR=${BUILD_DIR:-./build}
 CACHE_DIR=${CACHE_DIR:-.}
-ORIG_TARBALL=OpenWrt-ImageBuilder-15.05.1-ar71xx-generic.Linux-x86_64.tar.bz2
-ORIG_URL=http://downloads.openwrt.org/chaos_calmer/15.05.1/ar71xx/generic/$ORIG_TARBALL
+ORIG_TARBALL=OpenWrt-ImageBuilder-9a1fd3e-ar71xx-generic.Linux-x86_64.tar.bz2
+ORIG_URL=http://stg2.chd.sx/openwrt/chaos_calmer/15.05.1/ar71xx/generic/$ORIG_TARBALL
 PACKAGES="luci luci-mod-admin-full ip" # Base packages
 PACKAGES="$PACKAGES luci-i18n-base-en luci-i18n-firewall-en luci-i18n-base-fr luci-i18n-firewall-fr" # internationnalisation
-PACKAGES="$PACKAGES miniupnpd luci-app-upnp luci-i18n-upnp-fr" # Extra packages
-PACKAGES="$PACKAGES kmod-ledtrig-default-on kmod-ledtrig-netdev kmod-ledtrig-timer kmod-ledtrig-usbdev kmod-leds-gpio" # Additionnal kernel modules
 PACKAGES="$PACKAGES -kmod-ppp -kmod-pppoe -kmod-pppox" # Unusefull kernel modules
 PACKAGES="$PACKAGES -luci-proto-ppp -ppp -ppp-mod-pppoe -odhcp6c" # Unusefull packages
 
@@ -82,6 +80,7 @@ esac
 
 wanip6gw=fe80::31
 
+# Sumary for interactive user
 cat <<EOF
 wanip4addr: $wanip4addr
 wanip6addr: $wanip6addr
@@ -132,6 +131,8 @@ cat > extra_files/etc/dropbear/authorized_keys <<EOF
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCuRKy/uRhwFvR3JrCp2NKY0HUPl0m7INUjY9wemmEGA6pSH/9zb+MLX9ZfuDVo6gkMI2YZzdpwAZ7KE2tajDXHHl+KiycY3lcQizgQt3usxf7Eqz3pTWtZBOjrHs3hRloPugg8KXA8Sxko03f68v8lfUw+Kj4LHmnnozJc8Hxde3GjkFbyL9c9Z5rSYG82H217RWaSDnjYso9wyBZYkjTe6vu88fWls3+ZL8p8NdrgqMFO7C+zV38Mgk/G3PkC9SYdobgy58Cm/06jehWonuafZ6bXTH1J3qjogbcGfewNx4H4E7Lf1nl6UTdbAC24tZu3c/UXZQzND+yRRK1r0zen lpouzenc@ttn
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDpqlz2pyiBoGnC7FgnyXrb012hnnLFL0I0RColS/fLzJT4VL8t3/hPFy/Jbl4tX28Yw5G+Mc0WFzZ+KS1ebmYqBcXi2OGNm65HGsEMGUa+67g8PP0t+2OPRN05gFR4Cf4HFro3FdDf/R4mZOf5+Z1Z8fAyIhQ34x/0sl+hnt/nqbOdNlOSqzqyQmmKtzUKSh2CiffajAW/sVfD3HAG1CCiy+Z88df1v7kQ/HdFhFqtjcHrWLO/zgQBOCf3SMrZpead1B13DXCQLMeI98i+VIRB+K6c71FMIGU1Ohp5/FRWtHJ+3nFqRsKOWbBI0SmeMnz9wXkG7FQ2CaDUvg7vB0AZ cyril@cyril-master
 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAtfZ7UcydNGf5vpLgfvJRHs6Q08qKP1fIr8aXALg0+/pAlF5FEKMqwERpJ+B8YTmJl0MrrznPLPOUoaYqgJl5aqFww0zDNpbbtW6qDoQE85VRjEmchfbLae8s9q6eWW+CfNh0+7bwBPNTaPVq/FKfge4aR0GwA+ggzS9kPoLRPBM= nicolas@selenimh
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDCnkhcQ/nU9Hg89N7PHERLzEhZ68xnOkA4Vt2Tr6PFjsnOVECAaRc2dSFyB4Y7Q+R15UtXcHVVGXI99dJvI/sYS6x1WB86c61ZvcozEglJRMgyaoDD19kPHa8tMeARH9PKCII1amLcOov7/VjGUl9KzJl0HQHp5bFSqsiKvAlu60RvYY7+ktI8qKpZ1UV79K6fNyM792lAFpHT1hk8zzkUDw55VgEd2q4idmaTEbNHjHMsBV0W2zRN+/Ww9jlqQzTtnHkrbI2qw37y9jjUYrks0WKekeazN2E2t7XkyAzrJIKEG3atXgQMF2q2NN01MltpYqs4lzXXuOun8IqDiuSf samylaptop@samylaptop
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCukL8Bb4dOJik6Vu/GOw7s7fyOLQXTK2O4jgUY/D/x/o5Gn/fmmDYsZtvPNhjpJ4oS8GFSBvUart0iKMFomiBeonbaR93pS5utcF/ySAOrc+1PMxgDMuq0r5KTt0tWG/XCFzFXZwF+Rhe6KsHAOIStXRh4TYhY60pJD2RQLCp4GHETWDw7E0Rqi7ccDWYS/Y1S0/hQTLdzY07CDZinU+w/J6fRzc4OThE+u01JlkCE2tQXnq0zU3SpMuJb0bl66QfP4VSh+xFjtd7LpHpWM5ZNEml+oZkBX6mloqkbOx8Nt1+ChtS7S0AwpEEFbN5xrhQZNFYtADnJviQArr3n4ZQj0Erfl5Eny6VZ/suN0jW/ZRNt/3lBUIkggiGPRIYTDsr2bVBapofriXSgUgDOZ4yBcqoKFN2PcLVVqNNs/38zmMPQHc88rftagsge6upfLc7VqjCnTT88zfV7q7q24idio3xtX3ajwtQxq4k3m3aM/hQobjY0SGGjIs1KPhBLuL7eNJKypqLCGJVuqOULoiQnbFE4lVjasIhQE/MhPGBDIR8MimMTsjGf/7n75sLcGD6M/XE27FYwQBLtNTyBVjZ2ntoAT7yRmZE/xuFWkmlUusPce9kPlX83Qx1uhpPFd3R5cBn31rzQxINKVXT1c3dX68aH+IbS5tBU19PpdNuRtw== julien@nuc01
 EOF
 
 cat > extra_files/etc/shadow <<EOF
@@ -364,32 +365,6 @@ config include
 	option path '/etc/firewall.user'
 EOF
 
-cat > extra_files/etc/config/upnpd <<EOF
-config upnpd 'config'
-	option download '1024'
-	option upload '512'
-	option internal_iface 'lan'
-	option port '5000'
-	option upnp_lease_file '/var/upnp.leases'
-	option uuid 'acae4394-2186-4d96-92d1-b2c8d0819f37'
-	option enable_upnp '0'
-	option enable_natpmp '0'
-
-config perm_rule
-	option action 'allow'
-	option ext_ports '1024-65535'
-	option int_addr '0.0.0.0/0'
-	option int_ports '1024-65535'
-	option comment 'Allow high ports'
-
-config perm_rule
-	option action 'deny'
-	option ext_ports '0-65535'
-	option int_addr '0.0.0.0/0'
-	option int_ports '0-65535'
-	option comment 'Default deny'
-EOF
-
 cat > extra_files/etc/hotplug.d/button/01onoff <<"EOF"
 #!/bin/sh
 
@@ -401,15 +376,27 @@ cat > extra_files/etc/hotplug.d/button/01onoff <<"EOF"
 }
 EOF
 
+cat > extra_files/etc/banner <<"EOF"
+  _______                     ________        __
+ |       |.-----.-----.-----.|  |  |  |.----.|  |_
+ |   -   ||  _  |  -__|     ||  |  |  ||   _||   _|
+ |_______||   __|_____|__|__||________||__|  |____|
+          |__| W I R E L E S S   F R E E D O M
+ -----------------------------------------------------
+ CHAOS CALMER (15.05.1, 9a1fd3e 2017-03-09)
+ -----------------------------------------------------
+  * 1 1/2 oz Gin            Shake with a glassful
+  * 1/4 oz Triple Sec       of broken ice and pour
+  * 3/4 oz Lime Juice       unstrained into a goblet.
+  * 1 1/2 oz Orange Juice
+  * 1 tsp. Grenadine Syrup
+ -----------------------------------------------------
+EOF
+
 #######################
 # Build Openwrt image #
 #######################
 
-# Bug fix for RC3 (make clean forget things)
-#if [ -d $BUILD_DIR/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/tmp ]
-#then	rm -r $BUILD_DIR/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/tmp
-#fi
-
 make clean
 make image PROFILE=$profile PACKAGES="$PACKAGES" FILES="extra_files/"
 res=$?
@@ -417,7 +404,7 @@ res=$?
 echo
 if [ $res -eq 0 ]
 then	echo "Image ready: "
-	ls -la bin/ar71xx/openwrt-*-ar71xx-generic-tl-*-v[49]-squashfs-*
+	ls -la bin/ar71xx/openwrt-*-ar71xx-generic-tl-*-v*-squashfs-*
 	echo
 else	echo "Something went wrong, sorry"
 fi
diff --git a/maj/gen-dev.php b/maj/gen-dev.php
index 29e5848..b74bdd5 100644
--- a/maj/gen-dev.php
+++ b/maj/gen-dev.php
@@ -66,12 +66,19 @@ $res &= checksame('key1', 'key2', 'Les mots de passes ne correspondent pas', $er
 switch ($_POST['profile']) {
 	case 'TLWR740':
 		switch($_POST['revision']) {
+			case '51':
+				$profile='TLWR740';
+				$revision=5;
+				$user_filename="mise-a-jour-routeur-TLWR740v$revision.bin";
+				$gen_filename="bin/ar71xx/openwrt-9a1fd3e-ar71xx-generic-tl-wr740n-v$revision-squashfs-factory.bin";
+				break;
 			case '4':
 			case '5':
+			case '6':
 				$profile='TLWR740';
 				$revision=$_POST['revision'];
 				$user_filename="mise-a-jour-routeur-TLWR740v$revision.bin";
-				$gen_filename="bin/ar71xx/openwrt-15.05.1-ar71xx-generic-tl-wr740n-v$revision-squashfs-factory.bin";
+				$gen_filename="bin/ar71xx/openwrt-9a1fd3e-ar71xx-generic-tl-wr740n-v$revision-squashfs-factory.bin";
 				break;
 			default:
 				$errors['revision'] = 'Routeur non supporté (' . (isset($_POST['revision'])?$_POST[$index]:'vide') . ')';
@@ -82,11 +89,11 @@ switch ($_POST['profile']) {
 		switch($_POST['revision']) {
 			case '9':
 			case '10':
+			case '11':
 				$profile='TLWR841';
 				$revision=$_POST['revision'];
-				//$user_filename='wr841nv9_wr841ndv9_en_3_16_9_up(150310).bin';
 				$user_filename="mise-a-jour-routeur-TLWR841v$revision.bin";
-				$gen_filename="bin/ar71xx/openwrt-15.05.1-ar71xx-generic-tl-wr841n-v$revision-squashfs-factory.bin";
+				$gen_filename="bin/ar71xx/openwrt-9a1fd3e-ar71xx-generic-tl-wr841n-v$revision-squashfs-factory.bin";
 				break;
 			default:
 				$errors['revision'] = 'Routeur non supporté (' . (isset($_POST['revision'])?$_POST[$index]:'vide') . ')';