build scripts: fix 'make defconfig' damage

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

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 5de51ebb58fad98365beb868f529f21d530d3a39..522a1de15f004db26bb1d21a91b73f2cdcae7c00 100644 (file)
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -54,15 +54,18 @@ ifneq ($(PKG_NAME),toolchain)
        @( \
                rm -f $(PKG_INFO_DIR)/$(1).missing; \
                ( \
-                       export READELF=$(TARGET_CROSS)readelf XARGS="$(XARGS)"; \
+                       export \
+                               READELF=$(TARGET_CROSS)readelf \
+                               OBJCOPY=$(TARGET_CROSS)objcopy \
+                               XARGS="$(XARGS)"; \
                        $(SCRIPT_DIR)/gen-dependencies.sh "$$(IDIR_$(1))"; \
                ) | while read FILE; do \
                        grep -q "$$$$FILE" $(PKG_INFO_DIR)/$(1).provides || \
                                echo "$$$$FILE" >> $(PKG_INFO_DIR)/$(1).missing; \
                done; \
                if [ -f "$(PKG_INFO_DIR)/$(1).missing" ]; then \
-                       echo "Package $(1) is missing dependencies for the following libraries:"; \
-                       cat "$(PKG_INFO_DIR)/$(1).missing"; \
+                       echo "Package $(1) is missing dependencies for the following libraries:" >&2; \
+                       cat "$(PKG_INFO_DIR)/$(1).missing" >&2; \
                        false; \
                fi; \
        )
@@ -95,7 +98,7 @@ ifeq ($(DUMP),)
       else
         compile: $(1)-disabled
         $(1)-disabled:
-               @echo "WARNING: skipping $(1) -- package not selected"
+               @echo "WARNING: skipping $(1) -- package not selected" >&2
       endif
     endif
     endif
@@ -128,12 +131,12 @@ ifeq ($(DUMP),)
        $(call Package/$(1)/install,$$(IDIR_$(1)))
        -find $$(IDIR_$(1)) -name 'CVS' -o -name '.svn' -o -name '.#*' -o -name '*~'| $(XARGS) rm -rf
        @( \
-               find $$(IDIR_$(1)) -name lib\*.so\* | awk -F/ '{ print $$$$NF }'; \
+               find $$(IDIR_$(1)) -name lib\*.so\* -or -name \*.ko | awk -F/ '{ print $$$$NF }'; \
                for file in $$(patsubst %,$(PKG_INFO_DIR)/%.provides,$$(IDEPEND_$(1))); do \
                        if [ -f "$$$$file" ]; then \
                                cat $$$$file; \
                        fi; \
-               done; \
+               done; $(Package/$(1)/extra_provides) \
        ) | sort -u > $(PKG_INFO_DIR)/$(1).provides
        $(if $(PROVIDES),@for pkg in $(PROVIDES); do cp $(PKG_INFO_DIR)/$(1).provides $(PKG_INFO_DIR)/$$$$pkg.provides; done)
        $(CheckDependencies)
@@ -146,18 +149,17 @@ ifeq ($(DUMP),)
                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 "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 "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'; \