298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-15 18:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge: change branding for LEDE to OpenWrt

Browse Source
This commit is contained in:
coolsnowwolf 2017-12-12 16:57:14 +08:00
parent 72c6b996b0
commit 7185e1ceb2
50 changed files with 111 additions and 120 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 "LEDE Configuration" mainmenu "OpenWrt 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 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: world:

6
include/image-commands.mk
View File

@ -7,7 +7,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 '$(if $(UIMAGE_NAME),$(UIMAGE_NAME),$(call toupper,$(LINUX_KARCH)) LEDE Linux-$(LINUX_VERSION))' -d $@ $@.new -n '$(if $(UIMAGE_NAME),$(UIMAGE_NAME),$(call toupper,$(LINUX_KARCH)) OpenWrt Linux-$(LINUX_VERSION))' -d $@ $@.new
mv $@.new $@ mv $@.new $@
endef endef
@ -60,7 +60,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 LEDE.$(REVISION) \ -B $(NETGEAR_BOARD_ID) -v OpenWrt.$(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
@ -83,7 +83,7 @@ define Build/append-uImage-fakeroot-hdr
rm -f $@.fakeroot rm -f $@.fakeroot
$(STAGING_DIR_HOST)/bin/mkimage \ $(STAGING_DIR_HOST)/bin/mkimage \
-A $(LINUX_KARCH) -O linux -T filesystem -C none \ -A $(LINUX_KARCH) -O linux -T filesystem -C none \
-n '$(call toupper,$(LINUX_KARCH)) LEDE fakeroot' \ -n '$(call toupper,$(LINUX_KARCH)) OpenWrt fakeroot' \
-s \ -s \
$@.fakeroot $@.fakeroot
cat $@.fakeroot >> $@ cat $@.fakeroot >> $@

2
include/image.mk
View File

@ -136,7 +136,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)) LEDE Linux-$(LINUX_VERSION)' -d $(4) $(5) -n '$(call toupper,$(ARCH)) OpenWrt Linux-$(LINUX_VERSION)' -d $(4) $(5)
endef endef
define Image/BuildKernel/MkFIT define Image/BuildKernel/MkFIT

2
include/prereq-build.mk
View File

@ -18,7 +18,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, \
LEDE can only be built on a case-sensitive filesystem, \ OpenWrt 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))

16
include/version.mk
View File

@ -10,13 +10,10 @@
# REVISION:=x # REVISION:=x
# SOURCE_DATE_EPOCH:=x # SOURCE_DATE_EPOCH:=x
RELEASE:=Reboot
PKG_CONFIG_DEPENDS += \ PKG_CONFIG_DEPENDS += \
CONFIG_VERSION_BUG_URL \ CONFIG_VERSION_BUG_URL \
CONFIG_VERSION_NUMBER \ CONFIG_VERSION_NUMBER \
CONFIG_VERSION_CODE \ CONFIG_VERSION_CODE \
CONFIG_VERSION_NICK \
CONFIG_VERSION_REPO \ CONFIG_VERSION_REPO \
CONFIG_VERSION_DIST \ CONFIG_VERSION_DIST \
CONFIG_VERSION_MANUFACTURER \ CONFIG_VERSION_MANUFACTURER \
@ -36,18 +33,15 @@ VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),SNAPSHOT)
VERSION_CODE:=$(call qstrip_escape,$(CONFIG_VERSION_CODE)) VERSION_CODE:=$(call qstrip_escape,$(CONFIG_VERSION_CODE))
VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
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:=$(call qstrip_escape,$(CONFIG_VERSION_REPO))
VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.lede-project.org/releases/17.01.4) VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.lede-project.org/snapshots)
VERSION_DIST:=$(call qstrip_escape,$(CONFIG_VERSION_DIST)) VERSION_DIST:=$(call qstrip_escape,$(CONFIG_VERSION_DIST))
VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),LEDE) VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt)
VERSION_DIST_SANITIZED:=$(call sanitize,$(VERSION_DIST)) VERSION_DIST_SANITIZED:=$(call sanitize,$(VERSION_DIST))
VERSION_MANUFACTURER:=$(call qstrip_escape,$(CONFIG_VERSION_MANUFACTURER)) VERSION_MANUFACTURER:=$(call qstrip_escape,$(CONFIG_VERSION_MANUFACTURER))
VERSION_MANUFACTURER:=$(if $(VERSION_MANUFACTURER),$(VERSION_MANUFACTURER),LEDE) VERSION_MANUFACTURER:=$(if $(VERSION_MANUFACTURER),$(VERSION_MANUFACTURER),OpenWrt)
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://lede-project.org/) VERSION_MANUFACTURER_URL:=$(if $(VERSION_MANUFACTURER_URL),$(VERSION_MANUFACTURER_URL),http://lede-project.org/)
@ -93,8 +87,6 @@ VERSION_SED:=$(SED) 's,%U,$(VERSION_REPO),g' \
-e 's,%v,\L$(subst $(space),_,$(VERSION_NUMBER)),g' \ -e 's,%v,\L$(subst $(space),_,$(VERSION_NUMBER)),g' \
-e 's,%C,$(VERSION_CODE),g' \ -e 's,%C,$(VERSION_CODE),g' \
-e 's,%c,\L$(subst $(space),_,$(VERSION_CODE)),g' \ -e 's,%c,\L$(subst $(space),_,$(VERSION_CODE)),g' \
-e 's,%N,$(VERSION_NICK),g' \
-e 's,%n,\L$(subst $(space),_,$(VERSION_NICK)),g' \
-e 's,%D,$(VERSION_DIST),g' \ -e 's,%D,$(VERSION_DIST),g' \
-e 's,%d,\L$(subst $(space),_,$(VERSION_DIST)),g' \ -e 's,%d,\L$(subst $(space),_,$(VERSION_DIST)),g' \
-e 's,%R,$(REVISION),g' \ -e 's,%R,$(REVISION),g' \
@ -109,4 +101,4 @@ VERSION_SED:=$(SED) 's,%U,$(VERSION_REPO),g' \
-e 's,%P,$(VERSION_PRODUCT),g' \ -e 's,%P,$(VERSION_PRODUCT),g' \
-e 's,%h,$(VERSION_HWREV),g' -e 's,%h,$(VERSION_HWREV),g'
VERSION_SED_SCRIPT:=$(subst '\'','\'\\\\\'\'',$(VERSION_SED)) VERSION_SED_SCRIPT:=$(subst '\'','\'\\\\\'\'',$(VERSION_SED))

