X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=include%2Fpackage-ipkg.mk;h=20361de9e890e48dff192240c68a85db5d52f564;hb=b7ab7eb3d8bbf9761c27ad1e72597470630cd213;hp=4ee0a96ad108561a4a6fb91fcff56d56536f51be;hpb=58313fff71b3508e03dc3005d07fc7115fb63621;p=openwrt.git

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 4ee0a96ad1..20361de9e8 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -75,27 +75,27 @@ ifeq ($(DUMP),)
     IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg-$(PKGARCH)/$(1)
     KEEP_$(1):=$(strip $(call Package/$(1)/conffiles))
 
-    ifeq ($(if $(VARIANT),$(BUILD_VARIANT)),$(VARIANT))
+    ifeq ($(BUILD_VARIANT),$$(if $$(VARIANT),$$(VARIANT),$(BUILD_VARIANT)))
     ifdef Package/$(1)/install
       ifneq ($(CONFIG_PACKAGE_$(1))$(SDK)$(DEVELOPER),)
         IPKGS += $(1)
         compile: $$(IPKG_$(1)) $(PKG_INFO_DIR)/$(1).provides $(STAGING_DIR_ROOT)/stamp/.$(1)_installed
 
         ifeq ($(CONFIG_PACKAGE_$(1)),y)
-          .PHONY: $(PKG_INFO_DIR)/$(PKG_DIR_NAME).install.$(1)
-          compile: $(PKG_INFO_DIR)/$(PKG_DIR_NAME).install.$(1)
-          $(PKG_INFO_DIR)/$(PKG_DIR_NAME).install.$(1):
-			@if [ -f $(PKG_INFO_DIR)/$(PKG_DIR_NAME).install.clean ]; then \
+          .PHONY: $(PKG_INSTALL_STAMP).$(1)
+          compile: $(PKG_INSTALL_STAMP).$(1)
+          $(PKG_INSTALL_STAMP).$(1):
+			if [ -f $(PKG_INSTALL_STAMP).clean ]; then \
 				rm -f \
-					$(PKG_INFO_DIR)/$(PKG_DIR_NAME).install \
-					$(PKG_INFO_DIR)/$(PKG_DIR_NAME).install.clean; \
+					$(PKG_INSTALL_STAMP) \
+					$(PKG_INSTALL_STAMP).clean; \
 			fi; \
-			echo "$(1)" >> $(PKG_INFO_DIR)/$(PKG_DIR_NAME).install
+			echo "$(1)" >> $(PKG_INSTALL_STAMP)
         endif
       else
         compile: $(1)-disabled
         $(1)-disabled:
-		@echo "WARNING: skipping $(1) -- package not selected"
+		@echo "WARNING: skipping $(1) -- package not selected" >&2
       endif
     endif
     endif
@@ -146,18 +146,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'; \