Upgrade dev to 15.01.1 (supports 741v5 and 841v10)

2 files changed, 28 insertions, 8 deletions

diff --git a/build-openwrt-dev.sh b/build-openwrt-dev.sh
index 79ea750..43acdbf 100755
--- a/build-openwrt-dev.sh
+++ b/build-openwrt-dev.sh
@@ -22,8 +22,8 @@ echo -n "$0 - " ; date
 # Directories and source file URL
 BUILD_DIR=${BUILD_DIR:-./build}
 CACHE_DIR=${CACHE_DIR:-.}
-ORIG_TARBALL=OpenWrt-ImageBuilder-15.05-ar71xx-generic.Linux-x86_64.tar.bz2
-ORIG_URL=http://downloads.openwrt.org/chaos_calmer/15.05/ar71xx/generic/$ORIG_TARBALL
+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
 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
@@ -110,6 +110,24 @@ mkdir -p extra_files/etc/config extra_files/etc/dropbear extra_files/etc/hotplug
 # Prepare Openwrt config file #
 ###############################
 
+# Use local replication of repositories
+cat > repositories.conf <<"EOT"
+## Place your custom repositories here, they must match the architecture and version.
+# src/gz chaos_calmer http://downloads.openwrt.org/chaos_calmer/15.05.1/ar71xx/generic/packages
+# src custom file:///usr/src/openwrt/bin/ar71xx/packages
+
+## Remote package repositories
+src/gz chaos_calmer_base http://localhost/openwrt/chaos_calmer/15.05.1/ar71xx/generic/packages/base
+src/gz chaos_calmer_luci http://localhost/openwrt/chaos_calmer/15.05.1/ar71xx/generic/packages/luci
+#src/gz chaos_calmer_packages http://localhost/openwrt/chaos_calmer/15.05.1/ar71xx/generic/packages/packages
+src/gz chaos_calmer_routing http://localhost/openwrt/chaos_calmer/15.05.1/ar71xx/generic/packages/routing
+#src/gz chaos_calmer_telephony http://localhost/openwrt/chaos_calmer/15.05.1/ar71xx/generic/packages/telephony
+#src/gz chaos_calmer_management http://localhost/openwrt/chaos_calmer/15.05.1/ar71xx/generic/packages/management
+
+## This is the local package repository, do not remove!
+src imagebuilder file:packages
+EOT
+
 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
diff --git a/maj/gen-dev.php b/maj/gen-dev.php
index 5226813..29e5848 100644
--- a/maj/gen-dev.php
+++ b/maj/gen-dev.php
@@ -67,10 +67,11 @@ switch ($_POST['profile']) {
 	case 'TLWR740':
 		switch($_POST['revision']) {
 			case '4':
+			case '5':
 				$profile='TLWR740';
-				$revision='4';
-				$user_filename='mise-a-jour-routeur-TLWR740v4.bin';
-				$gen_filename='bin/ar71xx/openwrt-15.05-ar71xx-generic-tl-wr740n-v4-squashfs-factory.bin';
+				$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";
 				break;
 			default:
 				$errors['revision'] = 'Routeur non supporté (' . (isset($_POST['revision'])?$_POST[$index]:'vide') . ')';
@@ -80,11 +81,12 @@ switch ($_POST['profile']) {
 	case 'TLWR841':
 		switch($_POST['revision']) {
 			case '9':
+			case '10':
 				$profile='TLWR841';
-				$revision='9';
+				$revision=$_POST['revision'];
 				//$user_filename='wr841nv9_wr841ndv9_en_3_16_9_up(150310).bin';
-				$user_filename='mise-a-jour-routeur-TLWR841v9.bin';
-				$gen_filename='bin/ar71xx/openwrt-15.05-ar71xx-generic-tl-wr841n-v9-squashfs-factory.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";
 				break;
 			default:
 				$errors['revision'] = 'Routeur non supporté (' . (isset($_POST['revision'])?$_POST[$index]:'vide') . ')';