From patchwork Wed Jan 20 18:20:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Dickinson X-Patchwork-Id: 570849 X-Patchwork-Delegate: nbd@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 2196A14076E for ; Thu, 21 Jan 2016 05:23:12 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id D2CEF28021B; Wed, 20 Jan 2016 19:20:51 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-0.3 required=5.0 tests=BAYES_00,RDNS_NONE autolearn=no version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 45E29289D12 for ; Wed, 20 Jan 2016 19:19:41 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from s2.neomailbox.net (unknown [5.148.176.60]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Wed, 20 Jan 2016 19:19:39 +0100 (CET) From: openwrt@daniel.thecshore.com To: openwrt-devel@lists.openwrt.org Date: Wed, 20 Jan 2016 13:20:09 -0500 Message-Id: <1453314009-5602-8-git-send-email-openwrt@daniel.thecshore.com> In-Reply-To: <1453314009-5602-1-git-send-email-openwrt@daniel.thecshore.com> References: <1453314009-5602-1-git-send-email-openwrt@daniel.thecshore.com> Subject: [OpenWrt-Devel] [PATCH 8/8] kirkwood: Translate the build all profiles profile to new multi-profile config X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" From: Daniel Dickinson Minor fixes so that that kirkwood acts correctly in the new multi-profile build machinery/menuconfig (allowing multi-profile selection). Signed-off-by: Daniel Dickinson --- target/linux/kirkwood/Makefile | 1 + target/linux/kirkwood/image/Makefile | 12 ++++++++++-- target/linux/kirkwood/profiles/050-unified.mk | 17 +++++++++++++++++ target/linux/kirkwood/profiles/100-generic.mk | 1 + 4 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 target/linux/kirkwood/profiles/050-unified.mk diff --git a/target/linux/kirkwood/Makefile b/target/linux/kirkwood/Makefile index 2db7e39..7bc7dbb 100644 --- a/target/linux/kirkwood/Makefile +++ b/target/linux/kirkwood/Makefile @@ -12,6 +12,7 @@ BOARDNAME:=Marvell Kirkwood FEATURES:=targz usb jffs2_nand nand ubifs squashfs CPU_TYPE:=xscale MAINTAINER:=Luka Perkov +TARGET_MULTI_SELECT:=1 KERNEL_PATCHVER:=3.18 diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile index 24cb317..5cd52f7 100644 --- a/target/linux/kirkwood/image/Makefile +++ b/target/linux/kirkwood/image/Makefile @@ -182,12 +182,20 @@ Image/InstallKernel/Template/GuruplugServerPlus=$(call Image/InstallKernel/Templ Image/BuildKernel/Template/Topkick1281P2=$(call Image/BuildKernel/Template,topkick) Image/InstallKernel/Template/Topkick1281P2=$(call Image/InstallKernel/Template,topkick) +define Image/BuildKernel/Template/Unified + true +endef + +define Image/InstallKernel/Template/Unified + true +endef + define Image/BuildKernel - $(call Image/BuildKernel/Template/$(PROFILE)) + $(foreach profile,$(PROFILES_BUILD),$(call Image/BuildKernel/Template/$(profile))) endef define Image/InstallKernel - $(call Image/InstallKernel/Template/$(PROFILE)) + $(foreach profile,$(PROFILES_BUILD),$(call Image/InstallKernel/Template/$(profile))) endef define Image/Build diff --git a/target/linux/kirkwood/profiles/050-unified.mk b/target/linux/kirkwood/profiles/050-unified.mk new file mode 100644 index 0000000..1c55897 --- /dev/null +++ b/target/linux/kirkwood/profiles/050-unified.mk @@ -0,0 +1,17 @@ +# +# Copyright (C) 2013 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/Unified + NAME:=Unified Profile (merge of all selected profiles) + PROFILE_TYPE:=unified +endef + +define Profile/Unified/Description + Build all selected images with a profile that is the merge of all selected profiles. +endef + +$(eval $(call Profile,Unified)) diff --git a/target/linux/kirkwood/profiles/100-generic.mk b/target/linux/kirkwood/profiles/100-generic.mk index f07cea8..6f8a0a8 100644 --- a/target/linux/kirkwood/profiles/100-generic.mk +++ b/target/linux/kirkwood/profiles/100-generic.mk @@ -13,6 +13,7 @@ define Profile/Generic kmod-ata-core kmod-ata-marvell-sata \ kmod-rtc-marvell kmod-thermal-kirkwood \ kmod-mwl8k swconfig wpad-mini + PROFILE_DEFAULT:=1 endef define Profile/Generic/Description