fix problems with the use of a passphrase, add option to use a key instead of passphrase

[openwrt.git] / include / package-dumpinfo.mk

diff --git a/include/package-dumpinfo.mk b/include/package-dumpinfo.mk
index 70ef0c5..e29e113 100644 (file)
--- a/include/package-dumpinfo.mk
+++ b/include/package-dumpinfo.mk
@@ -14,25 +14,27 @@ ifneq ($(DUMP),)
     dumpinfo: dumpinfo-$(1)
     .SILENT: dumpinfo-$(1)
     dumpinfo-$(1): FORCE
-       echo "Package: $(1)" ;
-       $(if $(MENU),echo "Menu: $(MENU)")
-       $(if $(SUBMENU),echo "Submenu: $(SUBMENU)")
-       $(if $(SUBMENUDEP),echo "Submenu-Depends: $(SUBMENUDEP)")
-       $(if $(DEFAULT),echo "Default: $(DEFAULT)") 
-       if [ "$$$$PREREQ_CHECK" = 1 ]; then echo "Prereq-Check: 1"; fi;
-       echo "Version: $(VERSION)"
-       echo "Depends: $(DEPENDS)"
-       echo "Provides: $(PROVIDES)"
-       echo "Build-Depends: $(PKG_BUILD_DEPENDS)"
-       echo "Section: $(SECTION)"
-       echo "Category: $(CATEGORY)"
-       echo "Title: $(TITLE)"
-       echo "Maintainer: $(MAINTAINER)"
-       echo -n "Description: "
-       getvar $(call shvar,Package/$(1)/description)
-       $(if $(URL),echo;echo "$(URL)")
-       echo "@@"
-       $$(if $$(Package/$(1)/config),echo "Config: "; getvar $(call shvar,Package/$(1)/config); echo "@@")
-       $(if $$(preconfig_$(1)),$$(preconfig_$(1)) echo "")
+         @echo "Package: $(1)" ; \
+               $(if $(MENU),echo "Menu: $(MENU)";) \
+               $(if $(SUBMENU),echo "Submenu: $(SUBMENU)";) \
+               $(if $(SUBMENUDEP),echo "Submenu-Depends: $(SUBMENUDEP)";) \
+               $(if $(DEFAULT),echo "Default: $(DEFAULT)";)  \
+               if [ "$$$$PREREQ_CHECK" = 1 ]; then echo "Prereq-Check: 1"; fi; \
+               echo "Version: $(VERSION)"; \
+               echo "Depends: $(DEPENDS)"; \
+               echo "Provides: $(PROVIDES)"; \
+               echo "Build-Depends: $(PKG_BUILD_DEPENDS)"; \
+               echo "Section: $(SECTION)"; \
+               echo "Category: $(CATEGORY)"; \
+               echo "Title: $(TITLE)"; \
+               echo "Maintainer: $(MAINTAINER)"; \
+               echo "Type: $(if $(Package/$(1)/targets),$(Package/$(1)/targets),$(if $(PKG_TARGETS),$(PKG_TARGETS),ipkg))"; \
+               $(if $(KCONFIG),echo "Kernel-Config: $(KCONFIG)";) \
+               echo -n "Description: "; \
+               getvar $(call shvar,Package/$(1)/description); \
+               $(if $(URL),echo;echo "$(URL)";) \
+               echo "@@" ; \
+               $$(if $$(Package/$(1)/config),echo "Config: "; getvar $(call shvar,Package/$(1)/config); echo "@@"; ) \
+               $$(if $$(preconfig_$(1)),$$(preconfig_$(1)) echo "")
   endef
 endif