build: reduce the size of package metadata a bit to keep package list files smaller

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34871 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index a0f859c..0505a43 100644 (file)
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -42,7 +42,6 @@ define Package/Default
   else
     PKGARCH:=$(BOARD)
   endif
   else
     PKGARCH:=$(BOARD)
   endif

-  PRIORITY:=optional

   DEFAULT:=
   MENU:=
   SUBMENU:=
   DEFAULT:=
   MENU:=
   SUBMENU:=

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 5de51eb..b4b83fe 100644 (file)
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -146,18 +146,17 @@ ifeq ($(DUMP),)
                for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \
                        DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \
                done; \
                for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \
                        DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \
                done; \

-               echo "Depends: $$$$DEPENDS"; \
-               echo "Provides: $(PROVIDES)"; \
+               [ -z "$$$$DEPENDS" ] || echo "Depends: $$$$DEPENDS"; \
+               $(if $(PROVIDES), echo "Provides: $(PROVIDES)"; ) \

                echo "Source: $(SOURCE)"; \
                echo "Source: $(SOURCE)"; \

-               echo "SourceFile: $(PKG_SOURCE)"; \
-               echo "SourceURL: $(PKG_SOURCE_URL)"; \
-               echo "License: $(PKG_LICENSE)"; \
-               echo "LicenseFiles: $(PKG_LICENSE_FILES)"; \
+               $(if $(PKG_SOURCE), echo "SourceFile: $(PKG_SOURCE)"; ) \
+               $(if $(PKG_SOURCE_URL), echo "SourceURL: $(PKG_SOURCE_URL)"; ) \
+               $(if $(PKG_LICENSE), echo "License: $(PKG_LICENSE)"; ) \
+               $(if $(PKG_LICENSE_FILES), echo "LicenseFiles: $(PKG_LICENSE_FILES)"; ) \

                echo "Section: $(SECTION)"; \
                echo "Section: $(SECTION)"; \

-               echo "Status: unknown $(if $(filter hold,$(PKG_FLAGS)),hold,ok) not-installed"; \
-               echo "Essential: $(if $(filter essential,$(PKG_FLAGS)),yes,no)"; \
-               echo "Priority: $(PRIORITY)"; \
-               echo "Maintainer: $(MAINTAINER)"; \
+               $(if $(filter hold,$(PKG_FLAGS)),echo "Status: unknown hold not-installed"; ) \
+               $(if $(filter essential,$(PKG_FLAGS)), echo "Essential: yes"; ) \
+               $(if $(MAINTAINER),echo "Maintainer: $(MAINTAINER)"; ) \

                echo "Architecture: $(PKGARCH)"; \
                echo "Installed-Size: 0"; \
                echo -n "Description: "; $(SH_FUNC) getvar $(call shvar,Package/$(1)/description) | sed -e 's,^[[:space:]]*, ,g'; \
                echo "Architecture: $(PKGARCH)"; \
                echo "Installed-Size: 0"; \
                echo -n "Description: "; $(SH_FUNC) getvar $(call shvar,Package/$(1)/description) | sed -e 's,^[[:space:]]*, ,g'; \

diff --git a/include/package.mk b/include/package.mk
index c1fe088..99d2dd2 100644 (file)
--- a/include/package.mk
+++ b/include/package.mk
@@ -215,7 +215,7 @@ define Package/$(1)/description
 endef
 endif
 
 endef
 endif
 

-  $(foreach FIELD, TITLE CATEGORY PRIORITY SECTION VERSION,
+  $(foreach FIELD, TITLE CATEGORY SECTION VERSION,

     ifeq ($($(FIELD)),)
       $$(error Package/$(1) is missing the $(FIELD) field)
     endif
     ifeq ($($(FIELD)),)
       $$(error Package/$(1) is missing the $(FIELD) field)
     endif