X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=include%2Fpackage-ipkg.mk;h=522a1de15f004db26bb1d21a91b73f2cdcae7c00;hp=7ff3f6e23aaf3915c3a36e5603a28fd623fd21cd;hb=c463728b2d35651fd4cec9ec0379cdfd210a65b1;hpb=3b65557db8d43ad0071149c2f16d6ed1b927e801

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 7ff3f6e23a..522a1de15f 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -5,22 +5,6 @@
 # See /LICENSE for more information.
 #
 
-# where to build (and put) .ipk packages
-OPKG:= \
-  IPKG_TMP=$(TMP_DIR)/ipkg \
-  IPKG_INSTROOT=$(TARGET_DIR) \
-  IPKG_CONF_DIR=$(STAGING_DIR)/etc \
-  IPKG_OFFLINE_ROOT=$(TARGET_DIR) \
-  $(STAGING_DIR_HOST)/bin/opkg \
-	--offline-root $(TARGET_DIR) \
-	--force-depends \
-	--force-overwrite \
-	--force-postinstall \
-	--force-maintainer \
-	--add-dest root:/ \
-	--add-arch all:100 \
-	--add-arch $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD)):200
-
 # invoke ipkg-build with some default options
 IPKG_BUILD:= \
   ipkg-build -c -o 0 -g 0
@@ -70,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; \
 	)
@@ -89,22 +76,29 @@ ifeq ($(DUMP),)
   define BuildTarget/ipkg
     IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk
     IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg-$(PKGARCH)/$(1)
-    INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list
     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)
-          install: $$(INFO_$(1))
+          .PHONY: $(PKG_INSTALL_STAMP).$(1)
+          compile: $(PKG_INSTALL_STAMP).$(1)
+          $(PKG_INSTALL_STAMP).$(1):
+			if [ -f $(PKG_INSTALL_STAMP).clean ]; then \
+				rm -f \
+					$(PKG_INSTALL_STAMP) \
+					$(PKG_INSTALL_STAMP).clean; \
+			fi; \
+			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
@@ -137,14 +131,14 @@ 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)
+	$(if $(PROVIDES),@for pkg in $(PROVIDES); do cp $(PKG_INFO_DIR)/$(1).provides $(PKG_INFO_DIR)/$$$$pkg.provides; done)
 	$(CheckDependencies)
 
 	$(RSTRIP) $$(IDIR_$(1))
@@ -155,14 +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)"; \
+		$(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'; \
@@ -188,11 +185,6 @@ ifeq ($(DUMP),)
 	$(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
 	@[ -f $$(IPKG_$(1)) ]
 
-    $$(INFO_$(1)): $$(IPKG_$(1))
-	@[ -d $(TARGET_DIR)/tmp ] || mkdir -p $(TARGET_DIR)/tmp
-	$(OPKG) install $$(IPKG_$(1))
-	$(if $(filter-out essential,$(PKG_FLAGS)),for flag in $(filter-out essential,$(PKG_FLAGS)); do $(OPKG) flag $$$$flag $(1); done)
-
     $(1)-clean:
 	rm -f $(PACKAGE_DIR)/$(1)_*