mirror
/
openwrt
mirror of https://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Releases Activity

branding: add LEDE branding 

Signed-off-by: John Crispin <blogic@openwrt.org>
This commit is contained in:
John Crispin 2016-03-24 22:40:13 +01:00
parent 343c3be454
commit fa69553900
40 changed files with 76 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Config.in
View File

@ -4,7 +4,7 @@
# See /LICENSE for more information. # See /LICENSE for more information.
# #
mainmenu "OpenWrt Configuration" mainmenu "LEDE Configuration"
config MODULES config MODULES
option modules option modules

2
Makefile
View File

@ -14,7 +14,7 @@ export TOPDIR LC_ALL LANG TZ
empty:= empty:=
space:= $(empty) $(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: world:

8
README
View File

@ -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 Please use "make menuconfig" to configure your appreciated
configuration for the toolchain and firmware. 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 You can use "scripts/flashing/flash.sh" for remotely updating your embedded
system via tftp. 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. 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 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! Sunshine!
Your OpenWrt Project Your LEDE Community
http://openwrt.org http://www.lede-project.org

6
include/image.mk
View File

@ -120,7 +120,7 @@ endef
define Image/BuildKernel/MkuImage define Image/BuildKernel/MkuImage
mkimage -A $(ARCH) -O linux -T kernel -C $(1) -a $(2) -e $(3) \ 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 endef
define Image/BuildKernel/MkFIT define Image/BuildKernel/MkFIT
@ -303,7 +303,7 @@ define Build/uImage
mkimage -A $(LINUX_KARCH) \ mkimage -A $(LINUX_KARCH) \
-O linux -T kernel \ -O linux -T kernel \
-C $(1) -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \ -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 $@ @mv $@.new $@
endef endef
@ -318,7 +318,7 @@ endef
define Build/netgear-dni define Build/netgear-dni
$(STAGING_DIR_HOST)/bin/mkdniimg \ $(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)) \ $(if $(NETGEAR_HW_ID),-H $(NETGEAR_HW_ID)) \
-r "$(1)" \ -r "$(1)" \
-i $@ -o $@.new -i $@ -o $@.new

2
include/prereq-build.mk
View File

@ -20,7 +20,7 @@ $(eval $(call TestHostCommand,working-make, \
$(MAKE) -v | grep -E 'Make (3\.8[1-9]|3\.9[0-9]|[4-9]\.)')) $(MAKE) -v | grep -E 'Make (3\.8[1-9]|3\.9[0-9]|[4-9]\.)'))
$(eval $(call TestHostCommand,case-sensitive-fs, \ $(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; \ rm -f $(TMP_DIR)/test.*; touch $(TMP_DIR)/test.fs; \
test ! -f $(TMP_DIR)/test.FS)) test ! -f $(TMP_DIR)/test.FS))

10
include/version.mk
View File

