From patchwork Tue Jan 19 02:50: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: 569734 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 3F909140328 for ; Tue, 19 Jan 2016 13:53:37 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id BEDB228C754; Tue, 19 Jan 2016 03:50:57 +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=-1.5 required=5.0 tests=BAYES_00 autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 8261E28C72E for ; Tue, 19 Jan 2016 03:49:44 +0100 (CET) X-policyd-weight: using cached result; rate:hard: -8.5 Received: from s1.neomailbox.net (s1.neomailbox.net [5.148.176.57]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Tue, 19 Jan 2016 03:49:44 +0100 (CET) From: openwrt@daniel.thecshore.com To: openwrt-devel@lists.openwrt.org Date: Mon, 18 Jan 2016 21:50:09 -0500 Message-Id: <1453171813-36623-10-git-send-email-openwrt@daniel.thecshore.com> In-Reply-To: <1453171813-36623-1-git-send-email-openwrt@daniel.thecshore.com> References: <1453171813-36623-1-git-send-email-openwrt@daniel.thecshore.com> Subject: [OpenWrt-Devel] [PATCH 09/13] sunxi: Add an 'All Profiles' profile 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 Sunxi has enough images to make it useful to get all profiles and multi-profile select working properly, so this patch adds an 'All Profiles' profile, however it is only used to allow KConfig to select all profiles and is not used standalone to build all targets, due to the differences in devices that would result in every image having a number of packages selected by other profiles but not applicable the current image. Signed-off-by: Daniel Dickinson --- target/linux/sunxi/image/Makefile | 8 +++++--- target/linux/sunxi/profiles/00-default.mk | 17 +++++++++++++++++ target/linux/sunxi/profiles/01-all.mk | 18 ++++++++++++++++++ target/linux/sunxi/profiles/01-default.mk | 17 ----------------- 4 files changed, 40 insertions(+), 20 deletions(-) create mode 100644 target/linux/sunxi/profiles/00-default.mk create mode 100644 target/linux/sunxi/profiles/01-all.mk delete mode 100644 target/linux/sunxi/profiles/01-default.mk diff --git a/target/linux/sunxi/image/Makefile b/target/linux/sunxi/image/Makefile index 6758ba1..a17e1a2 100644 --- a/target/linux/sunxi/image/Makefile +++ b/target/linux/sunxi/image/Makefile @@ -106,13 +106,15 @@ endef define Image/Build/Profile/Linksprite_pcDuino3 $(call Image/Build/SDCard,$(1),sun7i-a20-pcduino3,$(2)) endef -endef -define Image/Build +define Image/Build/Default $(call Image/Build/$(1),$(1),$(2)) $(call Image/Build/Profile/$(2),$(1),$(2)) - dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync endef +define Image/Build + $(if $(filter-out All,$(2))$(call Image/Build/Default,$(1),$(2))) +endef + $(eval $(call BuildImage)) diff --git a/target/linux/sunxi/profiles/00-default.mk b/target/linux/sunxi/profiles/00-default.mk new file mode 100644 index 0000000..fc35e6d --- /dev/null +++ b/target/linux/sunxi/profiles/00-default.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/Default + NAME:=Default package set + PROFILE_SKIP_DEFAULT:=1 +endef + +define Profile/Default/Description + Default package set compatible with most boards. +endef +$(eval $(call Profile,Default)) + diff --git a/target/linux/sunxi/profiles/01-all.mk b/target/linux/sunxi/profiles/01-all.mk new file mode 100644 index 0000000..0c750e2 --- /dev/null +++ b/target/linux/sunxi/profiles/01-all.mk @@ -0,0 +1,18 @@ +# +# Copyright (C) 2013 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/All + NAME:=All Profiles + PROFILE_SKIP_SINGLE:=1 +endef + +define Profile/All/Description + Build images for all profiles +endef + +$(eval $(call Profile,All)) + diff --git a/target/linux/sunxi/profiles/01-default.mk b/target/linux/sunxi/profiles/01-default.mk deleted file mode 100644 index 7d83440..0000000 --- a/target/linux/sunxi/profiles/01-default.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2013 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Default - NAME:=Default package set - PACKAGES += uboot-sunxi-A13-OLinuXino -endef - -define Profile/Default/Description - Default package set compatible with most boards. -endef -$(eval $(call Profile,Default)) -