merge: add OpenWrt branding
Jo-Philipp Wich
jo at mein.io
Tue Oct 24 09:07:04 EDT 2017
Hi,
comments inline.
> Signed-off-by: Imre Kaloz <kaloz at openwrt.org>
Given the fact that we explicitely wanted to avoid @openwrt.org mails
and that this was one of the discussion points leading to the split I
find it delicate to seal the merging commit with exactly such a S-o-b.
Combined with ...
$ git log --author "Imre Kaloz <kaloz at openwrt.org>" --format=%cD -1
Tue, 18 Oct 2016 11:42:06 +0200
... this looks to me like nothing was learned from past experiences and
that all that matters here is having the own name attached to the work
being done.
Anyhow, on to the code.
> diff --git a/Config.in b/Config.in
> index ddbc4e2..d30c048 100644
> --- a/Config.in
> +++ b/Config.in
[...]
> 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)
We need to setup the server first or delegate downloads.openwrt.org to
downloads.lede-project.org or add a rewrite rule to redirect
http://downloads.openwrt.org/snapshots/(.*) to
http://downloads.lede-project.org/snapshots/$1 for now.
> VERSION_BUG_URL:=$(call qstrip_escape,$(CONFIG_VERSION_BUG_URL))
> -VERSION_BUG_URL:=$(if $(VERSION_BUG_URL),$(VERSION_BUG_URL),http://bugs.lede-project.org/)
> +VERSION_BUG_URL:=$(if $(VERSION_BUG_URL),$(VERSION_BUG_URL),http://bugs.openwrt.org/)
Likewise.
> VERSION_SUPPORT_URL:=$(call qstrip_escape,$(CONFIG_VERSION_SUPPORT_URL))
> -VERSION_SUPPORT_URL:=$(if $(VERSION_SUPPORT_URL),$(VERSION_SUPPORT_URL),http://forum.lede-project.org/)
> +VERSION_SUPPORT_URL:=$(if $(VERSION_SUPPORT_URL),$(VERSION_SUPPORT_URL),http://forum.openwrt.org/)
Undecided.
>
> VERSION_PRODUCT:=$(call qstrip_escape,$(CONFIG_VERSION_PRODUCT))
> VERSION_PRODUCT:=$(if $(VERSION_PRODUCT),$(VERSION_PRODUCT),Generic)
[...]
> diff --git a/package/base-files/files/etc/banner b/package/base-files/files/etc/banner
> index 4ec646a..af51b5a 100644
> --- a/package/base-files/files/etc/banner
> +++ b/package/base-files/files/etc/banner
> @@ -1,10 +1,13 @@
> - _________
> - / /\ _ ___ ___ ___
> - / LE / \ | | | __| \| __|
> - / DE / \ | |__| _|| |) | _|
> - /________/ LE \ |____|___|___/|___| lede-project.org
> - \ \ DE /
> - \ LE \ / -----------------------------------------------------------
> - \ DE \ / %N (%V, %C)
> - \________\/ -----------------------------------------------------------
> -
> + _______ ________ __
> + | |.-----.-----.-----.| | | |.----.| |_
> + | - || _ | -__| || | | || _|| _|
> + |_______|| __|_____|__|__||________||__| |____|
> + |__| W I R E L E S S F R E E D O M
> + -----------------------------------------------------
> + DESIGNATED DRIVER (%C, %R)
Please replace "DESIGNATED DRIVER" with "%N". "%V, %C" (17.01.4,
r3560-79f57e422d) are more useful under the new version scheme than "%C,
%R" (r3560-79f57e422d, r3560-79f57e422d)
> + -----------------------------------------------------
> + * 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
> + -----------------------------------------------------
> diff --git a/package/base-files/files/etc/init.d/system b/package/base-files/files/etc/init.d/system
> index 8c5f677..54c0e3e 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:lede' \
> + 'hostname:string:openwrt' \
While we're at it we should properly capitalize the default to "OpenWrt".
> 'conloglevel:uinteger' \
> 'buffersize:uinteger' \
> 'timezone:string:UTC' \
[...]
> diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init
> index 6b8be1c..fd8365a 100755
> --- a/package/network/services/uhttpd/files/uhttpd.init
> +++ b/package/network/services/uhttpd/files/uhttpd.init
> @@ -52,7 +52,7 @@ generate_keys() {
> [ -n "$GENKEY_CMD" ] && {
> $GENKEY_CMD \
> -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:-DE}"/ST="${state:-Saxony}"/L="${location:-Leipzig}"/O="${commonname:-OpenWrt}$UNIQUEID"/CN="${commonname:-OpenWrt}"
Maybe we should adjust the defaults here to match the shipped config.
> 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 14a33c5..c9ef626 100644
> --- a/package/network/utils/iproute2/Makefile
> +++ b/package/network/utils/iproute2/Makefile
> @@ -108,7 +108,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)-lede\";" \
> + echo "static const char SNAPSHOT[] = \"$(PKG_VERSION)-$(PKG_RELEASE)-openwrt\";" \
> > $(PKG_BUILD_DIR)/include/SNAPSHOT.h
> endef
>
> diff --git a/package/utils/busybox/Config-defaults.in b/package/utils/busybox/Config-defaults.in
> index 79059e5..2a8d9dd 100644
> --- a/package/utils/busybox/Config-defaults.in
> +++ b/package/utils/busybox/Config-defaults.in
> @@ -2332,10 +2332,10 @@ config BUSYBOX_DEFAULT_FEATURE_NETSTAT_PRG
> config BUSYBOX_DEFAULT_NSLOOKUP
> bool
> default n
> -config BUSYBOX_DEFAULT_NSLOOKUP_LEDE
> +config BUSYBOX_DEFAULT_NSLOOKUP_OPENWRT
Need to adjust the patch file accordingly.
> bool
> default y
> -config BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS
> +config BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
Dito.
> bool
> default n
> config BUSYBOX_DEFAULT_NTPD
> diff --git a/package/utils/busybox/config/networking/Config.in b/package/utils/busybox/config/networking/Config.in
> index 14875d5..2d2a1c4 100644
> --- a/package/utils/busybox/config/networking/Config.in
> +++ b/package/utils/busybox/config/networking/Config.in
> @@ -700,17 +700,17 @@ config BUSYBOX_CONFIG_NSLOOKUP
> default BUSYBOX_DEFAULT_NSLOOKUP
> help
> nslookup is a tool to query Internet name servers.
> -config BUSYBOX_CONFIG_NSLOOKUP_LEDE
> +config BUSYBOX_CONFIG_NSLOOKUP_OPENWRT
Dito.
> bool "nslookup_lede"
> depends on !BUSYBOX_CONFIG_NSLOOKUP
> - default BUSYBOX_DEFAULT_NSLOOKUP_LEDE
> + default BUSYBOX_DEFAULT_NSLOOKUP_OPENWRT
Dito.
> 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
Dito.
> bool "Enable long options"
> - default BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS
> - depends on BUSYBOX_CONFIG_NSLOOKUP_LEDE && BUSYBOX_CONFIG_LONG_OPTS
> + default BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
> + depends on BUSYBOX_CONFIG_NSLOOKUP_OPENWRT && BUSYBOX_CONFIG_LONG_OPTS
> help
> Support long options for the nslookup applet.
> config BUSYBOX_CONFIG_NTPD
[...]
More information about the openwrt-adm
mailing list