2
package/base-files/Makefile
View File

@ -34,7 +34,7 @@ define Package/base-files
SECTION:=base SECTION:=base
CATEGORY:=Base system CATEGORY:=Base system
DEPENDS:=+netifd +libc +procd +jsonfilter +SIGNED_PACKAGES:usign +SIGNED_PACKAGES:lede-keyring +NAND_SUPPORT:ubi-utils +fstools +fwtool 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/ URL:=http://openwrt.org/
VERSION:=$(PKG_RELEASE)-$(REVISION) VERSION:=$(PKG_RELEASE)-$(REVISION)
endef endef

10
package/base-files/files/bin/config_generate
View File

@ -226,7 +226,7 @@ generate_static_system() {
uci -q batch <<-EOF uci -q batch <<-EOF
delete system.@system[0] delete system.@system[0]
add system system 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].timezone='UTC'
set system.@system[-1].ttylogin='0' set system.@system[-1].ttylogin='0'
set system.@system[-1].log_size='64' set system.@system[-1].log_size='64'
@ -236,10 +236,10 @@ generate_static_system() {
set system.ntp='timeserver' set system.ntp='timeserver'
set system.ntp.enabled='1' set system.ntp.enabled='1'
set system.ntp.enable_server='0' set system.ntp.enable_server='0'
add_list system.ntp.server='0.lede.pool.ntp.org' add_list system.ntp.server='0.openwrt.pool.ntp.org'
add_list system.ntp.server='1.lede.pool.ntp.org' add_list system.ntp.server='1.openwrt.pool.ntp.org'
add_list system.ntp.server='2.lede.pool.ntp.org' add_list system.ntp.server='2.openwrt.pool.ntp.org'
add_list system.ntp.server='3.lede.pool.ntp.org' add_list system.ntp.server='3.openwrt.pool.ntp.org'
EOF EOF
if json_is_a system object; then if json_is_a system object; then

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

@ -1,10 +1,8 @@
_________ _______ ________ __
/ /\ _ ___ ___ ___ | |.-----.-----.-----.| | | |.----.| |_
/ LE / \ | | | __| \| __| | - || _ | -__| || | | || _|| _|
/ DE / \ | |__| _|| |) | _| |_______|| __|_____|__|__||________||__| |____|
/________/ LE \ |____|___|___/|___| lede-project.org |__| W I R E L E S S F R E E D O M
\ \ DE / -----------------------------------------------------
\ LE \ / ----------------------------------------------------------- %D %V, %C
\ DE \ / %N (%V, %C) -----------------------------------------------------
\________\/ -----------------------------------------------------------

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:lede' \ 'hostname:string:OpenWrt' \
'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

