Browse Source

merge: base: update base-files and basic config

Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
tags/v18.06.0-rc1
Zoltan HERPAI 2 years ago
committed by Felix Fietkau
parent
commit
34bbbbf9c3
10 changed files with 19 additions and 19 deletions
  1. +1
    -1
      Config.in
  2. +1
    -1
      Makefile
  3. +3
    -3
      README
  4. +1
    -1
      package/base-files/Makefile
  5. +5
    -5
      package/base-files/files/bin/config_generate
  6. +1
    -1
      package/base-files/files/etc/init.d/system
  7. +1
    -1
      package/base-files/files/lib/preinit/10_indicate_preinit
  8. +4
    -4
      package/base-files/image-config.in
  9. +1
    -1
      scripts/checkpatch.pl
  10. +1
    -1
      scripts/config/mconf.c

+ 1
- 1
Config.in View File

@@ -4,7 +4,7 @@
# See /LICENSE for more information.
#

mainmenu "LEDE Configuration"
mainmenu "OpenWrt Configuration"

config MODULES
option modules


+ 1
- 1
Makefile View File

@@ -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:



+ 3
- 3
README View File

@@ -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.
@@ -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



+ 1
- 1
package/base-files/Makefile View File

@@ -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


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

@@ -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'
@@ -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


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

@@ -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' \


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

@@ -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() {


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

@@ -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.
@@ -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"



+ 1
- 1
scripts/checkpatch.pl View File

@@ -174,7 +174,7 @@ if ($tree) {
}

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);
}
}


+ 1
- 1
scripts/config/mconf.c View File

@@ -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"


Loading…
Cancel
Save