[LEDE-DEV] [PATCH v4 0/8] merge: add OpenWrt branding

[Zoltan HERPAI]

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.

v2: - dismiss bugtracker and forum change
    - update uhttpd cert gen
    - update banner
    - update busybox NSLOOKUP patch

v3: - drop recipe in banner

v4: - split patches

Signed-off-by: Zoltan HERPAI <wigyori at uid0.hu>
Signed-off-by: Imre Kaloz <kaloz at openwrt.org>


Zoltan HERPAI (8):
  merge: base: update base-files and basic config
  merge: release/banner: drop release name and update banner
  merge: targets: update image generation and targets
  merge: ssid: update default ssid
  merge: packages: update branding in core packages
  merge: busybox: update CONFIG_NSLOOKUP in busybox config and
    respective patch
  merge: uhttpd: update cert generation to match system defaults
  merge: etc: update remaining files

 Config.in                                              |  2 +-
 Makefile                                               |  2 +-
 README                                                 |  6 +++---
 include/image-commands.mk                              |  6 +++---
 include/image.mk                                       |  2 +-
 include/prereq-build.mk                                |  2 +-
 include/version.mk                                     | 12 ++----------
 package/base-files/Makefile                            |  2 +-
 package/base-files/files/bin/config_generate           | 10 +++++-----
 package/base-files/files/etc/banner                    | 18 ++++++++----------
 package/base-files/files/etc/init.d/system             |  2 +-
 .../base-files/files/lib/preinit/10_indicate_preinit   |  2 +-
 package/base-files/image-config.in                     |  8 ++++----
 package/boot/uboot-layerscape-armv8_32b/Makefile       |  2 +-
 package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh  |  2 +-
 package/kernel/mac80211/files/lib/wifi/mac80211.sh     |  2 +-
 package/network/services/hostapd/files/hostapd.sh      |  4 ++--
 package/network/services/lldpd/files/lldpd.config      |  2 +-
 package/network/services/lldpd/files/lldpd.init        |  2 +-
 package/network/services/samba36/files/samba.config    |  4 ++--
 package/network/services/samba36/files/samba.init      |  6 +++---
 package/network/services/uhttpd/files/uhttpd.config    |  2 +-
 package/network/services/uhttpd/files/uhttpd.init      |  2 +-
 package/network/utils/iproute2/Makefile                |  2 +-
 package/utils/busybox/Config-defaults.in               |  4 ++--
 package/utils/busybox/config/networking/Config.in      | 12 ++++++------
 .../utils/busybox/patches/230-add_nslookup_lede.patch  | 16 ++++++++--------
 package/utils/ct-bugcheck/src/bugcheck.sh              |  2 +-
 scripts/brcmImage.pl                                   |  2 +-
 scripts/checkpatch.pl                                  |  2 +-
 scripts/config/mconf.c                                 |  2 +-
 scripts/qemustart                                      | 12 ++++++------
 target/imagebuilder/Config.in                          |  2 +-
 target/imagebuilder/files/repositories.conf            |  2 +-
 target/linux/apm821xx/image/Makefile                   |  2 +-
 target/linux/ar71xx/image/generic.mk                   |  4 ++--
 target/linux/ar71xx/image/legacy.mk                    |  4 ++--
 target/linux/ar71xx/image/tp-link.mk                   |  2 +-
 target/linux/armvirt/README                            | 16 ++++++++--------
 target/linux/brcm63xx/image/bcm63xx.mk                 |  6 +++---
 target/linux/lantiq/image/Makefile                     |  2 +-
 target/linux/mcs814x/image/Makefile                    |  2 +-
 target/linux/mvebu/image/cfbase-boot.script            |  4 ++--
 target/linux/mvebu/image/cfpro-boot.script             |  4 ++--
 target/linux/omap24xx/base-files/etc/config/wireless   |  2 +-
 target/linux/uml/README                                |  5 +++--
 target/linux/x86/image/grub-iso.cfg                    |  2 +-
 target/linux/x86/image/grub.cfg                        |  4 ++--
 target/sdk/Config.in                                   |  4 ++--
 target/sdk/files/README.SDK                            |  4 ++--
 target/toolchain/Config.in                             |  6 +++---
 target/toolchain/files/README.TOOLCHAIN                |  2 +-
 toolchain/gcc/common.mk                                |  2 +-
 53 files changed, 114 insertions(+), 123 deletions(-)

-- 
1.9.1