From 3a1d9159e1a22b02f5f3a28ec79e1f4da1f7740e Mon Sep 17 00:00:00 2001 From: Ludovic Pouzenc Date: Wed, 21 Jun 2017 21:40:10 +0200 Subject: Improved previous tries with LEDE - local mirroring of needed .ipk - little improovement of "profile" related legacy code (needs deeper changes) --- build-openwrt-dev.sh | 59 +++++++--------------------------------------- maj/gen-dev.php | 36 ++++++++++++++-------------- mirrorring-bare-minimum.sh | 8 ++++++- 3 files changed, 33 insertions(+), 70 deletions(-) diff --git a/build-openwrt-dev.sh b/build-openwrt-dev.sh index 41e4129..7a897c0 100755 --- a/build-openwrt-dev.sh +++ b/build-openwrt-dev.sh @@ -1,21 +1,23 @@ #!/bin/bash # # Work derived from ./quick_740n_ttn_bb.sh (Laurent Guerby ) +# Renamed from "CHD OpenWRT" to "CHD LEDE" on 2017-06-21 # -# Copyright 2016 Ludovic Pouzenc +# Copyright 2017 Ludovic Pouzenc +# Copyright 2017 Nicolas Goaziou # -# CHD OpenWRT is free software: you can redistribute it and/or modify +# CHD LEDE 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 3 of the License, or # (at your option) any later version. # -# CHD OpenWRT is distributed in the hope that it will be useful, +# CHD LEDE 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 CHD OpenWRT. If not, see . +# along with CHD LEDE. If not, see . # echo -n "$0 - " ; date @@ -99,20 +101,6 @@ if [ ! -f "$BUILD_DIR/Makefile" ]; then wget -O "$CACHE_DIR/$ORIG_TARBALL" "$ORIG_URL" fi tar -x -C "$BUILD_DIR/" --strip-components=1 -f "$CACHE_DIR/$ORIG_TARBALL" - # Hotfix about "logd" package not availble on chaos-calmer -# patch -d "$BUILD_DIR/" -p1 <<"EOT" -# --- a/include/target.mk 2017-04-01 22:00:23.000000000 +0200 -# +++ b/include/target.mk 2017-04-03 20:01:23.620028730 +0200 -# @@ -12,7 +12,7 @@ -# DEVICE_TYPE?=router - -# # Default packages - the really basic set -# -DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools logd -# +DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools -# # For nas targets -# DEFAULT_PACKAGES.nas:=block-mount fdisk lsblk mdadm -# # For router targets -# EOT fi cd "$BUILD_DIR/" || exit 5 @@ -123,23 +111,8 @@ 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 +# Use local replication of repositories +sed --in-place -e 's#downloads.lede-project.org#localhost/lede-project#' repositories.conf cat > extra_files/etc/dropbear/authorized_keys < 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 # diff --git a/maj/gen-dev.php b/maj/gen-dev.php index 70f6966..1283bb4 100644 --- a/maj/gen-dev.php +++ b/maj/gen-dev.php @@ -1,19 +1,23 @@ + * + * Renamed from "CHD OpenWRT" to "CHD LEDE" on 2017-06-21 + * + * Copyright 2016-2017 Ludovic Pouzenc + * Copyright 2017 Nicolas Goaziou * - * CHD OpenWRT is free software: you can redistribute it and/or modify + * CHD LEDE 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 3 of the License, or * (at your option) any later version. * - * CHD OpenWRT is distributed in the hope that it will be useful, + * CHD LEDE 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 CHD OpenWRT. If not, see . + * along with CHD LEDE. If not, see . **/ function validate($regex, $index, $message, &$errors) { @@ -67,20 +71,15 @@ switch ($_POST['profile']) { case 'TLWR740': switch($_POST['revision']) { case '51': - $profile="DEVICE_tl-wr740n-v5"; - $user_filename="mise-a-jour-routeur-TLWR740v5.1.bin"; - $gen_filename="bin/targets/ar71xx/generic/lede-17.01.2-ar71xx-generic-tl-wr740n-v5-squashfs-factory.bin"; + $target="tl-wr740n-v5"; break; case '4': case '5': case '6': - $revision=str_replace('.', '', $_POST['revision']); - $profile="DEVICE_tl-wr740n-v$revision"; - $user_filename="mise-a-jour-routeur-TLWR740v$revision.bin"; - $gen_filename="bin/targets/ar71xx/generic/lede-17.01.2-ar71xx-generic-tl-wr740n-v$revision-squashfs-factory.bin"; + $target="tl-wr740n-v" . $_POST['revision']; break; default: - $errors['revision'] = 'Routeur non supporté (' . (isset($_POST['revision'])?$_POST[$index]:'vide') . ')'; + $errors['revision'] = 'Pas de mise à jour disponible pour l\'instant (' . (isset($_POST['revision'])?$_POST[$index]:'vide') . ')'; $res = false; } break; @@ -89,22 +88,23 @@ switch ($_POST['profile']) { case '9': case '10': case '11': - $revision=$_POST['revision']; - $profile="DEVICE_tl-wr841-v$revision"; - $user_filename="mise-a-jour-routeur-TLWR841v$revision.bin"; - $gen_filename="bin/targets/ar71xx/generic/lede-17.01.2-ar71xx-generic-tl-wr841-v$revision-squashfs-factory.bin"; + $target="tl-wr841-v" . $_POST['revision']; break; default: - $errors['revision'] = 'Routeur non supporté (' . (isset($_POST['revision'])?$_POST[$index]:'vide') . ')'; + $errors['revision'] = 'Pas de mise à jour disponible pour l\'instant (' . (isset($_POST['revision'])?$_POST[$index]:'vide') . ')'; $res = false; } break; default: - $errors['profile'] = 'Routeur non supporté (' . (isset($_POST[$index])?$_POST['profile']:'vide') . ')'; + $errors['profile'] = 'Pas de mise à jour disponible pour l\'instant (' . (isset($_POST[$index])?$_POST['profile']:'vide') . ')'; $res = false; } +$profile="DEVICE_$target"; +$user_filename="mise-a-jour-routeur-$target.bin"; +$gen_filename="bin/targets/ar71xx/generic/lede-17.01.2-ar71xx-generic-$target-squashfs-factory.bin"; + if ( !$res ) { echo "\n\n\n\n\n\n

