X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/5a675d5f7a2b627065ae43e8498e8672828aa797..dbb3ee3ce3a4fa11f0a6c914903bd65cfe47bff8:/package/rules.mk

diff --git a/package/rules.mk b/package/rules.mk
index e5fe79e08..f7b81c62a 100644
--- a/package/rules.mk
+++ b/package/rules.mk
@@ -1,3 +1,7 @@
+# invoke ipkg with configuration in $(STAGING_DIR)/etc/ipkg.conf 
+IPKG := IPKG_INSTROOT=$(TARGET_DIR) IPKG_CONF_DIR=$(IPKG_CONF) $(SCRIPT_DIR)/ipkg -force-defaults -force-depends
+IPKG_STATE_DIR := $(TARGET_DIR)/usr/lib/ipkg
+
 define PKG_template
 IPKG_$(1):=$(PACKAGE_DIR)/$(2)_$(3)_$(4).ipk
 IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(2)
@@ -13,8 +17,11 @@ ifeq ($(BR2_PACKAGE_$(1)),y)
 install: $$(INFO_$(1))
 endif
 
+IDEPEND_$(1):=$$(strip $(5))
+
 $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared
 	$(SCRIPT_DIR)/make-ipkg-dir.sh $$(IDIR_$(1)) ./ipkg/$(2).control $(3) $(4)
+	if [ "$$(IDEPEND_$(1))" != "" ]; then echo "Depends: $$(IDEPEND_$(1))" >> $$(IDIR_$(1))/CONTROL/control; fi
 	for file in conffiles preinst postinst prerm postrm; do \
 		[ -f ./ipkg/$(2).$$$$file ] && cp ./ipkg/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file || true; \
 	done
@@ -27,13 +34,6 @@ $$(INFO_$(1)): $$(IPKG_$(1))
 $(2)-clean:
 	rm -f $$(IPKG_$(1))
 clean: $(2)-clean
-mostlyclean:
-rebuild:
-	-$(MAKE) mostlyclean
-	if [ -f $(PKG_BUILD_DIR)/.built ]; then \
-		$(MAKE) clean; \
-	fi
-	$(MAKE) compile
 endef
 
 ifneq ($(strip $(PKG_SOURCE)),)
@@ -58,6 +58,13 @@ source: $(DL_DIR)/$(PKG_SOURCE)
 prepare: $(PKG_BUILD_DIR)/.prepared
 compile:
 install:
+mostlyclean:
+rebuild:
+	-$(MAKE) mostlyclean
+	if [ -f $(PKG_BUILD_DIR)/.built ]; then \
+		$(MAKE) clean; \
+	fi
+	$(MAKE) compile
 
 $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured