X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/a5ee1ea114c419cbacab3ff87827bc0389431bcb..8e3dbe3870d77e98309852ab340aa3ccb9aed845:/include/package-ipkg.mk

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 5d5c82684..34e409182 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -21,21 +21,29 @@ IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/opkg
 
 define BuildIPKGVariable
   $(call shexport,Package/$(1)/$(2))
-  $(1)_COMMANDS += var2file "$(call shvar,Package/$(1)/$(2))" $(2);
+  $(1)_COMMANDS += $(SH_FUNC) var2file "$(call shvar,Package/$(1)/$(2))" $(2);
 endef
 
+PARENL :=(
+PARENR :=)
+
 dep_split=$(subst :,$(space),$(1))
-dep_confvar=CONFIG_$(word 1,$(call dep_split,$(1)))
+dep_rem=$(subst !,,$(subst $(strip $(PARENL)),,$(subst $(strip $(PARENR)),,$(word 1,$(call dep_split,$(1))))))
+dep_confvar=$(strip $(foreach cond,$(subst ||, ,$(call dep_rem,$(1))),$(CONFIG_$(cond))))
+dep_pos=$(if $(call dep_confvar,$(1)),$(call dep_val,$(1)))
+dep_neg=$(if $(call dep_confvar,$(1)),,$(call dep_val,$(1)))
+dep_if=$(if $(findstring !,$(1)),$(call dep_neg,$(1)),$(call dep_pos,$(1)))
 dep_val=$(word 2,$(call dep_split,$(1)))
 strip_deps=$(strip $(subst +,,$(filter-out @%,$(1))))
-filter_deps=$(foreach dep,$(call strip_deps,$(1)),$(if $(findstring :,$(dep)),$(if $($(call dep_confvar,$(dep))),$(call dep_val,$(dep))),$(dep)))
+filter_deps=$(foreach dep,$(call strip_deps,$(1)),$(if $(findstring :,$(dep)),$(call dep_if,$(dep)),$(dep)))
 
 ifeq ($(DUMP),)
   define BuildTarget/ipkg
     IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk
-    IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1)
+    IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg-$(PKGARCH)/$(1)
     INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list
 
+    ifeq ($(if $(VARIANT),$(BUILD_VARIANT)),$(VARIANT))
     ifdef Package/$(1)/install
       ifneq ($(CONFIG_PACKAGE_$(1))$(SDK)$(DEVELOPER),)
         compile: $$(IPKG_$(1)) $(STAGING_DIR_ROOT)/stamp/.$(1)_installed
@@ -49,6 +57,7 @@ ifeq ($(DUMP),)
 		@echo "WARNING: skipping $(1) -- package not selected"
       endif
     endif
+    endif
 
     IDEPEND_$(1):=$$(call filter_deps,$$(DEPENDS))
   
@@ -57,13 +66,26 @@ ifeq ($(DUMP),)
     $(eval $(call BuildIPKGVariable,$(1),postinst))
     $(eval $(call BuildIPKGVariable,$(1),prerm))
     $(eval $(call BuildIPKGVariable,$(1),postrm))
-    $$(IDIR_$(1))/CONTROL/control: $(STAMP_BUILT)
-	@rm -f $(PACKAGE_DIR)/$(1)_*
-	rm -rf $$(IDIR_$(1))
-	mkdir -p $$(IDIR_$(1))/CONTROL
-	echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
-	echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control
+
+    $(STAGING_DIR_ROOT)/stamp/.$(1)_installed: $(STAMP_BUILT)
+	rm -rf $(STAGING_DIR_ROOT)/tmp-$(1)
+	mkdir -p $(STAGING_DIR_ROOT)/stamp $(STAGING_DIR_ROOT)/tmp-$(1)
+	$(call Package/$(1)/install,$(STAGING_DIR_ROOT)/tmp-$(1))
+	$(call Package/$(1)/install_lib,$(STAGING_DIR_ROOT)/tmp-$(1))
+	$(CP) $(STAGING_DIR_ROOT)/tmp-$(1)/. $(STAGING_DIR_ROOT)/
+	rm -rf $(STAGING_DIR_ROOT)/tmp-$(1)
+	touch $$@
+
+    $$(IPKG_$(1)): $(STAGING_DIR)/etc/ipkg.conf $(STAMP_BUILT)
+	@rm -rf $(PACKAGE_DIR)/$(1)_* $$(IDIR_$(1))
+	mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/CONTROL
+	$(call Package/$(1)/install,$$(IDIR_$(1)))
+	-find $$(IDIR_$(1)) -name 'CVS' -o -name '.svn' -o -name '.#*' | $(XARGS) rm -rf
+	$(RSTRIP) $$(IDIR_$(1))
+	SIZE=`cd $$(IDIR_$(1)); du -bs --exclude=./CONTROL . 2>/dev/null | cut -f1`; \
 	( \
+		echo "Package: $(1)"; \
+		echo "Version: $(VERSION)"; \
 		DEPENDS='$(EXTRA_DEPENDS)'; \
 		for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \
 			DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \
@@ -75,30 +97,15 @@ ifeq ($(DUMP),)
 		echo "Priority: $(PRIORITY)"; \
 		echo "Maintainer: $(MAINTAINER)"; \
 		echo "Architecture: $(PKGARCH)"; \
-		echo "Installed-Size: 1"; \
-		echo -n "Description: "; getvar $(call shvar,Package/$(1)/description) | sed -e 's,^[[:space:]]*, ,g'; \
- 	) >> $$(IDIR_$(1))/CONTROL/control
+		echo "Installed-Size: $$$$SIZE"; \
+		echo -n "Description: "; $(SH_FUNC) getvar $(call shvar,Package/$(1)/description) | sed -e 's,^[[:space:]]*, ,g'; \
+ 	) > $$(IDIR_$(1))/CONTROL/control
 	chmod 644 $$(IDIR_$(1))/CONTROL/control
 	(cd $$(IDIR_$(1))/CONTROL; \
 		$($(1)_COMMANDS) \
 	)
-
-    $(STAGING_DIR_ROOT)/stamp/.$(1)_installed: $(STAMP_BUILT)
-	mkdir -p $(STAGING_DIR_ROOT)/stamp
-	$(call Package/$(1)/install,$(STAGING_DIR_ROOT))
-	$(call Package/$(1)/install_lib,$(STAGING_DIR_ROOT))
-	touch $$@
-
-    $$(IPKG_$(1)): $(STAGING_DIR)/etc/ipkg.conf $(STAMP_BUILT) $$(IDIR_$(1))/CONTROL/control
-	$(call Package/$(1)/install,$$(IDIR_$(1)))
-	mkdir -p $$(IDIR_$(1))/CONTROL
-	mkdir -p $(PACKAGE_DIR)
-	-find $$(IDIR_$(1)) -name 'CVS' -o -name '.svn' -o -name '.#*' | $(XARGS) rm -rf
-	$(RSTRIP) $$(IDIR_$(1))
-	SIZE=`cd $$(IDIR_$(1)); du -bs --exclude=./CONTROL . 2>/dev/null | cut -f1`; \
-	$(SED) "s|^\(Installed-Size:\).*|\1 $$$$SIZE|g" $$(IDIR_$(1))/CONTROL/control
 	$(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
-	@[ -f $$(IPKG_$(1)) ] || false 
+	@[ -f $$(IPKG_$(1)) ]
 
     $$(INFO_$(1)): $$(IPKG_$(1))
 	$(IPKG) install $$(IPKG_$(1))