Oops, une erreur s'est produite

Il y a un problème avec les renseignements fournis
    \n"; foreach ($errors as $k=>$v) { diff --git a/mirrorring-bare-minimum.sh b/mirrorring-bare-minimum.sh index 6a7adaa..ee26af6 100755 --- a/mirrorring-bare-minimum.sh +++ b/mirrorring-bare-minimum.sh @@ -1,6 +1,12 @@ #!/bin/bash -x +#http://downloads.lede-project.org/releases/17.01.2/targets/ar71xx/generic/packages/uboot-envtools_2015.10-1_mips_24kc.ipk +# [133] => Downloading http://downloads.lede-project.org/releases/17.01.2/packages/mips_24kc/luci/luci-i18n-firewall-en_git-17.170.53336-8955523-1_all.ipk + + +mkdir -p /var/www/lede-project/releases/17.01.2/targets/ar71xx/generic/packages/ + cat $(ls -tr /tmp/build-openwrt-dev.sh_* | tail -n1) \ -| sed -ne 's#[^=]\+=> Downloading http://downloads.openwrt.org/\(.*\)\.$#wget http://downloads.openwrt.org/\1 -O /var/www/openwrt/\1#p' \ +| sed -ne 's#[^=]\+=> Downloading http://downloads.lede-project.org/\(.*\)$#d=/var/www/lede-project/$(dirname "\1"); f=$(basename \1); [ -d "$d" ] || mkdir -p "$d"; wget "http://downloads.lede-project.org/\1" -O "$d/$f"#p' \ | cat # | bash -- cgit v1.1