From 9782ca06242668a6013001cdc9e6099771097733 Mon Sep 17 00:00:00 2001 From: Ludovic Pouzenc Date: Sun, 2 Apr 2017 21:21:57 +0200 Subject: Put 15.05.1 in prod --- build-openwrt.sh | 18 +++++++++--------- maj/gen.php | 14 ++++++++------ 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/build-openwrt.sh b/build-openwrt.sh index 1442359..43acdbf 100755 --- a/build-openwrt.sh +++ b/build-openwrt.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 @@ -113,16 +113,16 @@ mkdir -p extra_files/etc/config extra_files/etc/dropbear extra_files/etc/hotplug # 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/ar71xx/generic/packages +# 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/ar71xx/generic/packages/base -src/gz chaos_calmer_luci http://localhost/openwrt/chaos_calmer/15.05/ar71xx/generic/packages/luci -src/gz chaos_calmer_packages http://localhost/openwrt/chaos_calmer/15.05/ar71xx/generic/packages/packages -src/gz chaos_calmer_routing http://localhost/openwrt/chaos_calmer/15.05/ar71xx/generic/packages/routing -src/gz chaos_calmer_telephony http://localhost/openwrt/chaos_calmer/15.05/ar71xx/generic/packages/telephony -src/gz chaos_calmer_management http://localhost/openwrt/chaos_calmer/15.05/ar71xx/generic/packages/management +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 diff --git a/maj/gen.php b/maj/gen.php index 700150a..0bd075a 100644 --- a/maj/gen.php +++ b/maj/gen.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') . ')'; -- cgit v1.1