From 94cdcbde6d2fa931d27a239452ef794ab35f46ef Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 17 Oct 2009 22:11:21 +0000 Subject: add experimental support for a new menuconfig submenu "Package features". allows selection between multiple packages providing the same feature, which affects dependencies of other packages. will be used e.g. for choosing between DirectFB and X.org for libraries like GTK2 SVN-Revision: 18056 --- include/package-dumpinfo.mk | 30 ++++++++++++++++++++++++++++-- include/package.mk | 2 +- 2 files changed, 29 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/package-dumpinfo.mk b/include/package-dumpinfo.mk index db8d9c11ca..f48f31507a 100644 --- a/include/package-dumpinfo.mk +++ b/include/package-dumpinfo.mk @@ -22,7 +22,7 @@ define Config preconfig_$$(1) += $(1) endef -define Dumpinfo +define Dumpinfo/Package $(info Package: $(1) $(if $(MENU),Menu: $(MENU) )$(if $(SUBMENU),Submenu: $(SUBMENU) @@ -51,5 +51,31 @@ $(Package/$(1)/config) @@ )$(foreach pc,$(preconfig_$(1)), $(Preconfig/$(pc)))) - endef +endef + +define Feature/Default + TARGET_NAME:= + TARGET_TITLE:= + PRIORITY:= + NAME:= +endef + +define Feature + $(eval $(Feature/Default)) + $(eval $(Feature/$(1))) + $(if $(DUMP),$(call Dumpinfo/Feature,$(1))) +endef + +define Dumpinfo/Feature +$(info Feature: $(TARGET_NAME)_$(1) +Target-Name: $(TARGET_NAME) +Target-Title: $(TARGET_TITLE) +Feature-Name: $(NAME) +$(if $(PRIORITY),Feature-Priority: $(PRIORITY) +)Feature-Description: +$(Feature/$(1)/description) +@@ +) +endef + endif diff --git a/include/package.mk b/include/package.mk index 7cfe697937..4ee9d71291 100644 --- a/include/package.mk +++ b/include/package.mk @@ -176,7 +176,7 @@ endif $(call shexport,Package/$(1)/config) $(if $(DUMP), \ - $(Dumpinfo), \ + $(Dumpinfo/Package), \ $(foreach target, \ $(if $(Package/$(1)/targets),$(Package/$(1)/targets), \ $(if $(PKG_TARGETS),$(PKG_TARGETS), ipkg $(if $(CONFIG_DEBUG_DIR),debug)) \ -- cgit v1.2.3