Browse Source

merge: base: update base-files and basic config

Signed-off-by: Zoltan HERPAI <[email protected]>
Zoltan HERPAI 8 years ago
parent
commit
34bbbbf9c3

+ 1 - 1
Config.in

@@ -4,7 +4,7 @@
 # See /LICENSE for more information.
 # See /LICENSE for more information.
 #
 #
 
 
-mainmenu "LEDE Configuration"
+mainmenu "OpenWrt Configuration"
 
 
 config MODULES
 config MODULES
 	option modules
 	option modules

+ 1 - 1
Makefile

@@ -14,7 +14,7 @@ export TOPDIR LC_ALL LANG TZ
 
 
 empty:=
 empty:=
 space:= $(empty) $(empty)
 space:= $(empty) $(empty)
-$(if $(findstring $(space),$(TOPDIR)),$(error ERROR: The path to the LEDE directory must not include any spaces))
+$(if $(findstring $(space),$(TOPDIR)),$(error ERROR: The path to the OpenWrt directory must not include any spaces))
 
 
 world:
 world:
 
 

+ 3 - 3
README

@@ -1,4 +1,4 @@
-This is the buildsystem for the LEDE Linux distribution.
+This is the buildsystem for the OpenWrt Linux distribution.
 
 
 Please use "make menuconfig" to choose your preferred
 Please use "make menuconfig" to choose your preferred
 configuration for the toolchain and firmware.
 configuration for the toolchain and firmware.
@@ -23,7 +23,7 @@ the lack of case sensitiveness in the file system.
 
 
 
 
 Sunshine!
 Sunshine!
-	Your LEDE Community
-	http://www.lede-project.org
+	Your OpenWrt Community
+	http://www.openwrt.org
 
 
 
 

+ 1 - 1
package/base-files/Makefile

@@ -34,7 +34,7 @@ define Package/base-files
   SECTION:=base
   SECTION:=base
   CATEGORY:=Base system
   CATEGORY:=Base system
   DEPENDS:=+netifd +libc +procd +jsonfilter +SIGNED_PACKAGES:usign +SIGNED_PACKAGES:lede-keyring +NAND_SUPPORT:ubi-utils +fstools +fwtool
   DEPENDS:=+netifd +libc +procd +jsonfilter +SIGNED_PACKAGES:usign +SIGNED_PACKAGES:lede-keyring +NAND_SUPPORT:ubi-utils +fstools +fwtool
-  TITLE:=Base filesystem for Lede
+  TITLE:=Base filesystem for OpenWrt
   URL:=http://openwrt.org/
   URL:=http://openwrt.org/
   VERSION:=$(PKG_RELEASE)-$(REVISION)
   VERSION:=$(PKG_RELEASE)-$(REVISION)
 endef
 endef

+ 5 - 5
package/base-files/files/bin/config_generate

