A quanto pare habemus remerge tra LEDE e OpenWRT!
Clauz
Forwarded Message
Subject: [LEDE-DEV] merge: add OpenWrt branding
Date: Tue, 24 Oct 2017 13:46:18 +0200
From: Zoltan HERPAI
To: lede-...@lists.infradead.org
CC: openwrt-hack...@lists.openwrt.org, openwrt-de...@lists.openwrt.org,
ha...@hauke-m.de, lede-...@lists.infradead.org, m...@openwrt.org, Zoltan HERPAI
, ka...@openwrt.org
Given that we've decided to sail under the same flag for
the benefit of the whole community, and acknowledge the
achievements of the LEDE project, let's start the final
steps of the merge.
The git and other sources are untouched until the infra merge.
Signed-off-by: Zoltan HERPAI
Signed-off-by: Imre Kaloz
diff --git a/Config.in b/Config.in
index ddbc4e2..d30c048 100644
--- a/Config.in
+++ b/Config.in
@@ -4,7 +4,7 @@
# See /LICENSE for more information.
#
-mainmenu "LEDE Configuration"
+mainmenu "OpenWrt Configuration"
config MODULES
option modules
diff --git a/Makefile b/Makefile
index 09db75c..0a1f96a 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 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:
diff --git a/README b/README
index 405c18b..864ea2f 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is the buildsystem for the LEDE Linux distribution.
+This is the buildsystem for the OpenWrt Linux distribution.
Please use "make menuconfig" to choose your preferred
configuration for the toolchain and firmware.
@@ -23,7 +23,7 @@ the lack of case sensitiveness in the file system.
Sunshine!
- Your LEDE Community
- http://www.lede-project.org
+ Your OpenWrt Community
+ http://www.openwrt.org
diff --git a/include/image-commands.mk b/include/image-commands.mk
index aaece70..3507578 100644
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -7,7 +7,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 '$(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 $@
endef
@@ -60,7 +60,7 @@ endef
define Build/netgear-dni
$(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)) \
-r "$(1)" \
-i $@ -o $@.new
@@ -83,7 +83,7 @@ define Build/append-uImage-fakeroot-hdr
rm -f $@.fakeroot
$(STAGING_DIR_HOST)/bin/mkimage \
-A $(LINUX_KARCH) -O linux -T filesystem -C none \
- -n '$(call toupper,$(LINUX_KARCH)) LEDE fakeroot' \
+ -n '$(call toupper,$(LINUX_KARCH)) OpenWrt fakeroot' \
-s \
$@.fakeroot
cat $@.fakeroot >> $@
diff --git a/include/image.mk b/include/image.mk
index 3f5b454..eccf943 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -136,7 +136,7 @@ endef
define Image/BuildKernel/MkuImage
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
define Image/BuildKernel/MkFIT
diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 7d96921..0fab326 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -18,7 +18,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, \
- 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; \
test ! -f $(TMP_DIR)/test.FS))
diff --git a/include/version.mk b/include/version.mk
index 1a0d3c9..4a8ac0b 100644
--- a/include/version.mk
+++ b/include/version.mk
@@ -40,23 +40,23 @@ 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.lede-project.org/snapshots)
+VERSION_REPO:=$(if
$(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/snapshots)
VERSION_DIST:=$(call qstrip_escape,$(CONFIG_VERS
