From d6ee47fa3a415e7b157105b510d207ca344fcd87 Mon Sep 17 00:00:00 2001 From: risci_atom Date: Thu, 28 Oct 2010 11:21:25 +0000 Subject: [PATCH] removed option for free softwtare choice git-svn-id: http://svn.librewrt.org/librewrt@65 d459f2a8-9e7c-4474-95e1-7f88c49cc8e2 --- bright-ben/Config.in | 14 +++++++------- bright-ben/include/download.mk | 2 +- bright-ben/scripts/download.pl | 11 ++--------- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/bright-ben/Config.in b/bright-ben/Config.in index 059b082..e65c197 100644 --- a/bright-ben/Config.in +++ b/bright-ben/Config.in @@ -1,10 +1,10 @@ -# Copyright (C) 2006-2009 OpenWrt.org +# librewrt.org # -# This is free software, licensed under the GNU General Public License v2. +# This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. # -mainmenu "OpenWrt Configuration" +mainmenu "LibreWRT Configuration" config HAVE_DOT_CONFIG bool @@ -118,10 +118,10 @@ menu "Target Images" endmenu -config USE_LIBRE_KERNEL - bool "Use only 100% free software" - depends TARGET_x86 || TARGET_xburst - default y +#config USE_LIBRE_KERNEL +# bool "Use only 100% free software" +# depends TARGET_x86 || TARGET_xburst +# default y menu "Global build settings" diff --git a/bright-ben/include/download.mk b/bright-ben/include/download.mk index ab0341d..9dd26a7 100644 --- a/bright-ben/include/download.mk +++ b/bright-ben/include/download.mk @@ -11,7 +11,7 @@ DOWNLOAD_RDEP=$(STAMP_PREPARED) $(HOST_STAMP_PREPARED) define dl_method $(strip \ $(if $(2),$(2), \ - $(if $(filter @GNOME/% @GNU/% @KERNEL/% @KERNEL_LIBRE/% @SF/% ftp://% http://% file://%,$(1)),default, \ + $(if $(filter @GNOME/% @GNU/% @KERNEL/% @SF/% ftp://% http://% file://%,$(1)),default, \ $(if $(filter git://%,$(1)),git, \ $(if $(filter svn://%,$(1)),svn, \ $(if $(filter cvs://%,$(1)),cvs, \ diff --git a/bright-ben/scripts/download.pl b/bright-ben/scripts/download.pl index 4966943..71899f1 100755 --- a/bright-ben/scripts/download.pl +++ b/bright-ben/scripts/download.pl @@ -135,16 +135,9 @@ foreach my $mirror (@ARGV) { push @mirrors, "ftp://ftp.leo.org/pub/comp/os/unix/gnu/$1"; push @mirrors, "ftp://ftp.digex.net/pub/gnu/$1"; } elsif ($mirror =~ /^\@KERNEL\/(.+)$/) { - push @mirrors, "ftp://ftp.geo.kernel.org/pub/$1"; - push @mirrors, "http://ftp.geo.kernel.org/pub/$1"; - push @mirrors, "ftp://ftp.all.kernel.org/pub/$1"; - push @mirrors, "http://ftp.all.kernel.org/pub/$1"; - push @mirrors, "ftp://ftp.de.kernel.org/pub/$1"; - push @mirrors, "http://ftp.de.kernel.org/pub/$1"; - push @mirrors, "ftp://ftp.fr.kernel.org/pub/$1"; - push @mirrors, "http://ftp.fr.kernel.org/pub/$1"; - } elsif ($mirror =~ /^\@KERNEL_LIBRE\/(.+)$/) { push @mirrors, "http://www.fsfla.org/svnwiki/selibre/linux-libre/$1"; + } #elsif ($mirror =~ /^\@KERNEL_LIBRE\/(.+)$/) { +# push @mirrors, "http://www.fsfla.org/svnwiki/selibre/linux-libre/$1"; } elsif ($mirror =~ /^\@GNOME\/(.+)$/) { push @mirrors, "http://ftp.gnome.org/pub/GNOME/sources/$1"; push @mirrors, "http://ftp.unina.it/pub/linux/GNOME/sources/$1"; -- 2.35.1