@@ -223,7 +223,7 @@ generate_static_system() {
 	uci -q batch <<-EOF
 	uci -q batch <<-EOF
 		delete system.@system[0]
 		delete system.@system[0]
 		add system system
 		add system system
-		set system.@system[-1].hostname='LEDE'
+		set system.@system[-1].hostname='OpenWrt'
 		set system.@system[-1].timezone='UTC'
 		set system.@system[-1].timezone='UTC'
 		set system.@system[-1].ttylogin='0'
 		set system.@system[-1].ttylogin='0'
 		set system.@system[-1].log_size='64'
 		set system.@system[-1].log_size='64'
@@ -233,10 +233,10 @@ generate_static_system() {
 		set system.ntp='timeserver'
 		set system.ntp='timeserver'
 		set system.ntp.enabled='1'
 		set system.ntp.enabled='1'
 		set system.ntp.enable_server='0'
 		set system.ntp.enable_server='0'
-		add_list system.ntp.server='0.lede.pool.ntp.org'
-		add_list system.ntp.server='1.lede.pool.ntp.org'
-		add_list system.ntp.server='2.lede.pool.ntp.org'
-		add_list system.ntp.server='3.lede.pool.ntp.org'
+		add_list system.ntp.server='0.openwrt.pool.ntp.org'
+		add_list system.ntp.server='1.openwrt.pool.ntp.org'
+		add_list system.ntp.server='2.openwrt.pool.ntp.org'
+		add_list system.ntp.server='3.openwrt.pool.ntp.org'
 	EOF
 	EOF
 
 
 	if json_is_a system object; then
 	if json_is_a system object; then

+ 1 - 1
package/base-files/files/etc/init.d/system

@@ -7,7 +7,7 @@ USE_PROCD=1
 validate_system_section()
 validate_system_section()
 {
 {
 	uci_validate_section system system "${1}" \
 	uci_validate_section system system "${1}" \
-		'hostname:string:lede' \
+		'hostname:string:OpenWrt' \
 		'conloglevel:uinteger' \
 		'conloglevel:uinteger' \
 		'buffersize:uinteger' \
 		'buffersize:uinteger' \
 		'timezone:string:UTC' \
 		'timezone:string:UTC' \

+ 1 - 1
package/base-files/files/lib/preinit/10_indicate_preinit

@@ -113,7 +113,7 @@ preinit_ip() {
 		preinit_config_board
 		preinit_config_board
 	fi
 	fi
 
 
-	preinit_net_echo "Doing Lede Preinit\n"
+	preinit_net_echo "Doing OpenWrt Preinit\n"
 }
 }
 
 
 preinit_ip_deconfig() {
 preinit_ip_deconfig() {

+ 4 - 4
package/base-files/image-config.in

@@ -158,7 +158,7 @@ if VERSIONOPT
 	config VERSION_DIST
 	config VERSION_DIST
 		string
 		string
 		prompt "Release distribution"
 		prompt "Release distribution"
-		default "LEDE"
+		default "OpenWrt"
 		help
 		help
 			This is the name of the release distribution.
 			This is the name of the release distribution.
 			If unspecified, it defaults to OpenWrt.
 			If unspecified, it defaults to OpenWrt.
@@ -201,13 +201,13 @@ if VERSIONOPT
 			 %c .. Configured release revision code or value of %R, lowercase
 			 %c .. Configured release revision code or value of %R, lowercase
 			 %N .. Release name, uppercase
 			 %N .. Release name, uppercase
 			 %n .. Release name, lowercase
 			 %n .. Release name, lowercase
-			 %D .. Distribution name or "Lede", uppercase
-			 %d .. Distribution name or "lede", lowercase
+			 %D .. Distribution name or "OpenWrt", uppercase
+			 %d .. Distribution name or "openwrt", lowercase
 			 %T .. Target name
 			 %T .. Target name
 			 %S .. Target/Subtarget name
 			 %S .. Target/Subtarget name
 			 %A .. Package architecture
 			 %A .. Package architecture
 			 %t .. Build taint flags, e.g. "no-all busybox"
 			 %t .. Build taint flags, e.g. "no-all busybox"
-			 %M .. Manufacturer name or "Lede"
+			 %M .. Manufacturer name or "OpenWrt"
 			 %P .. Product name or "Generic"
 			 %P .. Product name or "Generic"
 			 %h .. Hardware revision or "v0"
 			 %h .. Hardware revision or "v0"
 
 

+ 1 - 1
scripts/checkpatch.pl

@@ -174,7 +174,7 @@ if ($tree) {
 	}
 	}
 
 
 	if (!defined $root) {
 	if (!defined $root) {
-		print "Must be run from the top-level dir. of a LEDE tree\n";
+		print "Must be run from the top-level dir. of a OpenWrt tree\n";
 		exit(2);
 		exit(2);
 	}
 	}
 }
 }

+ 1 - 1
scripts/config/mconf.c

@@ -25,7 +25,7 @@
 static const char mconf_readme[] = N_(
 static const char mconf_readme[] = N_(
 "Overview\n"
 "Overview\n"
 "--------\n"
 "--------\n"
-"Some LEDE features may be built directly into the image.\n"
+"Some OpenWrt features may be built directly into the image.\n"
 "Some may be made into installable ipkg packages. Some features\n"
 "Some may be made into installable ipkg packages. Some features\n"
 "may be completely removed altogether.\n"
 "may be completely removed altogether.\n"
 "\n"
 "\n"