From fa69553900516944fc43cf7b377105ea1f6d3db0 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 24 Mar 2016 22:40:13 +0100 Subject: branding: add LEDE branding Signed-off-by: John Crispin --- 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 ++++++------- .../kernel/broadcom-wl/files/lib/wifi/broadcom.sh | 2 +- .../kernel/hostap-driver/files/lib/wifi/hostap.sh | 2 +- package/kernel/mac80211/files/lib/wifi/mac80211.sh | 2 +- package/libs/openssl/Makefile | 6 +++--- .../network/services/dnsmasq/files/dnsmasq.init | 2 +- package/network/services/hostapd/files/hostapd.sh | 4 ++-- package/network/services/hostapd/files/netifd.sh | 4 ++-- package/network/services/lldpd/files/lldpd.config | 2 +- package/network/services/lldpd/files/lldpd.init | 2 +- .../network/services/samba36/files/samba.config | 4 ++-- package/network/services/samba36/files/samba.init | 6 +++--- .../network/services/uhttpd/files/uhttpd.config | 4 ++-- package/network/services/uhttpd/files/uhttpd.init | 2 +- package/network/utils/iproute2/Makefile | 2 +- 20 files changed, 43 insertions(+), 46 deletions(-) (limited to 'package') 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 -- cgit v1.2.3