@ -25,22 +25,22 @@ VERSION_NUMBER:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER))
VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),$(REVISION)) VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),$(REVISION))
VERSION_CODE:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER)) 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:=$(call qstrip_escape,$(CONFIG_VERSION_NICK))
VERSION_NICK:=$(if $(VERSION_NICK),$(VERSION_NICK),$(RELEASE)) VERSION_NICK:=$(if $(VERSION_NICK),$(VERSION_NICK),$(RELEASE))
VERSION_REPO:=$(call qstrip_escape,$(CONFIG_VERSION_REPO)) 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:=$(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:=$(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:=$(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:=$(call qstrip_escape,$(CONFIG_VERSION_PRODUCT))
VERSION_PRODUCT:=$(if $(VERSION_PRODUCT),$(VERSION_PRODUCT),Generic) VERSION_PRODUCT:=$(if $(VERSION_PRODUCT),$(VERSION_PRODUCT),Generic)

2
package/base-files/Makefile
View File

@ -33,7 +33,7 @@ define Package/base-files
SECTION:=base SECTION:=base
CATEGORY:=Base system CATEGORY:=Base system
DEPENDS:=+netifd +libc +procd +jsonfilter +SIGNED_PACKAGES:usign +fstools DEPENDS:=+netifd +libc +procd +jsonfilter +SIGNED_PACKAGES:usign +fstools
TITLE:=Base filesystem for OpenWrt TITLE:=Base filesystem for Lede
URL:=http://openwrt.org/ URL:=http://openwrt.org/
VERSION:=$(PKG_RELEASE)-$(REVISION) VERSION:=$(PKG_RELEASE)-$(REVISION)
endef endef

23
package/base-files/files/etc/banner
View File

@ -1,13 +1,10 @@
_______ ________ __ _________
| |.-----.-----.-----.| | | |.----.| |_ / /\ _ ___ ___ ___
| - || _ | -__| || | | || _|| _| / LE / \ | | | __| \| __|
|_______|| __|_____|__|__||________||__| |____| / DE / \ | |__| _|| |) | _|
|__| W I R E L E S S F R E E D O M /________/ LE \ |____|___|___/|___| lede-project.org
----------------------------------------------------- \ \ DE /
DESIGNATED DRIVER (%C, %R) \ LE \ / -----------------------------------------------------------
----------------------------------------------------- \ DE \ / Reboot (%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
-----------------------------------------------------

2
package/base-files/files/etc/config/system
View File

@ -1,5 +1,5 @@
config system config system
option hostname OpenWrt option hostname lede
option timezone UTC option timezone UTC
config timeserver ntp config timeserver ntp

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

@ -7,7 +7,7 @@ USE_PROCD=1
validate_system_section() validate_system_section()
{ {
uci_validate_section system system "${1}" \ uci_validate_section system system "${1}" \
'hostname:string:OpenWrt' \ 'hostname:string:lede' \
'conloglevel:uinteger' \ 'conloglevel:uinteger' \
'buffersize:uinteger' \ 'buffersize:uinteger' \
'timezone:string:UTC' \ 'timezone:string:UTC' \

2
package/base-files/files/lib/preinit/10_indicate_preinit
View File

@ -39,7 +39,7 @@ preinit_echo() {
} }
pi_indicate_preinit() { pi_indicate_preinit() {
preinit_net_echo "Doing OpenWrt Preinit\n" preinit_net_echo "Doing Lede Preinit\n"
set_state preinit set_state preinit
} }

14
package/base-files/image-config.in
View File

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

2
package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh
View File

@ -469,7 +469,7 @@ config wifi-iface
option device wl${i} option device wl${i}
option network lan option network lan
option mode ap option mode ap
option ssid OpenWrt${i#0} option ssid Lede${i#0}
option encryption none option encryption none
EOF EOF

2
package/kernel/hostap-driver/files/lib/wifi/hostap.sh
View File

@ -261,7 +261,7 @@ config wifi-iface
option device radio$devidx option device radio$devidx
option network lan option network lan
option mode ap option mode ap
option ssid OpenWrt option ssid Lede
option encryption none option encryption none
EOF EOF

2
package/kernel/mac80211/files/lib/wifi/mac80211.sh
View File

@ -123,7 +123,7 @@ config wifi-iface
option device radio$devidx option device radio$devidx
option network lan option network lan
option mode ap option mode ap
option ssid OpenWrt option ssid Lede
option encryption none option encryption none
EOF EOF

6
package/libs/openssl/Makefile
View File

@ -121,16 +121,16 @@ ifndef CONFIG_OPENSSL_HARDWARE_SUPPORT
endif endif
ifeq ($(CONFIG_x86_64),y) ifeq ($(CONFIG_x86_64),y)
OPENSSL_TARGET:=linux-x86_64-openwrt OPENSSL_TARGET:=linux-x86_64-lede
OPENSSL_MAKEFLAGS += LIBDIR=lib OPENSSL_MAKEFLAGS += LIBDIR=lib
else else
OPENSSL_OPTIONS+=no-sse2 OPENSSL_OPTIONS+=no-sse2
ifeq ($(CONFIG_mips)$(CONFIG_mipsel),y) ifeq ($(CONFIG_mips)$(CONFIG_mipsel),y)
OPENSSL_TARGET:=linux-mips-openwrt OPENSSL_TARGET:=linux-mips-lede
# else ifeq ($(CONFIG_arm)$(CONFIG_armeb),y) # else ifeq ($(CONFIG_arm)$(CONFIG_armeb),y)
# OPENSSL_TARGET:=linux-armv4-openwrt # OPENSSL_TARGET:=linux-armv4-openwrt
else else
OPENSSL_TARGET:=linux-generic-openwrt OPENSSL_TARGET:=linux-generic-lede
OPENSSL_OPTIONS+=no-perlasm OPENSSL_OPTIONS+=no-perlasm
endif endif
endif endif

2
package/network/services/dnsmasq/files/dnsmasq.init
View File

@ -625,7 +625,7 @@ start_service() {
[ $ADD_LOCAL_HOSTNAME -eq 1 ] && { [ $ADD_LOCAL_HOSTNAME -eq 1 ] && {
local lanaddr lanaddr6 local lanaddr lanaddr6
local ulaprefix="$(uci_get network @globals[0] ula_prefix)" 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" && { network_get_ipaddr lanaddr "lan" && {
dhcp_domain_add "" "$hostname" "$lanaddr" dhcp_domain_add "" "$hostname" "$lanaddr"

4
package/network/services/hostapd/files/hostapd.sh
View File

@ -195,8 +195,8 @@ hostapd_set_bss_options() {
[ -n "$wps_possible" -a -n "$config_methods" ] && { [ -n "$wps_possible" -a -n "$config_methods" ] && {
config_get device_type "$vif" wps_device_type "6-0050F204-1" config_get device_type "$vif" wps_device_type "6-0050F204-1"
config_get device_name "$vif" wps_device_name "OpenWrt AP" config_get device_name "$vif" wps_device_name "Lede AP"
config_get manufacturer "$vif" wps_manufacturer "openwrt.org" config_get manufacturer "$vif" wps_manufacturer "www.lede-project.org"
config_get wps_pin "$vif" wps_pin config_get wps_pin "$vif" wps_pin
config_get_bool ext_registrar "$vif" ext_registrar 0 config_get_bool ext_registrar "$vif" ext_registrar 0

4
package/network/services/hostapd/files/netifd.sh
View File

@ -331,8 +331,8 @@ hostapd_set_bss_options() {
[ -n "$wps_possible" -a -n "$config_methods" ] && { [ -n "$wps_possible" -a -n "$config_methods" ] && {
set_default ext_registrar 0 set_default ext_registrar 0
set_default wps_device_type "6-0050F204-1" set_default wps_device_type "6-0050F204-1"
set_default wps_device_name "OpenWrt AP" set_default wps_device_name "Lede AP"
set_default wps_manufacturer "openwrt.org" set_default wps_manufacturer "www.lede-project.org"
wps_state=2 wps_state=2
[ -n "$wps_configured" ] && wps_state=1 [ -n "$wps_configured" ] && wps_state=1

2
package/network/services/lldpd/files/lldpd.config
View File

@ -8,7 +8,7 @@ config lldpd config
option lldp_location "2:FR:6:Commercial Rd:3:Roseville:19:4" option lldp_location "2:FR:6:Commercial Rd:3:Roseville:19:4"
# if empty, the distribution description is sent # if empty, the distribution description is sent
#option lldp_description "OpenWrt System" #option lldp_description "Lede System"
# interfaces to listen on # interfaces to listen on
list interface "loopback" list interface "loopback"

2
package/network/services/lldpd/files/lldpd.init
View File

@ -14,7 +14,7 @@ find_release_info()
[ -z "$DISTRIB_DESCRIPTION" ] && [ -s /etc/openwrt_version ] && \ [ -z "$DISTRIB_DESCRIPTION" ] && [ -s /etc/openwrt_version ] && \
DISTRIB_DESCRIPTION="$(cat /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() { start_service() {

4
package/network/services/samba36/files/samba.config
View File

@ -1,6 +1,6 @@
config samba config samba
option 'name' 'OpenWrt' option 'name' 'Lede'
option 'workgroup' 'WORKGROUP' option 'workgroup' 'WORKGROUP'
option 'description' 'OpenWrt' option 'description' 'Lede'
option 'homes' '1' option 'homes' '1'

6
package/network/services/samba36/files/samba.init
View File

@ -28,9 +28,9 @@ smb_header() {
local name workgroup description charset local name workgroup description charset
local hostname="$(uci_get system.@system[0].hostname)" local hostname="$(uci_get system.@system[0].hostname)"
config_get name $1 name "${hostname:-OpenWrt}" config_get name $1 name "${hostname:-Lede}"
config_get workgroup $1 workgroup "${hostname:-OpenWrt}" config_get workgroup $1 workgroup "${hostname:-Lede}"
config_get description $1 description "Samba on ${hostname:-OpenWrt}" config_get description $1 description "Samba on ${hostname:-Lede}"
config_get charset $1 charset "UTF-8" config_get charset $1 charset "UTF-8"
mkdir -p /var/etc mkdir -p /var/etc

4
package/network/services/uhttpd/files/uhttpd.config
View File

@ -83,7 +83,7 @@ config uhttpd main
option tcp_keepalive 1 option tcp_keepalive 1
# Basic auth realm, defaults to local hostname # Basic auth realm, defaults to local hostname
# option realm OpenWrt # option realm Lede
# Configuration file in busybox httpd format # Configuration file in busybox httpd format
# option config /etc/httpd.conf # option config /etc/httpd.conf
@ -119,4 +119,4 @@ config cert px5g
option location Unknown option location Unknown
# Common name # Common name
option commonname OpenWrt option commonname Lede

2
package/network/services/uhttpd/files/uhttpd.init
View File

@ -46,7 +46,7 @@ generate_keys() {
[ -x "$PX5G_BIN" ] && { [ -x "$PX5G_BIN" ] && {
$PX5G_BIN selfsigned -der \ $PX5G_BIN selfsigned -der \
-days ${days:-730} -newkey rsa:${bits:-2048} -keyout "${UHTTPD_KEY}.new" -out "${UHTTPD_CERT}.new" \ -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 sync
mv "${UHTTPD_KEY}.new" "${UHTTPD_KEY}" mv "${UHTTPD_KEY}.new" "${UHTTPD_KEY}"
mv "${UHTTPD_CERT}.new" "${UHTTPD_CERT}" mv "${UHTTPD_CERT}.new" "${UHTTPD_CERT}"

2
package/network/utils/iproute2/Makefile
View File

@ -70,7 +70,7 @@ define Build/Configure
$(PKG_BUILD_DIR)/Makefile $(PKG_BUILD_DIR)/Makefile
$(SED) "s,^LIBC_INCLUDE.*,LIBC_INCLUDE=$(STAGING_DIR)/include," \ $(SED) "s,^LIBC_INCLUDE.*,LIBC_INCLUDE=$(STAGING_DIR)/include," \
$(PKG_BUILD_DIR)/Makefile $(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 > $(PKG_BUILD_DIR)/include/SNAPSHOT.h
endef endef

2
scripts/brcmImage.pl
View File

@ -33,7 +33,7 @@ use Compress::Zlib;
my $version = "0.1"; my $version = "0.1";
my %arg = ( my %arg = (
o => 'bcm963xx_fs_kernel', o => 'bcm963xx_fs_kernel',
b => 'OpenWrt', b => 'LEDE',
c => '6348', c => '6348',
s => 64, s => 64,
f => 0xbfc00000, f => 0xbfc00000,

2
scripts/checkpatch.pl
View File

@ -173,7 +173,7 @@ if ($tree) {
} }
if (!defined $root) { 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); exit(2);
} }
} }

2
scripts/config/mconf.c
View File

@ -25,7 +25,7 @@
static const char mconf_readme[] = N_( static const char mconf_readme[] = N_(
"Overview\n" "Overview\n"
"--------\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" "Some may be made into installable ipkg packages. Some features\n"
"may be completely removed altogether.\n" "may be completely removed altogether.\n"
"\n" "\n"

8
scripts/get_source_date_epoch.sh
View File

@ -9,12 +9,6 @@ try_version() {
[ -n "$SOURCE_DATE_EPOCH" ] [ -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() { try_git() {
[ -e .git ] || return 1 [ -e .git ] || return 1
SOURCE_DATE_EPOCH="$(git log -1 --format=format:%ct)" SOURCE_DATE_EPOCH="$(git log -1 --format=format:%ct)"
@ -27,5 +21,5 @@ try_hg() {
[ -n "$SOURCE_DATE_EPOCH" ] [ -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" echo "$SOURCE_DATE_EPOCH"

2
scripts/getver.sh
View File

@ -11,7 +11,7 @@ try_version() {
try_git() { try_git() {
git rev-parse --git-dir >/dev/null 2>&1 || return 1 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" ] [ -n "$REV" ]
} }

2
scripts/make-ipkg-dir.sh
View File

@ -10,7 +10,7 @@ WD=$(pwd)
mkdir -p "$TARGET/CONTROL" mkdir -p "$TARGET/CONTROL"
grep '^[^(Version|Architecture)]' "$CONTROL" > "$TARGET/CONTROL/control" grep '^[^(Version|Architecture)]' "$CONTROL" > "$TARGET/CONTROL/control"
grep '^Maintainer' "$CONTROL" 2>&1 >/dev/null || \ 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 || { grep '^Source' "$CONTROL" 2>&1 >/dev/null || {
pkgbase=$(echo "$WD" | sed -e "s|^$TOPDIR/||g") pkgbase=$(echo "$WD" | sed -e "s|^$TOPDIR/||g")
[ "$pkgbase" = "$WD" ] && src="N/A" || src="$BASE/$pkgbase" [ "$pkgbase" = "$WD" ] && src="N/A" || src="$BASE/$pkgbase"

2
scripts/openbsd.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
ver=$(uname -r) ver=$(uname -r)
arch=$(uname -m) 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}/" PKG_PATH="http://ftp.openbsd.org/pub/OpenBSD/${ver}/packages/${arch}/"
export PKG_PATH export PKG_PATH
pkg_add -v gmake pkg_add -v gmake

2
target/linux/imx6/image/Makefile
View File

@ -39,7 +39,7 @@ define Build/ubi-boot-overlay
$(TARGET_ROOTFS_DIR)/boot-$(DEVICE_NAME)_$(word 1, $(1))/$(dts).dtb; \ $(TARGET_ROOTFS_DIR)/boot-$(DEVICE_NAME)_$(word 1, $(1))/$(dts).dtb; \
) )
mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ 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) \ -d ./bootscript-$(DEVICE_NAME) \
$(TARGET_ROOTFS_DIR)/boot-$(DEVICE_NAME)_$(word 1, $(1))/6x_bootscript-$(DEVICE_NAME) $(TARGET_ROOTFS_DIR)/boot-$(DEVICE_NAME)_$(word 1, $(1))/6x_bootscript-$(DEVICE_NAME)
$(STAGING_DIR_HOST)/bin/mkfs.ubifs \ $(STAGING_DIR_HOST)/bin/mkfs.ubifs \

2
target/linux/mcs814x/image/Makefile
View File

@ -20,7 +20,7 @@ UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage
define Image/Build/MkuImage define Image/Build/MkuImage
mkimage -A arm -O linux -T kernel -a $(LOADADDR) -C none -e $(LOADADDR) \ 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 endef
define Image/Build/DTB define Image/Build/DTB

2
target/linux/omap24xx/base-files/etc/config/wireless
View File

@ -15,6 +15,6 @@ config wifi-iface
option powersave 1 option powersave 1
option network lan option network lan
option mode sta option mode sta
option ssid OpenWrt option ssid LEDE
# option encryption psk2 # option encryption psk2
# option key "foobar" # option key "foobar"

2
target/linux/x86/image/grub-iso.cfg
View File

@ -5,6 +5,6 @@ set default="0"
set timeout="@TIMEOUT@" set timeout="@TIMEOUT@"
set root='(cd)' set root='(cd)'
menuentry "OpenWrt" { menuentry "LEDE" {
linux /boot/vmlinuz @CMDLINE@ noinitrd linux /boot/vmlinuz @CMDLINE@ noinitrd
} }

4
target/linux/x86/image/grub.cfg
View File

@ -5,9 +5,9 @@ set default="0"
set timeout="@TIMEOUT@" set timeout="@TIMEOUT@"
set root='(hd0,msdos1)' set root='(hd0,msdos1)'
menuentry "OpenWrt" { menuentry "LEDE" {
linux /boot/vmlinuz @CMDLINE@ noinitrd linux /boot/vmlinuz @CMDLINE@ noinitrd
} }
menuentry "OpenWrt (failsafe)" { menuentry "LEDE (failsafe)" {
linux /boot/vmlinuz failsafe=true @CMDLINE@ noinitrd linux /boot/vmlinuz failsafe=true @CMDLINE@ noinitrd
} }

4
toolchain/Config.in
View File

@ -42,7 +42,7 @@ menuconfig EXTERNAL_TOOLCHAIN
bool bool
prompt "Use external toolchain" if DEVEL prompt "Use external toolchain" if DEVEL
help 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. compiling one.
config NATIVE_TOOLCHAIN config NATIVE_TOOLCHAIN
@ -51,7 +51,7 @@ menuconfig EXTERNAL_TOOLCHAIN
depends on EXTERNAL_TOOLCHAIN depends on EXTERNAL_TOOLCHAIN
select NO_STRIP select NO_STRIP
help 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. host instead of compiling one.
config TARGET_NAME config TARGET_NAME

6
toolchain/gcc/common.mk
View File

@ -44,11 +44,11 @@ endif
PATCH_DIR=../patches/$(GCC_VERSION) PATCH_DIR=../patches/$(GCC_VERSION)
BUGURL=https://dev.openwrt.org/ BUGURL=http://www.lede-project.org/bugs/
ifeq ($(findstring linaro, $(CONFIG_GCC_VERSION)),linaro) ifeq ($(findstring linaro, $(CONFIG_GCC_VERSION)),linaro)
PKGVERSION=OpenWrt/Linaro GCC $(PKG_REV) $(REVISION) PKGVERSION=LEDE/Linaro GCC $(PKG_REV) $(REVISION)
else else
PKGVERSION=OpenWrt GCC $(PKG_VERSION) $(REVISION) PKGVERSION=LEDE GCC $(PKG_VERSION) $(REVISION)
endif endif
HOST_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1