Skip to content

Commit

Permalink
branding: add LEDE branding
Browse files Browse the repository at this point in the history
Signed-off-by: John Crispin <blogic@openwrt.org>
  • Loading branch information
John Crispin committed Mar 24, 2016
1 parent 343c3be commit fa69553
Show file tree
Hide file tree
Showing 40 changed files with 76 additions and 85 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 "OpenWrt Configuration"
mainmenu "LEDE 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 OpenWrt directory must not include any spaces))
$(if $(findstring $(space),$(TOPDIR)),$(error ERROR: The path to the LEDE directory must not include any spaces))

world:

Expand Down
8 changes: 4 additions & 4 deletions README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
This is the buildsystem for the OpenWrt Linux distribution.
This is the buildsystem for the LEDE Linux distribution.

Please use "make menuconfig" to configure your appreciated
configuration for the toolchain and firmware.
Expand All @@ -20,7 +20,7 @@ the kernel and all choosen applications.
You can use "scripts/flashing/flash.sh" for remotely updating your embedded
system via tftp.

The OpenWrt system is documented in docs/. You will need a LaTeX distribution
The LEDE system is documented in docs/. You will need a LaTeX distribution
and the tex4ht package to build the documentation. Type "make -C docs/" to build it.

To build your own firmware you need to have access to a Linux, BSD or MacOSX system
Expand All @@ -29,7 +29,7 @@ the lack of case sensitiveness in the file system.


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


6 changes: 3 additions & 3 deletions include/image.mk
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ endef

define Image/BuildKernel/MkuImage
mkimage -A $(ARCH) -O linux -T kernel -C $(1) -a $(2) -e $(3) \
-n '$(call toupper,$(ARCH)) OpenWrt Linux-$(LINUX_VERSION)' -d $(4) $(5)
-n '$(call toupper,$(ARCH)) LEDE Linux-$(LINUX_VERSION)' -d $(4) $(5)
endef

define Image/BuildKernel/MkFIT
Expand Down Expand Up @@ -303,7 +303,7 @@ define Build/uImage
mkimage -A $(LINUX_KARCH) \
-O linux -T kernel \
-C $(1) -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
-n '$(call toupper,$(LINUX_KARCH)) OpenWrt Linux-$(LINUX_VERSION)' -d $@ $@.new
-n '$(call toupper,$(LINUX_KARCH)) LEDE Linux-$(LINUX_VERSION)' -d $@ $@.new
@mv $@.new $@
endef

Expand All @@ -318,7 +318,7 @@ endef

define Build/netgear-dni
$(STAGING_DIR_HOST)/bin/mkdniimg \
-B $(NETGEAR_BOARD_ID) -v OpenWrt.$(REVISION) \
-B $(NETGEAR_BOARD_ID) -v LEDE.$(REVISION) \
$(if $(NETGEAR_HW_ID),-H $(NETGEAR_HW_ID)) \
-r "$(1)" \
-i $@ -o $@.new
Expand Down
2 changes: 1 addition & 1 deletion include/prereq-build.mk
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ $(eval $(call TestHostCommand,working-make, \
$(MAKE) -v | grep -E 'Make (3\.8[1-9]|3\.9[0-9]|[4-9]\.)'))

$(eval $(call TestHostCommand,case-sensitive-fs, \
OpenWrt can only be built on a case-sensitive filesystem, \
LEDE can only be built on a case-sensitive filesystem, \
rm -f $(TMP_DIR)/test.*; touch $(TMP_DIR)/test.fs; \
test ! -f $(TMP_DIR)/test.FS))

Expand Down
10 changes: 5 additions & 5 deletions include/version.mk
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,22 @@ VERSION_NUMBER:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER))
VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),$(REVISION))

VERSION_CODE:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER))
VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),Bleeding Edge)
VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),HEAD)

VERSION_NICK:=$(call qstrip_escape,$(CONFIG_VERSION_NICK))
VERSION_NICK:=$(if $(VERSION_NICK),$(VERSION_NICK),$(RELEASE))

VERSION_REPO:=$(call qstrip_escape,$(CONFIG_VERSION_REPO))
VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/snapshots/trunk/%S/packages)
VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.lede-project.org/snapshots/trunk/%S/packages)

VERSION_DIST:=$(call qstrip_escape,$(CONFIG_VERSION_DIST))
VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt)
VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),LEDE)

