From 45b05666fb4ac1d935becb5c00c640659597d087 Mon Sep 17 00:00:00 2001 From: Ludovic Pouzenc Date: Sun, 2 Apr 2017 22:03:28 +0200 Subject: Attempt to use 15.05.1 + 9a1fd3e on dev. --- build-openwrt-dev.sh | 59 ++++++++++++++++++++-------------------------------- maj/gen-dev.php | 13 +++++++++--- 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 < extra_files/etc/dropbear/authorized_keys < extra_files/etc/shadow < extra_files/etc/config/upnpd < 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') . ')'; -- cgit v1.1