Skip to content

Commit

Permalink
merge: base: update base-files and basic config
Browse files Browse the repository at this point in the history
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
  • Loading branch information
wigyori authored and nbd168 committed Dec 8, 2017
1 parent 98fb380 commit 34bbbbf
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# See /LICENSE for more information.
#

mainmenu "LEDE Configuration"
mainmenu "OpenWrt Configuration"

config MODULES
option modules
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export TOPDIR LC_ALL LANG TZ

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:

Expand Down
6 changes: 3 additions & 3 deletions README
Original file line number Diff line number Diff line change
@@ -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
configuration for the toolchain and firmware.
Expand All @@ -23,7 +23,7 @@ the lack of case sensitiveness in the file system.


Sunshine!
Your LEDE Community
http://www.lede-project.org
Your OpenWrt Community
http://www.openwrt.org


2 changes: 1 addition & 1 deletion package/base-files/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ define Package/base-files
SECTION:=base
CATEGORY:=Base system
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/
VERSION:=$(PKG_RELEASE)-$(REVISION)
endef
Expand Down
10 changes: 5 additions & 5 deletions package/base-files/files/bin/config_generate
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ generate_static_system() {
uci -q batch <<-EOF
delete system.@system[0]
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].ttylogin='0'
set system.@system[-1].log_size='64'
Expand All @@ -233,10 +233,10 @@ generate_static_system() {
set system.ntp='timeserver'
set system.ntp.enabled='1'
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

if json_is_a system object; then
Expand Down
2 changes: 1 addition & 1 deletion package/base-files/files/etc/init.d/system
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ USE_PROCD=1
validate_system_section()
{
uci_validate_section system system "${1}" \
'hostname:string:lede' \
'hostname:string:OpenWrt' \
'conloglevel:uinteger' \
'buffersize:uinteger' \
'timezone:string:UTC' \
Expand Down
2 changes: 1 addition & 1 deletion package/base-files/files/lib/preinit/10_indicate_preinit
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ preinit_ip() {
preinit_config_board
fi

preinit_net_echo "Doing Lede Preinit\n"
preinit_net_echo "Doing OpenWrt Preinit\n"
}

preinit_ip_deconfig() {
Expand Down
8 changes: 4 additions & 4 deletions package/base-files/image-config.in
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ if VERSIONOPT
config VERSION_DIST
string
prompt "Release distribution"
default "LEDE"
default "OpenWrt"
help
This is the name of the release distribution.
If unspecified, it defaults to OpenWrt.
Expand Down Expand Up @@ -201,13 +201,13 @@ if VERSIONOPT
%c .. Configured release revision code or value of %R, lowercase
%N .. Release name, uppercase
%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
%S .. Target/Subtarget name
%A .. Package architecture
%t .. Build taint flags, e.g. "no-all busybox"
%M .. Manufacturer name or "Lede"
%M .. Manufacturer name or "OpenWrt"
%P .. Product name or "Generic"
%h .. Hardware revision or "v0"

Expand Down
2 changes: 1 addition & 1 deletion scripts/checkpatch.pl
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ sub help {
}

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);
}
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/config/mconf.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
static const char mconf_readme[] = N_(
"Overview\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"
"may be completely removed altogether.\n"
"\n"
Expand Down

0 comments on commit 34bbbbf

Please sign in to comment.