From fa69553900516944fc43cf7b377105ea1f6d3db0 Mon Sep 17 00:00:00 2001
From: John Crispin <blogic@openwrt.org>
Date: Thu, 24 Mar 2016 22:40:13 +0100
Subject: [PATCH] branding: add LEDE branding
Signed-off-by: John Crispin <blogic@openwrt.org>
---
Config.in | 2 +-
Makefile | 2 +-
README | 8 +++----
include/image.mk | 6 ++---
include/prereq-build.mk | 2 +-
include/version.mk | 10 ++++----
package/base-files/Makefile | 2 +-
package/base-files/files/etc/banner | 23 ++++++++-----------
package/base-files/files/etc/config/system | 2 +-
package/base-files/files/etc/init.d/system | 2 +-
.../files/lib/preinit/10_indicate_preinit | 2 +-
package/base-files/image-config.in | 14 +++++------
.../broadcom-wl/files/lib/wifi/broadcom.sh | 2 +-
.../hostap-driver/files/lib/wifi/hostap.sh | 2 +-
.../mac80211/files/lib/wifi/mac80211.sh | 2 +-
package/libs/openssl/Makefile | 6 ++---
.../services/dnsmasq/files/dnsmasq.init | 2 +-
.../network/services/hostapd/files/hostapd.sh | 4 ++--
.../network/services/hostapd/files/netifd.sh | 4 ++--
.../network/services/lldpd/files/lldpd.config | 2 +-
.../network/services/lldpd/files/lldpd.init | 2 +-
.../services/samba36/files/samba.config | 4 ++--
.../network/services/samba36/files/samba.init | 6 ++---
.../services/uhttpd/files/uhttpd.config | 4 ++--
.../network/services/uhttpd/files/uhttpd.init | 2 +-
package/network/utils/iproute2/Makefile | 2 +-
scripts/brcmImage.pl | 2 +-
scripts/checkpatch.pl | 2 +-
scripts/config/mconf.c | 2 +-
scripts/get_source_date_epoch.sh | 8 +------
scripts/getver.sh | 2 +-
scripts/make-ipkg-dir.sh | 2 +-
scripts/openbsd.sh | 2 +-
target/linux/imx6/image/Makefile | 2 +-
target/linux/mcs814x/image/Makefile | 2 +-
.../omap24xx/base-files/etc/config/wireless | 2 +-
target/linux/x86/image/grub-iso.cfg | 2 +-
target/linux/x86/image/grub.cfg | 4 ++--
toolchain/Config.in | 4 ++--
toolchain/gcc/common.mk | 6 ++---
40 files changed, 76 insertions(+), 85 deletions(-)
diff --git a/Config.in b/Config.in
index d30c04839e..ddbc4e2ea4 100644
--- a/Config.in
+++ b/Config.in
@@ -4,7 +4,7 @@
# See /LICENSE for more information.
#
-mainmenu "OpenWrt Configuration"
+mainmenu "LEDE Configuration"
config MODULES
option modules
diff --git a/Makefile b/Makefile
index 8ba2bfc2cc..74a878c61d 100644
--- a/Makefile
+++ b/Makefile
@@ -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:
diff --git a/README b/README
index 4cbe56343c..b8466fc2d9 100644
--- a/README
+++ b/README
@@ -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.
@@ -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
@@ -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
diff --git a/include/image.mk b/include/image.mk
index bc383e6ba8..a868afc0d6 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -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
@@ -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
@@ -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
diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index a53065576c..0e145c939b 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -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))
diff --git a/include/version.mk b/include/version.mk
index 4bce0965ca..d8da358d69 100644
--- a/include/version.mk
+++ b/include/version.mk
@@ -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)
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 8bb6225527..691ad517a7 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -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
diff --git a/package/base-files/files/etc/banner b/package/base-files/files/etc/banner
index af51b5a8a8..ae2f16f513 100644
--- a/package/base-files/files/etc/banner
+++ b/package/base-files/files/etc/banner
@@ -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)
+ \________\/ -----------------------------------------------------------
+
diff --git a/package/base-files/files/etc/config/system b/package/base-files/files/etc/config/system
index 3dfbfc4fc8..20517f9a53 100644
--- a/package/base-files/files/etc/config/system
+++ b/package/base-files/files/etc/config/system
@@ -1,5 +1,5 @@
config system
- option hostname OpenWrt
+ option hostname lede
option timezone UTC
config timeserver ntp
diff --git a/package/base-files/files/etc/init.d/system b/package/base-files/files/etc/init.d/system
index 531aa8cbc5..8c5f677299 100755
--- a/package/base-files/files/etc/init.d/system
+++ b/package/base-files/files/etc/init.d/system
@@ -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' \
diff --git a/package/base-files/files/lib/preinit/10_indicate_preinit b/package/base-files/files/lib/preinit/10_indicate_preinit
index 1fab8a20ad..717d35cc30 100644
--- a/package/base-files/files/lib/preinit/10_indicate_preinit
+++ b/package/base-files/files/lib/preinit/10_indicate_preinit
@@ -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
}
diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in
index 3dfbedcfe5..5f84d115e5 100644
--- a/package/base-files/image-config.in
+++ b/package/base-files/image-config.in
@@ -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.
@@ -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"
diff --git a/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh b/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh
index a9c4de22e9..deb4ddf1d2 100644
--- a/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -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
diff --git a/package/kernel/hostap-driver/files/lib/wifi/hostap.sh b/package/kernel/hostap-driver/files/lib/wifi/hostap.sh
index e35b76c0fd..74e30fb7c5 100755
--- a/package/kernel/hostap-driver/files/lib/wifi/hostap.sh
+++ b/package/kernel/hostap-driver/files/lib/wifi/hostap.sh
@@ -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
diff --git a/package/kernel/mac80211/files/lib/wifi/mac80211.sh b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
index 06f3b8b449..77247cb399 100644
--- a/package/kernel/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
@@ -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
diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile
index d5dfe6cb08..f53275e6f8 100644
--- a/package/libs/openssl/Makefile
+++ b/package/libs/openssl/Makefile
@@ -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
diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index 7f90b8fa3e..bb675ad73f 100644
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -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"
diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
index 393233b8b4..9c1ba0fa13 100644
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -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
diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh
index 005112d828..af72e7a6d7 100644
--- a/package/network/services/hostapd/files/netifd.sh
+++ b/package/network/services/hostapd/files/netifd.sh
@@ -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
diff --git a/package/network/services/lldpd/files/lldpd.config b/package/network/services/lldpd/files/lldpd.config
index 48728e0e11..92ab42116b 100644
--- a/package/network/services/lldpd/files/lldpd.config
+++ b/package/network/services/lldpd/files/lldpd.config
@@ -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"
diff --git a/package/network/services/lldpd/files/lldpd.init b/package/network/services/lldpd/files/lldpd.init
index 696518902f..633a8fbc07 100644
--- a/package/network/services/lldpd/files/lldpd.init
+++ b/package/network/services/lldpd/files/lldpd.init
@@ -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() {
diff --git a/package/network/services/samba36/files/samba.config b/package/network/services/samba36/files/samba.config
index c79db0d322..b34a8dcaac 100644
--- a/package/network/services/samba36/files/samba.config
+++ b/package/network/services/samba36/files/samba.config
@@ -1,6 +1,6 @@
config samba
- option 'name' 'OpenWrt'
+ option 'name' 'Lede'
option 'workgroup' 'WORKGROUP'
- option 'description' 'OpenWrt'
+ option 'description' 'Lede'
option 'homes' '1'
diff --git a/package/network/services/samba36/files/samba.init b/package/network/services/samba36/files/samba.init
index 376ae89988..bc1dbf82b6 100755
--- a/package/network/services/samba36/files/samba.init
+++ b/package/network/services/samba36/files/samba.init
@@ -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
diff --git a/package/network/services/uhttpd/files/uhttpd.config b/package/network/services/uhttpd/files/uhttpd.config
index e14b9fefd7..f8df4cdecb 100644
--- a/package/network/services/uhttpd/files/uhttpd.config
+++ b/package/network/services/uhttpd/files/uhttpd.config
@@ -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
@@ -119,4 +119,4 @@ config cert px5g
option location Unknown
# Common name
- option commonname OpenWrt
+ option commonname Lede
diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init
index 4ca6c8d626..1b457a2b37 100755
--- a/package/network/services/uhttpd/files/uhttpd.init
+++ b/package/network/services/uhttpd/files/uhttpd.init
@@ -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}"
diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile
index cb9730e683..89fb2e62e5 100644
--- a/package/network/utils/iproute2/Makefile
+++ b/package/network/utils/iproute2/Makefile
@@ -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
diff --git a/scripts/brcmImage.pl b/scripts/brcmImage.pl
index 9a3acb43a4..265c1744bf 100755
--- a/scripts/brcmImage.pl
+++ b/scripts/brcmImage.pl
@@ -33,7 +33,7 @@ use Compress::Zlib;
my $version = "0.1";
my %arg = (
o => 'bcm963xx_fs_kernel',
- b => 'OpenWrt',
+ b => 'LEDE',
c => '6348',
s => 64,
f => 0xbfc00000,
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 78053338c0..9858e62fbb 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -173,7 +173,7 @@ if ($tree) {
}
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);
}
}
diff --git a/scripts/config/mconf.c b/scripts/config/mconf.c
index 961c1cd457..f437dd7176 100644
--- a/scripts/config/mconf.c
+++ b/scripts/config/mconf.c
@@ -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"
diff --git a/scripts/get_source_date_epoch.sh b/scripts/get_source_date_epoch.sh
index 436df9d064..ea8d930109 100755
--- a/scripts/get_source_date_epoch.sh
+++ b/scripts/get_source_date_epoch.sh
@@ -9,12 +9,6 @@ try_version() {
[ -n "$SOURCE_DATE_EPOCH" ]
}
-try_svn() {
- [ -d .svn ] || return 1
- SOURCE_DATE_EPOCH="$(./scripts/portable_date.sh "$(LC_ALL=C svn info | sed -ne 's/^Last Changed Date: //p')" +%s)"
- [ -n "$SOURCE_DATE_EPOCH" ]
-}
-
try_git() {
[ -e .git ] || return 1
SOURCE_DATE_EPOCH="$(git log -1 --format=format:%ct)"
@@ -27,5 +21,5 @@ try_hg() {
[ -n "$SOURCE_DATE_EPOCH" ]
}
-try_version || try_svn || try_git || try_hg || SOURCE_DATE_EPOCH=""
+try_version || try_git || try_hg || SOURCE_DATE_EPOCH=""
echo "$SOURCE_DATE_EPOCH"
diff --git a/scripts/getver.sh b/scripts/getver.sh
index d3b68c8634..60adc42e92 100755
--- a/scripts/getver.sh
+++ b/scripts/getver.sh
@@ -11,7 +11,7 @@ try_version() {
try_git() {
git rev-parse --git-dir >/dev/null 2>&1 || return 1
- REV="$(git describe | sed "s/reboot-\([0-9]*\)-.*/\1/g")"
+ REV="$(git describe --match reboot | sed "s/reboot-\([0-9]*\)-.*/\1/g")"
[ -n "$REV" ]
}
diff --git a/scripts/make-ipkg-dir.sh b/scripts/make-ipkg-dir.sh
index 902a4b526b..529e430ad9 100755
--- a/scripts/make-ipkg-dir.sh
+++ b/scripts/make-ipkg-dir.sh
@@ -10,7 +10,7 @@ WD=$(pwd)
mkdir -p "$TARGET/CONTROL"
grep '^[^(Version|Architecture)]' "$CONTROL" > "$TARGET/CONTROL/control"
grep '^Maintainer' "$CONTROL" 2>&1 >/dev/null || \
- echo "Maintainer: OpenWrt Developers Team <openwrt-devel@openwrt.org>" >> "$TARGET/CONTROL/control"
+ echo "Maintainer: LEDE Community <lede-dev@lists.infradead.org>" >> "$TARGET/CONTROL/control"
grep '^Source' "$CONTROL" 2>&1 >/dev/null || {
pkgbase=$(echo "$WD" | sed -e "s|^$TOPDIR/||g")
[ "$pkgbase" = "$WD" ] && src="N/A" || src="$BASE/$pkgbase"
diff --git a/scripts/openbsd.sh b/scripts/openbsd.sh
index dc9f4f7780..dc88d28ed7 100644
--- a/scripts/openbsd.sh
+++ b/scripts/openbsd.sh
@@ -1,7 +1,7 @@
#!/bin/sh
ver=$(uname -r)
arch=$(uname -m)
-echo "Preparing OpenBSD $arch $ver for OpenWrt"
+echo "Preparing OpenBSD $arch $ver for LEDE"
PKG_PATH="http://ftp.openbsd.org/pub/OpenBSD/${ver}/packages/${arch}/"
export PKG_PATH
pkg_add -v gmake
diff --git a/target/linux/imx6/image/Makefile b/target/linux/imx6/image/Makefile
index 910f88cf51..584ac7a060 100644
--- a/target/linux/imx6/image/Makefile
+++ b/target/linux/imx6/image/Makefile
@@ -39,7 +39,7 @@ define Build/ubi-boot-overlay
$(TARGET_ROOTFS_DIR)/boot-$(DEVICE_NAME)_$(word 1, $(1))/$(dts).dtb; \
)
mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
- -n '$(DEVICE_ID) OpenWrt bootscript' \
+ -n '$(DEVICE_ID) LEDE bootscript' \
-d ./bootscript-$(DEVICE_NAME) \
$(TARGET_ROOTFS_DIR)/boot-$(DEVICE_NAME)_$(word 1, $(1))/6x_bootscript-$(DEVICE_NAME)
$(STAGING_DIR_HOST)/bin/mkfs.ubifs \
diff --git a/target/linux/mcs814x/image/Makefile b/target/linux/mcs814x/image/Makefile
index 3afd660c14..7be7f8cd99 100644
--- a/target/linux/mcs814x/image/Makefile
+++ b/target/linux/mcs814x/image/Makefile
@@ -20,7 +20,7 @@ UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage
define Image/Build/MkuImage
mkimage -A arm -O linux -T kernel -a $(LOADADDR) -C none -e $(LOADADDR) \
- -n 'ARM OpenWrt Linux-$(LINUX_VERSION)' -d $(1) $(2);
+ -n 'ARM LEDE Linux-$(LINUX_VERSION)' -d $(1) $(2);
endef
define Image/Build/DTB
diff --git a/target/linux/omap24xx/base-files/etc/config/wireless b/target/linux/omap24xx/base-files/etc/config/wireless
index b640ce6c26..f61721e518 100644
--- a/target/linux/omap24xx/base-files/etc/config/wireless
+++ b/target/linux/omap24xx/base-files/etc/config/wireless
@@ -15,6 +15,6 @@ config wifi-iface
option powersave 1
option network lan
option mode sta
- option ssid OpenWrt
+ option ssid LEDE
# option encryption psk2
# option key "foobar"
diff --git a/target/linux/x86/image/grub-iso.cfg b/target/linux/x86/image/grub-iso.cfg
index 3d47a95a4b..32ee687c68 100644
--- a/target/linux/x86/image/grub-iso.cfg
+++ b/target/linux/x86/image/grub-iso.cfg
@@ -5,6 +5,6 @@ set default="0"
set timeout="@TIMEOUT@"
set root='(cd)'
-menuentry "OpenWrt" {
+menuentry "LEDE" {
linux /boot/vmlinuz @CMDLINE@ noinitrd
}
diff --git a/target/linux/x86/image/grub.cfg b/target/linux/x86/image/grub.cfg
index 33b9d0b1aa..f1a577cdd7 100644
--- a/target/linux/x86/image/grub.cfg
+++ b/target/linux/x86/image/grub.cfg
@@ -5,9 +5,9 @@ set default="0"
set timeout="@TIMEOUT@"
set root='(hd0,msdos1)'
-menuentry "OpenWrt" {
+menuentry "LEDE" {
linux /boot/vmlinuz @CMDLINE@ noinitrd
}
-menuentry "OpenWrt (failsafe)" {
+menuentry "LEDE (failsafe)" {
linux /boot/vmlinuz failsafe=true @CMDLINE@ noinitrd
}
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 49c3461a1b..a6aa84db75 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -42,7 +42,7 @@ menuconfig EXTERNAL_TOOLCHAIN
bool
prompt "Use external toolchain" if DEVEL
help
- If enabled, OpenWrt will compile using an existing toolchain instead of
+ If enabled, LEDE will compile using an existing toolchain instead of
compiling one.
config NATIVE_TOOLCHAIN
@@ -51,7 +51,7 @@ menuconfig EXTERNAL_TOOLCHAIN
depends on EXTERNAL_TOOLCHAIN
select NO_STRIP
help
- If enabled, OpenWrt will compile using the native toolchain for your
+ If enabled, LEDE will compile using the native toolchain for your
host instead of compiling one.
config TARGET_NAME
diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk
index e1580cf8c5..e6b5c8ea4b 100644
--- a/toolchain/gcc/common.mk
+++ b/toolchain/gcc/common.mk
@@ -44,11 +44,11 @@ endif
PATCH_DIR=../patches/$(GCC_VERSION)
-BUGURL=https://dev.openwrt.org/
+BUGURL=http://www.lede-project.org/bugs/
ifeq ($(findstring linaro, $(CONFIG_GCC_VERSION)),linaro)
- PKGVERSION=OpenWrt/Linaro GCC $(PKG_REV) $(REVISION)
+ PKGVERSION=LEDE/Linaro GCC $(PKG_REV) $(REVISION)
else
- PKGVERSION=OpenWrt GCC $(PKG_VERSION) $(REVISION)
+ PKGVERSION=LEDE GCC $(PKG_VERSION) $(REVISION)
endif
HOST_BUILD_PARALLEL:=1
--
GitLab