From patchwork Tue Nov 7 08:45:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zoltan Herpai X-Patchwork-Id: 835158 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (helo) smtp.helo=arrakis.dune.hu (client-ip=78.24.191.176; helo=arrakis.dune.hu; envelope-from=openwrt-devel-bounces@lists.openwrt.org; receiver=) Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yWNM65B0nz9t3Z for ; Tue, 7 Nov 2017 19:46:26 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 629EEB808C9; Tue, 7 Nov 2017 09:46:07 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.1 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP; Tue, 7 Nov 2017 09:46:07 +0100 (CET) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 3C82FB8069F; Tue, 7 Nov 2017 09:46:01 +0100 (CET) X-policyd-weight: using cached result; rate: -7 Received: from trabant.uid0.hu (trabant.uid0.hu [81.0.124.200]) by arrakis.dune.hu (Postfix) with ESMTPS; Tue, 7 Nov 2017 09:46:00 +0100 (CET) Received: from wigyori by trabant.uid0.hu with local (Exim 4.84_2 #1 (Debian)) id 1eBzWA-0000zK-71 from ; Tue, 07 Nov 2017 09:45:58 +0100 From: Zoltan HERPAI To: lede-adm@lists.infradead.org Date: Tue, 7 Nov 2017 09:45:49 +0100 Message-Id: <1510044357-3686-1-git-send-email-wigyori@uid0.hu> X-Mailer: git-send-email 1.9.1 Subject: [OpenWrt-Devel] [PATCH v4 0/8] merge: add OpenWrt branding X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: openwrt-hackers@lists.openwrt.org, openwrt-devel@lists.openwrt.org, hauke@hauke-m.de, lede-dev@lists.infradead.org MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" 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 Signed-off-by: Imre Kaloz 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(-) Acked-by: Hauke Mehrtens