VERSION_MANUFACTURER:=$(call qstrip_escape,$(CONFIG_VERSION_MANUFACTURER))
VERSION_MANUFACTURER:=$(if $(VERSION_MANUFACTURER),$(VERSION_MANUFACTURER),OpenWrt)
VERSION_MANUFACTURER:=$(if $(VERSION_MANUFACTURER),$(VERSION_MANUFACTURER),LEDE)

VERSION_MANUFACTURER_URL:=$(call qstrip_escape,$(CONFIG_VERSION_MANUFACTURER_URL))
VERSION_MANUFACTURER_URL:=$(if $(VERSION_MANUFACTURER_URL),$(VERSION_MANUFACTURER_URL),http://www.openwrt.org/)
VERSION_MANUFACTURER_URL:=$(if $(VERSION_MANUFACTURER_URL),$(VERSION_MANUFACTURER_URL),http://www.lede-project.org/)

VERSION_PRODUCT:=$(call qstrip_escape,$(CONFIG_VERSION_PRODUCT))
VERSION_PRODUCT:=$(if $(VERSION_PRODUCT),$(VERSION_PRODUCT),Generic)
Expand Down
2 changes: 1 addition & 1 deletion package/base-files/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ define Package/base-files
SECTION:=base
CATEGORY:=Base system
DEPENDS:=+netifd +libc +procd +jsonfilter +SIGNED_PACKAGES:usign +fstools
TITLE:=Base filesystem for OpenWrt
TITLE:=Base filesystem for Lede
URL:=http://openwrt.org/
VERSION:=$(PKG_RELEASE)-$(REVISION)
endef
Expand Down
23 changes: 10 additions & 13 deletions package/base-files/files/etc/banner
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
_______ ________ __
| |.-----.-----.-----.| | | |.----.| |_
| - || _ | -__| || | | || _|| _|
|_______|| __|_____|__|__||________||__| |____|
|__| W I R E L E S S F R E E D O M
-----------------------------------------------------
DESIGNATED DRIVER (%C, %R)
-----------------------------------------------------
* 2 oz. Orange Juice Combine all juices in a
* 2 oz. Pineapple Juice tall glass filled with
* 2 oz. Grapefruit Juice ice, stir well.
* 2 oz. Cranberry Juice
-----------------------------------------------------
_________
/ /\ _ ___ ___ ___
/ LE / \ | | | __| \| __|
/ DE / \ | |__| _|| |) | _|
/________/ LE \ |____|___|___/|___| lede-project.org
\ \ DE /
\ LE \ / -----------------------------------------------------------
\ DE \ / Reboot (%C, %R)
\________\/ -----------------------------------------------------------

2 changes: 1 addition & 1 deletion package/base-files/files/etc/config/system
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
config system
option hostname OpenWrt
option hostname lede
option timezone UTC

config timeserver ntp
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:OpenWrt' \
'hostname:string:lede' \
'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 @@ -39,7 +39,7 @@ preinit_echo() {
}

pi_indicate_preinit() {
preinit_net_echo "Doing OpenWrt Preinit\n"
preinit_net_echo "Doing Lede Preinit\n"
set_state preinit
}

Expand Down
14 changes: 7 additions & 7 deletions package/base-files/image-config.in
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ if VERSIONOPT
config VERSION_DIST
string
prompt "Release distribution"
default "OpenWrt"
default "Lede"
help
This is the name of the release distribution.
If unspecified, it defaults to OpenWrt.
Expand All @@ -170,23 +170,23 @@ if VERSIONOPT
config VERSION_REPO
string
prompt "Release repository"
default "http://downloads.openwrt.org/snapshots/trunk/%S/packages"
default "http://downloads.lede-project.org/snapshots/trunk/%S/packages"
help
This is the repository address embedded in the image, it defaults
to the trunk snapshot repo; the url may contain the following placeholders:
%R .. Revision number
%V .. Release version or revision number, uppercase
%v .. Release version or revision number, lowercase
%C .. Release version or "Bleeding Edge", uppercase
%c .. Release version or "bleeding_edge", lowercase
%C .. Release version or "HEAD", uppercase
%c .. Release version or "head", lowercase
%N .. Release name, uppercase
%n .. Release name, lowercase
%D .. Distribution name or "OpenWrt", uppercase
%d .. Distribution name or "openwrt", lowercase
%D .. Distribution name or "Lede", uppercase
%d .. Distribution name or "lede", lowercase
%T .. Target name
%S .. Target/Subtarget name
%t .. Build taint flags, e.g. "no-all busybox"
%M .. Manufacturer name or "OpenWrt"
%M .. Manufacturer name or "Lede"
%P .. Product name or "Generic"
%h .. Hardware revision or "v0"

Expand Down
2 changes: 1 addition & 1 deletion package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ config wifi-iface
option device wl${i}
option network lan
option mode ap
option ssid OpenWrt${i#0}
option ssid Lede${i#0}
option encryption none
EOF
Expand Down
2 changes: 1 addition & 1 deletion package/kernel/hostap-driver/files/lib/wifi/hostap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ config wifi-iface
option device radio$devidx
option network lan
option mode ap
option ssid OpenWrt
option ssid Lede
option encryption none
EOF
Expand Down
2 changes: 1 addition & 1 deletion package/kernel/mac80211/files/lib/wifi/mac80211.sh
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ config wifi-iface
option device radio$devidx
option network lan
option mode ap
option ssid OpenWrt
option ssid Lede
option encryption none
EOF
Expand Down
6 changes: 3 additions & 3 deletions package/libs/openssl/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -121,16 +121,16 @@ ifndef CONFIG_OPENSSL_HARDWARE_SUPPORT
endif

ifeq ($(CONFIG_x86_64),y)
OPENSSL_TARGET:=linux-x86_64-openwrt
OPENSSL_TARGET:=linux-x86_64-lede
OPENSSL_MAKEFLAGS += LIBDIR=lib
else
OPENSSL_OPTIONS+=no-sse2
ifeq ($(CONFIG_mips)$(CONFIG_mipsel),y)
OPENSSL_TARGET:=linux-mips-openwrt
OPENSSL_TARGET:=linux-mips-lede
# else ifeq ($(CONFIG_arm)$(CONFIG_armeb),y)
# OPENSSL_TARGET:=linux-armv4-openwrt
else
OPENSSL_TARGET:=linux-generic-openwrt
OPENSSL_TARGET:=linux-generic-lede
OPENSSL_OPTIONS+=no-perlasm
endif
endif
Expand Down
2 changes: 1 addition & 1 deletion package/network/services/dnsmasq/files/dnsmasq.init
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@ start_service() {
[ $ADD_LOCAL_HOSTNAME -eq 1 ] && {
local lanaddr lanaddr6
local ulaprefix="$(uci_get network @globals[0] ula_prefix)"
local hostname="$(uci_get system @system[0] hostname OpenWrt)"
local hostname="$(uci_get system @system[0] hostname Lede)"

network_get_ipaddr lanaddr "lan" && {
dhcp_domain_add "" "$hostname" "$lanaddr"
Expand Down
4 changes: 2 additions & 2 deletions package/network/services/hostapd/files/hostapd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,8 @@ hostapd_set_bss_options() {

[ -n "$wps_possible" -a -n "$config_methods" ] && {
config_get device_type "$vif" wps_device_type "6-0050F204-1"
config_get device_name "$vif" wps_device_name "OpenWrt AP"
config_get manufacturer "$vif" wps_manufacturer "openwrt.org"
config_get device_name "$vif" wps_device_name "Lede AP"
config_get manufacturer "$vif" wps_manufacturer "www.lede-project.org"
config_get wps_pin "$vif" wps_pin

config_get_bool ext_registrar "$vif" ext_registrar 0
Expand Down
4 changes: 2 additions & 2 deletions package/network/services/hostapd/files/netifd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -331,8 +331,8 @@ hostapd_set_bss_options() {
[ -n "$wps_possible" -a -n "$config_methods" ] && {
set_default ext_registrar 0
set_default wps_device_type "6-0050F204-1"
set_default wps_device_name "OpenWrt AP"
set_default wps_manufacturer "openwrt.org"
set_default wps_device_name "Lede AP"
set_default wps_manufacturer "www.lede-project.org"

wps_state=2
[ -n "$wps_configured" ] && wps_state=1
Expand Down
2 changes: 1 addition & 1 deletion package/network/services/lldpd/files/lldpd.config
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ config lldpd config
option lldp_location "2:FR:6:Commercial Rd:3:Roseville:19:4"

# if empty, the distribution description is sent
#option lldp_description "OpenWrt System"
#option lldp_description "Lede System"

# interfaces to listen on
list interface "loopback"
Expand Down
2 changes: 1 addition & 1 deletion package/network/services/lldpd/files/lldpd.init
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ find_release_info()
[ -z "$DISTRIB_DESCRIPTION" ] && [ -s /etc/openwrt_version ] && \
DISTRIB_DESCRIPTION="$(cat /etc/openwrt_version)"

echo "${DISTRIB_DESCRIPTION:-Unknown OpenWrt release} @ $(cat /proc/sys/kernel/hostname)"
echo "${DISTRIB_DESCRIPTION:-Unknown Lede release} @ $(cat /proc/sys/kernel/hostname)"
}

start_service() {
Expand Down
4 changes: 2 additions & 2 deletions package/network/services/samba36/files/samba.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
config samba
option 'name' 'OpenWrt'
option 'name' 'Lede'
option 'workgroup' 'WORKGROUP'
option 'description' 'OpenWrt'
option 'description' 'Lede'
option 'homes' '1'

6 changes: 3 additions & 3 deletions package/network/services/samba36/files/samba.init
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ smb_header() {
local name workgroup description charset
local hostname="$(uci_get system.@system[0].hostname)"

config_get name $1 name "${hostname:-OpenWrt}"
config_get workgroup $1 workgroup "${hostname:-OpenWrt}"
config_get description $1 description "Samba on ${hostname:-OpenWrt}"
config_get name $1 name "${hostname:-Lede}"
config_get workgroup $1 workgroup "${hostname:-Lede}"
config_get description $1 description "Samba on ${hostname:-Lede}"
config_get charset $1 charset "UTF-8"

mkdir -p /var/etc
Expand Down
4 changes: 2 additions & 2 deletions package/network/services/uhttpd/files/uhttpd.config
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ config uhttpd main
option tcp_keepalive 1

# Basic auth realm, defaults to local hostname
# option realm OpenWrt
# option realm Lede

# Configuration file in busybox httpd format
# option config /etc/httpd.conf
Expand Down Expand Up @@ -119,4 +119,4 @@ config cert px5g
option location Unknown

# Common name
option commonname OpenWrt
option commonname Lede
2 changes: 1 addition & 1 deletion package/network/services/uhttpd/files/uhttpd.init
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ generate_keys() {
[ -x "$PX5G_BIN" ] && {
$PX5G_BIN selfsigned -der \
-days ${days:-730} -newkey rsa:${bits:-2048} -keyout "${UHTTPD_KEY}.new" -out "${UHTTPD_CERT}.new" \
-subj /C="${country:-DE}"/ST="${state:-Saxony}"/L="${location:-Leipzig}"/CN="${commonname:-OpenWrt}"
-subj /C="${country:-DE}"/ST="${state:-Saxony}"/L="${location:-Leipzig}"/CN="${commonname:-Lede}"
sync
mv "${UHTTPD_KEY}.new" "${UHTTPD_KEY}"
mv "${UHTTPD_CERT}.new" "${UHTTPD_CERT}"
Expand Down
2 changes: 1 addition & 1 deletion package/network/utils/iproute2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ define Build/Configure
$(PKG_BUILD_DIR)/Makefile
$(SED) "s,^LIBC_INCLUDE.*,LIBC_INCLUDE=$(STAGING_DIR)/include," \
$(PKG_BUILD_DIR)/Makefile
echo "static const char SNAPSHOT[] = \"$(PKG_VERSION)-$(PKG_RELEASE)-openwrt\";" \
echo "static const char SNAPSHOT[] = \"$(PKG_VERSION)-$(PKG_RELEASE)-lede\";" \
> $(PKG_BUILD_DIR)/include/SNAPSHOT.h
endef

Expand Down
2 changes: 1 addition & 1 deletion scripts/brcmImage.pl
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
my $version = "0.1";
my %arg = (
o => 'bcm963xx_fs_kernel',
b => 'OpenWrt',
b => 'LEDE',
c => '6348',
s => 64,
f => 0xbfc00000,
Expand Down
2 changes: 1 addition & 1 deletion scripts/checkpatch.pl
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ sub help {
}

if (!defined $root) {
print "Must be run from the top-level dir. of a OpenWrt tree\n";
print "Must be run from the top-level dir. of a LEDE 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 OpenWrt features may be built directly into the image.\n"
"Some LEDE 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
Loading

0 comments on commit fa69553

Please sign in to comment.