@ -113,7 +113,7 @@ preinit_ip() {
preinit_config_board preinit_config_board
fi fi
preinit_net_echo "Doing Lede Preinit\n" preinit_net_echo "Doing OpenWrt Preinit\n"
} }
preinit_ip_deconfig() { preinit_ip_deconfig() {

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

@ -158,7 +158,7 @@ if VERSIONOPT
config VERSION_DIST config VERSION_DIST
string string
prompt "Release distribution" prompt "Release distribution"
default "LEDE" default "OpenWrt"
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.
@ -201,13 +201,13 @@ if VERSIONOPT
%c .. Configured release revision code or value of %R, lowercase %c .. Configured release revision code or value of %R, lowercase
%N .. Release name, uppercase %N .. Release name, uppercase
%n .. Release name, lowercase %n .. Release name, lowercase
%D .. Distribution name or "Lede", uppercase %D .. Distribution name or "OpenWrt", uppercase
%d .. Distribution name or "lede", lowercase %d .. Distribution name or "openwrt", lowercase
%T .. Target name %T .. Target name
%S .. Target/Subtarget name %S .. Target/Subtarget name
%A .. Package architecture %A .. Package architecture
%t .. Build taint flags, e.g. "no-all busybox" %t .. Build taint flags, e.g. "no-all busybox"
%M .. Manufacturer name or "Lede" %M .. Manufacturer name or "OpenWrt"
%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 @@ detect_broadcom() {
set wireless.default_wl${i}.device=wl${i} set wireless.default_wl${i}.device=wl${i}
set wireless.default_wl${i}.network=lan set wireless.default_wl${i}.network=lan
set wireless.default_wl${i}.mode=ap set wireless.default_wl${i}.mode=ap
set wireless.default_wl${i}.ssid=Lede${i#0} set wireless.default_wl${i}.ssid=OpenWrt${i#0}
set wireless.default_wl${i}.encryption=none set wireless.default_wl${i}.encryption=none
EOF EOF
uci -q commit wireless uci -q commit wireless

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

@ -122,7 +122,7 @@ detect_mac80211() {
set wireless.default_radio${devidx}.device=radio${devidx} set wireless.default_radio${devidx}.device=radio${devidx}
set wireless.default_radio${devidx}.network=lan set wireless.default_radio${devidx}.network=lan
set wireless.default_radio${devidx}.mode=ap set wireless.default_radio${devidx}.mode=ap
set wireless.default_radio${devidx}.ssid=LEDE set wireless.default_radio${devidx}.ssid=OpenWrt
set wireless.default_radio${devidx}.encryption=none set wireless.default_radio${devidx}.encryption=none
EOF EOF
uci -q commit wireless uci -q commit wireless

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

@ -356,8 +356,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 "Lede AP" set_default wps_device_name "OpenWrt AP"
set_default wps_manufacturer "www.lede-project.org" set_default wps_manufacturer "www.openwrt.org"
set_default wps_independent 1 set_default wps_independent 1
wps_state=2 wps_state=2

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

@ -10,7 +10,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 "Lede System" #option lldp_description "OpenWrt 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

@ -16,7 +16,7 @@ find_release_info()
[ -z "$PRETTY_NAME" ] && [ -s /etc/openwrt_version ] && \ [ -z "$PRETTY_NAME" ] && [ -s /etc/openwrt_version ] && \
PRETTY_NAME="$(cat /etc/openwrt_version)" PRETTY_NAME="$(cat /etc/openwrt_version)"
echo "${PRETTY_NAME:-Unknown Lede release} @ $(cat /proc/sys/kernel/hostname)" echo "${PRETTY_NAME:-Unknown OpenWrt release} @ $(cat /proc/sys/kernel/hostname)"
} }
write_lldpd_conf() write_lldpd_conf()

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

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

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

@ -23,9 +23,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:-Lede}" config_get name $1 name "${hostname:-OpenWrt}"
config_get workgroup $1 workgroup "${hostname:-Lede}" config_get workgroup $1 workgroup "${hostname:-OpenWrt}"
config_get description $1 description "Samba on ${hostname:-Lede}" config_get description $1 description "Samba on ${hostname:-OpenWrt}"
config_get charset $1 charset "UTF-8" config_get charset $1 charset "UTF-8"
mkdir -p /var/etc mkdir -p /var/etc

2
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 Lede # option realm OpenWrt
# Configuration file in busybox httpd format # Configuration file in busybox httpd format
# option config /etc/httpd.conf # option config /etc/httpd.conf

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

@ -52,7 +52,7 @@ generate_keys() {
[ -n "$GENKEY_CMD" ] && { [ -n "$GENKEY_CMD" ] && {
$GENKEY_CMD \ $GENKEY_CMD \
-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}"/O="${commonname:-Lede}$UNIQUEID"/CN="${commonname:-Lede}" -subj /C="${country:-ZZ}"/ST="${state:-Somewhere}"/L="${location:-Unknown}"/O="${commonname:-OpenWrt}$UNIQUEID"/CN="${commonname:-OpenWrt}"
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

@ -89,7 +89,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)-lede\";" \ echo "static const char SNAPSHOT[] = \"$(PKG_VERSION)-$(PKG_RELEASE)-openwrt\";" \
> $(PKG_BUILD_DIR)/include/SNAPSHOT.h > $(PKG_BUILD_DIR)/include/SNAPSHOT.h
endef endef

4
package/utils/busybox/Config-defaults.in
View File

@ -2332,10 +2332,10 @@ config BUSYBOX_DEFAULT_FEATURE_NETSTAT_PRG
config BUSYBOX_DEFAULT_NSLOOKUP config BUSYBOX_DEFAULT_NSLOOKUP
bool bool
default n default n
config BUSYBOX_DEFAULT_NSLOOKUP_LEDE config BUSYBOX_DEFAULT_NSLOOKUP_OPENWRT
bool bool
default y default y
config BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS config BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
bool bool
default n default n
config BUSYBOX_DEFAULT_NTPD config BUSYBOX_DEFAULT_NTPD

12
package/utils/busybox/config/networking/Config.in
View File

@ -700,17 +700,17 @@ config BUSYBOX_CONFIG_NSLOOKUP
default BUSYBOX_DEFAULT_NSLOOKUP default BUSYBOX_DEFAULT_NSLOOKUP
help help
nslookup is a tool to query Internet name servers. nslookup is a tool to query Internet name servers.
config BUSYBOX_CONFIG_NSLOOKUP_LEDE config BUSYBOX_CONFIG_NSLOOKUP_OPENWRT
bool "nslookup_lede" bool "nslookup_lede"
depends on !BUSYBOX_CONFIG_NSLOOKUP depends on !BUSYBOX_CONFIG_NSLOOKUP
default BUSYBOX_DEFAULT_NSLOOKUP_LEDE default BUSYBOX_DEFAULT_NSLOOKUP_OPENWRT
help help
nslookup is a tool to query Internet name servers (LEDE flavor). nslookup is a tool to query Internet name servers (OpenWrt flavor).
config BUSYBOX_CONFIG_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS config BUSYBOX_CONFIG_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
bool "Enable long options" bool "Enable long options"
default BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS default BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
depends on BUSYBOX_CONFIG_NSLOOKUP_LEDE && BUSYBOX_CONFIG_LONG_OPTS depends on BUSYBOX_CONFIG_NSLOOKUP_OPENWRT && BUSYBOX_CONFIG_LONG_OPTS
help help
Support long options for the nslookup applet. Support long options for the nslookup applet.
config BUSYBOX_CONFIG_NTPD config BUSYBOX_CONFIG_NTPD

16
package/utils/busybox/patches/230-add_nslookup_lede.patch
View File

@ -53,23 +53,23 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */ + */
+ +
+//config:config NSLOOKUP_LEDE +//config:config NSLOOKUP_OPENWRT
+//config: bool "nslookup_lede" +//config: bool "nslookup_openwrt"
+//config: depends on !NSLOOKUP +//config: depends on !NSLOOKUP
+//config: default y +//config: default y
+//config: help +//config: help
+//config: nslookup is a tool to query Internet name servers (LEDE flavor). +//config: nslookup is a tool to query Internet name servers (LEDE flavor).
+//config: +//config:
+//config:config FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS +//config:config FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
+//config: bool "Enable long options" +//config: bool "Enable long options"
+//config: default y +//config: default y
+//config: depends on NSLOOKUP_LEDE && LONG_OPTS +//config: depends on NSLOOKUP_OPENWRT && LONG_OPTS
+//config: help +//config: help
+//config: Support long options for the nslookup applet. +//config: Support long options for the nslookup applet.
+ +
+//applet:IF_NSLOOKUP_LEDE(APPLET(nslookup, BB_DIR_USR_BIN, BB_SUID_DROP)) +//applet:IF_NSLOOKUP_OPENWRT(APPLET(nslookup, BB_DIR_USR_BIN, BB_SUID_DROP))
+ +
+//kbuild:lib-$(CONFIG_NSLOOKUP_LEDE) += nslookup_lede.o +//kbuild:lib-$(CONFIG_NSLOOKUP_OPENWRT) += nslookup_lede.o
+ +
+//usage:#define nslookup_lede_trivial_usage +//usage:#define nslookup_lede_trivial_usage
+//usage: "[HOST] [SERVER]" +//usage: "[HOST] [SERVER]"
@ -753,7 +753,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
+} +}
+ +
+ +
+#if ENABLE_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS +#if ENABLE_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
+static const char nslookup_longopts[] ALIGN1 = +static const char nslookup_longopts[] ALIGN1 =
+ "type\0" Required_argument "q" + "type\0" Required_argument "q"
+ "querytype\0" Required_argument "q" + "querytype\0" Required_argument "q"
@ -778,7 +778,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
+ unsigned int types = 0; + unsigned int types = 0;
+ HEADER *header; + HEADER *header;
+ +
+#if ENABLE_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS +#if ENABLE_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
+ applet_long_options = nslookup_longopts; + applet_long_options = nslookup_longopts;
+#endif +#endif
+ +

2
package/utils/ct-bugcheck/src/bugcheck.sh
View File

@ -11,7 +11,7 @@ FOUND_BUG=0
bugcheck_generic() bugcheck_generic()
{ {
echo "LEDE crashlog report" > $CRASHDIR/info.txt echo "OpenWrt crashlog report" > $CRASHDIR/info.txt
date >> $CRASHDIR/info.txt date >> $CRASHDIR/info.txt
echo >> $CRASHDIR/info.txt echo >> $CRASHDIR/info.txt
echo "uname" >> $CRASHDIR/info.txt echo "uname" >> $CRASHDIR/info.txt

2
scripts/checkpatch.pl
View File

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

12
scripts/qemustart
View File

@ -107,8 +107,8 @@ Examples
$SELF malta le64 $SELF malta le64
$SELF malta be-glibc $SELF malta be-glibc
$SELF armvirt 32 \\ $SELF armvirt 32 \\
--kernel bin/targets/armvirt/32/lede-armvirt-32-zImage \\ --kernel bin/targets/armvirt/32/openwrt-armvirt-32-zImage \\
--rootfs bin/targets/armvirt/32/lede-armvirt-32-root.ext4 --rootfs bin/targets/armvirt/32/openwrt-armvirt-32-root.ext4
EOF EOF
} }
@ -158,12 +158,12 @@ start_qemu_armvirt() {
32) 32)
qemu_exe="qemu-system-arm" qemu_exe="qemu-system-arm"
cpu="cortex-a15" cpu="cortex-a15"
[ -n "$kernel" ] || kernel="$o_bindir/lede-$o_target-${o_subtarget%-*}-zImage-initramfs" [ -n "$kernel" ] || kernel="$o_bindir/openwrt-$o_target-${o_subtarget%-*}-zImage-initramfs"
;; ;;
64) 64)
qemu_exe="qemu-system-aarch64" qemu_exe="qemu-system-aarch64"
cpu="cortex-a57" cpu="cortex-a57"
[ -n "$kernel" ] || kernel="$o_bindir/lede-$o_target-${o_subtarget%-*}-Image-initramfs" [ -n "$kernel" ] || kernel="$o_bindir/openwrt-$o_target-${o_subtarget%-*}-Image-initramfs"
;; ;;
*) *)
__errmsg "target $o_target: unknown subtarget $o_subtarget" __errmsg "target $o_target: unknown subtarget $o_subtarget"
@ -199,7 +199,7 @@ start_qemu_malta() {
[ "$(echo "$o_subtarget" | grep -o '^..')" = "le" ] && isel="el" [ "$(echo "$o_subtarget" | grep -o '^..')" = "le" ] && isel="el"
qemu_exe="qemu-system-mips$is64$isel" qemu_exe="qemu-system-mips$is64$isel"
[ -n "$kernel" ] || kernel="$o_bindir/lede-malta-${o_subtarget%-*}-vmlinux-initramfs.elf" [ -n "$kernel" ] || kernel="$o_bindir/openwrt-malta-${o_subtarget%-*}-vmlinux-initramfs.elf"
# NOTE: order of wan, lan -device arguments matters as it will affect which # NOTE: order of wan, lan -device arguments matters as it will affect which
# one will be actually used as the wan, lan network interface inside the # one will be actually used as the wan, lan network interface inside the
@ -216,7 +216,7 @@ start_qemu_x86() {
local qemu_exe local qemu_exe
[ -n "$rootfs" ] || { [ -n "$rootfs" ] || {
rootfs="$o_bindir/lede-$o_target-${o_subtarget%-*}-combined-ext4.img" rootfs="$o_bindir/openwrt-$o_target-${o_subtarget%-*}-combined-ext4.img"
if [ ! -f "$rootfs" -a -s "$rootfs.gz" ]; then if [ ! -f "$rootfs" -a -s "$rootfs.gz" ]; then
gunzip "$rootfs.gz" gunzip "$rootfs.gz"
fi fi

2
target/imagebuilder/Config.in
View File

@ -1,5 +1,5 @@
config IB config IB
bool "Build the LEDE Image Builder" bool "Build the OpenWrt Image Builder"
depends on !EXTERNAL_TOOLCHAIN depends on !EXTERNAL_TOOLCHAIN
default BUILDBOT default BUILDBOT
help help

2
target/imagebuilder/files/repositories.conf
View File

@ -1,4 +1,4 @@
## Place your custom repositories here, they must match the architecture and version. ## Place your custom repositories here, they must match the architecture and version.
# src/gz %n %U # src/gz %n %U
# src custom file:///usr/src/lede/bin/%T/packages # src custom file:///usr/src/openwrt/bin/%T/packages

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

@ -116,7 +116,7 @@ define Build/create-uImage-dtb
# flat_dt target expect FIT image - which WNDR4700's uboot doesn't support # flat_dt target expect FIT image - which WNDR4700's uboot doesn't support
-$(STAGING_DIR_HOST)/bin/mkimage -A $(LINUX_KARCH) \ -$(STAGING_DIR_HOST)/bin/mkimage -A $(LINUX_KARCH) \
-O linux -T kernel -C none \ -O linux -T kernel -C none \
-n '$(call toupper,$(LINUX_KARCH)) LEDE Linux-$(LINUX_VERSION)' \ -n '$(call toupper,$(LINUX_KARCH)) OpenWrt Linux-$(LINUX_VERSION)' \
-d $(IMAGE_KERNEL).dtb $@.new -d $(IMAGE_KERNEL).dtb $@.new
@mv $@.new $@ @mv $@.new $@
endef endef

4
target/linux/ar71xx/image/generic.mk
View File

@ -12,7 +12,7 @@ define Build/mkwrggimg
$(STAGING_DIR_HOST)/bin/mkwrggimg -b \ $(STAGING_DIR_HOST)/bin/mkwrggimg -b \
-i $@ -o $@.imghdr -d /dev/mtdblock/1 \ -i $@ -o $@.imghdr -d /dev/mtdblock/1 \
-m $(BOARDNAME) -s $(DAP_SIGNATURE) \ -m $(BOARDNAME) -s $(DAP_SIGNATURE) \
-v LEDE -B $(REVISION) -v OpenWrt -B $(REVISION)
mv $@.imghdr $@ mv $@.imghdr $@
endef endef
@ -66,7 +66,7 @@ define Build/uImageHiWiFi
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 'tw150v1 $(call toupper,$(LINUX_KARCH)) LEDE Linux-$(LINUX_VERSION)' -d $@ $@.new -n 'tw150v1 $(call toupper,$(LINUX_KARCH)) OpenWrt Linux-$(LINUX_VERSION)' -d $@ $@.new
@mv $@.new $@ @mv $@.new $@
endef endef

4
target/linux/ar71xx/image/legacy.mk
View File

@ -486,11 +486,11 @@ define Image/Build/Belkin
$(eval rootsize=$(call mtdpartsize,rootfs,$(4))) $(eval rootsize=$(call mtdpartsize,rootfs,$(4)))
$(call Sysupgrade/RKuImage,$(1),$(2),$(kernsize),$(rootsize)) $(call Sysupgrade/RKuImage,$(1),$(2),$(kernsize),$(rootsize))
if [ -e "$(call sysupname,$(1),$(2))" ]; then \ if [ -e "$(call sysupname,$(1),$(2))" ]; then \
edimax_fw_header -m $(5) -v "$(shell echo -n LEDE$(REVISION) | cut -c -13)" \ edimax_fw_header -m $(5) -v "$(shell echo -n OpenWrt$(REVISION) | cut -c -13)" \
-n "uImage" \ -n "uImage" \
-i $(KDIR_TMP)/vmlinux-$(2).uImage \ -i $(KDIR_TMP)/vmlinux-$(2).uImage \
-o $(KDIR_TMP)/$(2)-uImage; \ -o $(KDIR_TMP)/$(2)-uImage; \
edimax_fw_header -m $(5) -v "$(shell echo -n LEDE$(REVISION) | cut -c -13)" \ edimax_fw_header -m $(5) -v "$(shell echo -n OpenWrt$(REVISION) | cut -c -13)" \
-n "rootfs" \ -n "rootfs" \
-i $(KDIR)/root.$(1) \ -i $(KDIR)/root.$(1) \
-o $(KDIR_TMP)/$(2)-rootfs; \ -o $(KDIR_TMP)/$(2)-rootfs; \

2
target/linux/ar71xx/image/tp-link.mk
View File

@ -39,7 +39,7 @@ define Build/uImageArcher
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)) LEDE Linux-$(LINUX_VERSION)' -d $@ $@.new -n '$(call toupper,$(LINUX_KARCH)) OpenWrt Linux-$(LINUX_VERSION)' -d $@ $@.new
@mv $@.new $@ @mv $@.new $@
endef endef

16
target/linux/armvirt/README
View File

@ -4,18 +4,18 @@ QEMU ARM virt machine.
Run with qemu-system-arm Run with qemu-system-arm
# boot with initramfs embedded in # boot with initramfs embedded in
qemu-system-arm -nographic -M virt -m 64 -kernel lede-armvirt-32-zImage-initramfs qemu-system-arm -nographic -M virt -m 64 -kernel openwrt-armvirt-32-zImage-initramfs
# boot with accel=kvm # boot with accel=kvm
qemu-system-arm -nographic -M virt,accel=kvm -cpu host -m 64 -kernel qemu-system-arm -nographic -M virt,accel=kvm -cpu host -m 64 -kernel
lede-armvirt-32-zImage-initramfs openwrt-armvirt-32-zImage-initramfs
# boot with a separate rootfs # boot with a separate rootfs
qemu-system-arm -nographic -M virt -m 64 -kernel lede-armvirt-32-zImage \ qemu-system-arm -nographic -M virt -m 64 -kernel openwrt-armvirt-32-zImage \
-drive file=lede-armvirt-32-root.ext4,format=raw,if=virtio -append 'root=/dev/vda rootwait' -drive file=openwrt-armvirt-32-root.ext4,format=raw,if=virtio -append 'root=/dev/vda rootwait'
# boot with local dir as rootfs # boot with local dir as rootfs
qemu-system-arm -nographic -M virt -m 64 -kernel lede-armvirt-32-zImage \ qemu-system-arm -nographic -M virt -m 64 -kernel openwrt-armvirt-32-zImage \
-fsdev local,id=rootdev,path=root-armvirt/,security_model=none \ -fsdev local,id=rootdev,path=root-armvirt/,security_model=none \
-device virtio-9p-pci,fsdev=rootdev,mount_tag=/dev/root \ -device virtio-9p-pci,fsdev=rootdev,mount_tag=/dev/root \
-append 'rootflags=trans=virtio,version=9p2000.L,cache=loose rootfstype=9p' -append 'rootflags=trans=virtio,version=9p2000.L,cache=loose rootfstype=9p'
@ -23,10 +23,10 @@ Run with qemu-system-arm
Run with kvmtool Run with kvmtool
# start a named machine # start a named machine
lkvm run -k lede-armvirt-32-zImage -i lede-armvirt-32-rootfs.cpio --name armvirt0 lkvm run -k openwrt-armvirt-32-zImage -i openwrt-armvirt-32-rootfs.cpio --name armvirt0
# start with virtio-9p rootfs # start with virtio-9p rootfs
lkvm run -k lede-armvirt-32-zImage -d root-armvirt/ lkvm run -k openwrt-armvirt-32-zImage -d root-armvirt/
# stop "armvirt0" # stop "armvirt0"
lkvm stop --name armvirt0 lkvm stop --name armvirt0
@ -37,4 +37,4 @@ Run with kvmtool
The multi-platform ARMv8 target can be used with QEMU: The multi-platform ARMv8 target can be used with QEMU:
qemu-system-aarch64 -machine virt -cpu cortex-a57 -nographic \ qemu-system-aarch64 -machine virt -cpu cortex-a57 -nographic \
-kernel lede-armvirt-64-Image-initramfs \ -kernel openwrt-armvirt-64-Image-initramfs \

6
target/linux/brcm63xx/image/bcm63xx.mk
View File

@ -978,7 +978,7 @@ define Device/NEUFBOX4-SER
DEVICE_DTS := nb4-ser-r0 DEVICE_DTS := nb4-ser-r0
CFE_BOARD_ID := 96358VW CFE_BOARD_ID := 96358VW
CFE_CHIP_ID := 6358 CFE_CHIP_ID := 6358
CFE_EXTRAS += --rsa-signature "LEDE-$(firstword $(subst -,$(space),$(REVISION)))" CFE_EXTRAS += --rsa-signature "OpenWrt-$(firstword $(subst -,$(space),$(REVISION)))"
DEVICE_PACKAGES := \ DEVICE_PACKAGES := \
$(B43_PACKAGES) $(USB2_PACKAGES) $(B43_PACKAGES) $(USB2_PACKAGES)
endef endef
@ -990,7 +990,7 @@ define Device/NEUFBOX4-FXC
DEVICE_DTS := nb4-fxc-r1 DEVICE_DTS := nb4-fxc-r1
CFE_BOARD_ID := 96358VW CFE_BOARD_ID := 96358VW
CFE_CHIP_ID := 6358 CFE_CHIP_ID := 6358
CFE_EXTRAS += --rsa-signature "LEDE-$(firstword $(subst -,$(space),$(REVISION)))" CFE_EXTRAS += --rsa-signature "OpenWrt-$(firstword $(subst -,$(space),$(REVISION)))"
DEVICE_PACKAGES := \ DEVICE_PACKAGES := \
$(B43_PACKAGES) $(USB2_PACKAGES) $(B43_PACKAGES) $(USB2_PACKAGES)
endef endef
@ -1002,7 +1002,7 @@ define Device/NEUFBOX6
DEVICE_DTS := nb6-ser-r0 DEVICE_DTS := nb6-ser-r0
CFE_BOARD_ID := NB6-SER-r0 CFE_BOARD_ID := NB6-SER-r0
CFE_CHIP_ID := 6362 CFE_CHIP_ID := 6362
CFE_EXTRAS += --rsa-signature "LEDE-$(firstword $(subst -,$(space),$(REVISION)))" CFE_EXTRAS += --rsa-signature "OpenWrt-$(firstword $(subst -,$(space),$(REVISION)))"
DEVICE_PACKAGES := \ DEVICE_PACKAGES := \
$(B43_PACKAGES) $(USB2_PACKAGES) $(B43_PACKAGES) $(USB2_PACKAGES)
endef endef

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

@ -39,7 +39,7 @@ endef
define Build/fullimage define Build/fullimage
mkimage -A mips -O linux -C lzma -T filesystem -a 0x00 \ mkimage -A mips -O linux -C lzma -T filesystem -a 0x00 \
-e 0x00 -n 'LEDE RootFS' \ -e 0x00 -n 'OpenWrt RootFS' \
-d $(IMAGE_ROOTFS) $(IMAGE_ROOTFS).new -d $(IMAGE_ROOTFS) $(IMAGE_ROOTFS).new
cat $(IMAGE_KERNEL) $(IMAGE_ROOTFS).new > $@.tmp cat $(IMAGE_KERNEL) $(IMAGE_ROOTFS).new > $@.tmp

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 LEDE Linux-$(LINUX_VERSION)' -d $(1) $(2); -n 'ARM OpenWrt Linux-$(LINUX_VERSION)' -d $(1) $(2);
endef endef
define Image/Build/DTB define Image/Build/DTB

4
target/linux/mvebu/image/cfbase-boot.script
View File

@ -9,8 +9,8 @@ setenv fdtfile armada-388-clearfog-base.dtb
# generate bootargs for rootfs on MMC # generate bootargs for rootfs on MMC
if test "${devtype}" = "mmc"; then if test "${devtype}" = "mmc"; then
setexpr lede_rootpart ${distro_bootpart} + 1 setexpr openwrt_rootpart ${distro_bootpart} + 1
setenv bootargs ${bootargs} root=/dev/mmcblk${devnum}p${lede_rootpart} rootfstype=auto rootwait setenv bootargs ${bootargs} root=/dev/mmcblk${devnum}p${openwrt_rootpart} rootfstype=auto rootwait
fi fi
# here one could add logic for other rootfs device types such as scsi and usb # here one could add logic for other rootfs device types such as scsi and usb

4
target/linux/mvebu/image/cfpro-boot.script
View File

@ -5,8 +5,8 @@
# generate bootargs for rootfs on MMC # generate bootargs for rootfs on MMC
if test "${devtype}" = "mmc"; then if test "${devtype}" = "mmc"; then
setexpr lede_rootpart ${distro_bootpart} + 1 setexpr openwrt_rootpart ${distro_bootpart} + 1
setenv bootargs ${bootargs} root=/dev/mmcblk${devnum}p${lede_rootpart} rootfstype=auto rootwait setenv bootargs ${bootargs} root=/dev/mmcblk${devnum}p${openwrt_rootpart} rootfstype=auto rootwait
fi fi
# here one could add logic for other rootfs device types such as scsi and usb # here one could add logic for other rootfs device types such as scsi and usb

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 LEDE option ssid OpenWrt
# option encryption psk2 # option encryption psk2
# option key "foobar" # option key "foobar"

5
target/linux/uml/README
View File

@ -1,4 +1,4 @@
LEDE inside a user mode linux. Why would we even want this many ask? OpenWrt inside a user mode linux. Why would we even want this many ask?
There are potentially a lot of reasons, one obvious one to me, it allows There are potentially a lot of reasons, one obvious one to me, it allows
folks to 'kick the tires' without actually flashing up any hardware. It's folks to 'kick the tires' without actually flashing up any hardware. It's
@ -17,7 +17,8 @@ build it all
In your bin directory you will find a kernel and an ext4 root file system In your bin directory you will find a kernel and an ext4 root file system
when it's finished. Just run it like this:- when it's finished. Just run it like this:-
bin/targets/uml/generic/lede-uml-vmlinux ubd0=bin/targets/uml/generic/lede-uml-ext4.img bin/targets/uml/generic/lede-uml-vmlinux
ubd0=bin/targets/uml/generic/openwrt-uml-ext4.img
The uml will start, and eventually the serial console of the uml will be at your The uml will start, and eventually the serial console of the uml will be at your
console prompt. If you would like it in xterms, substitute con=xterm and con0=xterm. console prompt. If you would like it in xterms, substitute con=xterm and con0=xterm.

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 "LEDE" { menuentry "OpenWrt" {
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='(@ROOT@)' set root='(@ROOT@)'
menuentry "LEDE" { menuentry "OpenWrt" {
linux /boot/vmlinuz @CMDLINE@ noinitrd linux /boot/vmlinuz @CMDLINE@ noinitrd
} }
menuentry "LEDE (failsafe)" { menuentry "OpenWrt (failsafe)" {
linux /boot/vmlinuz failsafe=true @CMDLINE@ noinitrd linux /boot/vmlinuz failsafe=true @CMDLINE@ noinitrd
} }

4
target/sdk/Config.in
View File

@ -1,10 +1,10 @@
config SDK config SDK
bool "Build the LEDE SDK" bool "Build the OpenWrt SDK"
depends on !EXTERNAL_TOOLCHAIN depends on !EXTERNAL_TOOLCHAIN
default BUILDBOT default BUILDBOT
help help
This is essentially a stripped-down version of the buildroot This is essentially a stripped-down version of the buildroot
with a precompiled toolchain. It can be used to develop and with a precompiled toolchain. It can be used to develop and
test packages for LEDE before including them in the buildroot test packages for OpenWrt before including them in the buildroot

4
target/sdk/files/README.SDK
View File

@ -1,7 +1,7 @@
This is the LEDE SDK. It contains a stripped-down version of This is the OpenWrt SDK. It contains a stripped-down version of
the buildroot. You can use it to test/develop packages without the buildroot. You can use it to test/develop packages without
having to compile your own toolchain or any of the libraries having to compile your own toolchain or any of the libraries
included with LEDE. included with OpenWrt.
To use it, just put your buildroot-compatible package directory To use it, just put your buildroot-compatible package directory
(including its dependencies) in the subdir 'package/' and run (including its dependencies) in the subdir 'package/' and run

6
target/toolchain/Config.in
View File

@ -1,8 +1,8 @@
config MAKE_TOOLCHAIN config MAKE_TOOLCHAIN
bool "Package the LEDE-based Toolchain" bool "Package the OpenWrt-based Toolchain"
depends on !EXTERNAL_TOOLCHAIN depends on !EXTERNAL_TOOLCHAIN
help help
Package the created toolchain as a tarball under the bin/ directory as Package the created toolchain as a tarball under the bin/ directory as
LEDE-Toolchain-$(BOARD)-for-$(ARCH)$(ARCH_SUFFIX)-gcc-$(GCCV)$(DIR_SUFFIX). OpenWrt-Toolchain-$(BOARD)-for-$(ARCH)$(ARCH_SUFFIX)-gcc-$(GCCV)$(DIR_SUFFIX).
For example, a toolchain for the MIPS architecture might be named For example, a toolchain for the MIPS architecture might be named
LEDE-Toolchain-malta-for-mipsel_mips32-gcc-4.8-linaro_uClibc-0.9.33.2.tar.bz2. OpenWrt-Toolchain-malta-for-mipsel_mips32-gcc-4.8-linaro_uClibc-0.9.33.2.tar.bz2.

2
target/toolchain/files/README.TOOLCHAIN
View File

@ -1,2 +1,2 @@
This is the LEDE SDK. It contains just the toolchain created This is the OpenWrt SDK. It contains just the toolchain created
by buildroot. by buildroot.

2
toolchain/gcc/common.mk
View File

@ -53,7 +53,7 @@ endif
PATCH_DIR=../patches/$(GCC_VERSION) PATCH_DIR=../patches/$(GCC_VERSION)
BUGURL=http://www.lede-project.org/bugs/ BUGURL=http://www.lede-project.org/bugs/
PKGVERSION=LEDE GCC $(PKG_VERSION) $(REVISION) PKGVERSION=OpenWrt GCC $(PKG_VERSION) $(REVISION)
HOST_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1