From: Daniel Dickinson <open...@daniel.thecshore.com>
Minor fixes so that the 'Default' profile (build all images profile)
not only builds all images but acts correctly in the
new multi-profile build machinery/menuconfig
Signed-off-by: Daniel Dickinson <open...@daniel.thecshore.com>
---
target/linux/mvebu/Makefile | 1 +
target/linux/mvebu/image/Makefile | 24 ++++++++++++++++++++----
target/linux/mvebu/profiles/000-Default.mk | 3 +++
target/linux/mvebu/profiles/01-unified.mk | 17 +++++++++++++++++
4 files changed, 41 insertions(+), 4 deletions(-)
create mode 100644 target/linux/mvebu/profiles/01-unified.mk
diff --git a/target/linux/mvebu/Makefile b/target/linux/mvebu/Makefile
index 54bb15d..50f58fe 100644
--- a/target/linux/mvebu/Makefile
+++ b/target/linux/mvebu/Makefile
@@ -20,6 +20,7 @@ include $(INCLUDE_DIR)/target.mk
KERNELNAME:=zImage dtbs
+TARGET_MULTI_SELECT:=1
DEFAULT_PACKAGES += uboot-envtools
$(eval $(call BuildTarget))
diff --git a/target/linux/mvebu/image/Makefile
b/target/linux/mvebu/image/Makefile
index 123be9e..20407d1 100644
--- a/target/linux/mvebu/image/Makefile
+++ b/target/linux/mvebu/image/Makefile
@@ -97,6 +97,22 @@ define NORProfile
PROFILES_LIST += $(1)
endef
+define Image/BuildKernel/Profile/Unified
+ true
+endef
+
+define Image/Build/Profile/Unified/BuildSysupgrade
+ true
+endef
+
+define Image/Build/Profile/Unified/Initramfs
+ true
+endef
+
+define Image/Build/Profile/Unified/squashfs
+ true
+endef
+
# $(1): Profile Name
# $(2): Sub Profiles list
define MultiProfile
@@ -204,21 +220,21 @@ endef
$(eval $(call MultiProfile,Default,$(PROFILES_LIST)))
define Image/BuildKernel
- $(call Image/BuildKernel/Profile/$(PROFILE))
+ $(foreach profile,$(PROFILES_BUILD),$(call
Image/BuildKernel/Profile/$(profile)))
endef
define Image/Build/squashfs
# Align the squashfs image size before calling the profiles,
# otherwise the size would keep growing
$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
- $(call Image/Build/Profile/$(PROFILE)/squashfs)
+ $(foreach profile,$(PROFILES_BUILD),$(call
Image/Build/Profile/$(profile)/squashfs))
endef
define Image/Build
$(call Image/Build/$(1))
- $(call Image/Build/Profile/$(PROFILE)/BuildSysupgrade,$(1))
+ $(foreach profile,$(PROFILES_BUILD),$(call
Image/Build/Profile/$(profile)/BuildSysupgrade,$(1)))
ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
- $(call Image/Build/Profile/$(PROFILE)/Initramfs)
+ $(foreach profile,$(PROFILES_BUILD),$(call
Image/Build/Profile/$(profile)/Initramfs))
endif
endef
diff --git a/target/linux/mvebu/profiles/000-Default.mk
b/target/linux/mvebu/profiles/000-Default.mk
index 3a04af4..fd13da7 100644
--- a/target/linux/mvebu/profiles/000-Default.mk
+++ b/target/linux/mvebu/profiles/000-Default.mk
@@ -7,6 +7,9 @@
define Profile/Default
NAME:=Default Profile (all drivers)
+ PROFILE_TYPE:=meta
+ PROFILE_DEFAULT:=1
+ PROFILE_IMAGES_TYPE:=all
endef
define Profile/Default/Description
diff --git a/target/linux/mvebu/profiles/01-unified.mk
b/target/linux/mvebu/profiles/01-unified.mk
new file mode 100644
index 0000000..1c55897
--- /dev/null
+++ b/target/linux/mvebu/profiles/01-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))
--
2.4.3
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
