[OpenWrt-Devel,15/15] include/package-dumpinfo.mk: don't duplicate source package information for every binary package

Message ID 8d6fb4e335e1ce91d84eeba5cb48ece7c916d36b.1515421834.git.mschiffer@universe-factory.net
State Superseded
Headers show
Series
  • Metadata generator refactoring, cleanup and PROVIDES improvements
Related show

Commit Message

Matthias Schiffer Jan. 8, 2018, 2:52 p.m.
Eventually the BUILDONLY package flag could be replaced by simply creating
a package Makefile without any BuildPackage calls. This will fail for now,
as BuildPackage also causes the Makefile's compile target etc. to do
something useful at all.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
---
 include/package-dumpinfo.mk | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

Patch

diff --git a/include/package-dumpinfo.mk b/include/package-dumpinfo.mk
index 68a66d0769..8a42be5bd1 100644
--- a/include/package-dumpinfo.mk
+++ b/include/package-dumpinfo.mk
@@ -7,10 +7,17 @@ 
 
 ifneq ($(DUMP),)
 
-dumpinfo: FORCE
+
+define SOURCE_INFO
+$(if $(PKG_BUILD_DEPENDS),Build-Depends: $(PKG_BUILD_DEPENDS)
+)$(if $(HOST_BUILD_DEPENDS),Build-Depends/host: $(HOST_BUILD_DEPENDS)
+)$(if $(BUILD_TYPES),Build-Types: $(BUILD_TYPES)
+)
+
+endef
 
 define Dumpinfo/Package
-$(info Package: $(1)
+$(info $(SOURCE_INFO)Package: $(1)
 $(if $(MENU),Menu: $(MENU)
 )$(if $(SUBMENU),Submenu: $(SUBMENU)
 )$(if $(SUBMENUDEP),Submenu-Depends: $(SUBMENUDEP)
@@ -23,10 +30,7 @@  Menu-Depends: $(MDEPENDS)
 Provides: $(PROVIDES)
 $(if $(VARIANT),Build-Variant: $(VARIANT)
 $(if $(DEFAULT_VARIANT),Default-Variant: $(VARIANT)
-))$(if $(PKG_BUILD_DEPENDS),Build-Depends: $(PKG_BUILD_DEPENDS)
-)$(if $(HOST_BUILD_DEPENDS),Build-Depends/host: $(HOST_BUILD_DEPENDS)
-)$(if $(BUILD_TYPES),Build-Types: $(BUILD_TYPES)
-)Section: $(SECTION)
+))Section: $(SECTION)
 Category: $(CATEGORY)
 $(if $(filter nonshared,$(PKGFLAGS)),,Repository: $(if $(FEED),$(FEED),base)
 )Title: $(TITLE)
@@ -47,6 +51,10 @@  $(if $(Package/$(1)/config),Config:
 $(Package/$(1)/config)
 @@
 ))
+SOURCE_INFO :=
 endef
 
+dumpinfo: FORCE
+	$(if $(SOURCE_INFO),$(info $(SOURCE_INFO)))
+
 endif