image.mk: reduce code duplication, move prepare to a separate make target

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

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index be47526467ae7550d9c91a4c4b7e533120fe7a33..a4901b583f5d5ff88f7a2ce9390e2ed748e7b73b 100644 (file)
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -16,7 +16,7 @@ IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/opkg
 define BuildIPKGVariable
 ifdef Package/$(1)/$(2)
   $(call shexport,Package/$(1)/$(2))
-  $(1)_COMMANDS += var2file "$(call shvar,Package/$(1)/$(2))" $(2);
+  $(1)_COMMANDS += var2file "$(call shvar,Package/$(1)/$(2))" $(2)$(3);
 endif
 endef
 
@@ -117,8 +117,8 @@ ifeq ($(DUMP),)
 
     $(eval $(call BuildIPKGVariable,$(1),conffiles))
     $(eval $(call BuildIPKGVariable,$(1),preinst))
-    $(eval $(call BuildIPKGVariable,$(1),postinst))
-    $(eval $(call BuildIPKGVariable,$(1),prerm))
+    $(eval $(call BuildIPKGVariable,$(1),postinst,-pkg))
+    $(eval $(call BuildIPKGVariable,$(1),prerm,-pkg))
     $(eval $(call BuildIPKGVariable,$(1),postrm))
 
     $(STAGING_DIR_ROOT)/stamp/.$(1)_installed: $(STAMP_BUILT)
@@ -136,7 +136,7 @@ ifeq ($(DUMP),)
 
     $(PKG_INFO_DIR)/$(1).provides: $$(IPKG_$(1))
     $$(IPKG_$(1)): $(STAMP_BUILT) $(INCLUDE_DIR)/package-ipkg.mk
-       @rm -rf $(PACKAGE_DIR)/$(1)_* $$(IDIR_$(1))
+       @rm -rf $$(PDIR_$(1))/$(1)_* $$(IDIR_$(1))
        mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/CONTROL $(PKG_INFO_DIR)
        $(call Package/$(1)/install,$$(IDIR_$(1)))
        -find $$(IDIR_$(1)) -name 'CVS' -o -name '.svn' -o -name '.#*' -o -name '*~'| $(XARGS) rm -rf
@@ -160,11 +160,17 @@ ifeq ($(DUMP),)
                        DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \
                done; \
                [ -z "$$$$DEPENDS" ] || echo "Depends: $$$$DEPENDS"; \
+               CONFLICTS=''; \
+               for conflict in $(CONFLICTS); do \
+                       CONFLICTS=$$$${CONFLICTS:+$$$$CONFLICTS, }$$$$conflict; \
+               done; \
+               [ -z "$$$$CONFLICTS" ] || echo "Conflicts: $$$$CONFLICTS"; \
                $(if $(PROVIDES), echo "Provides: $(PROVIDES)"; ) \
                echo "Source: $(SOURCE)"; \
                $(if $(PKG_LICENSE), echo "License: $(PKG_LICENSE)"; ) \
                $(if $(PKG_LICENSE_FILES), echo "LicenseFiles: $(PKG_LICENSE_FILES)"; ) \
                echo "Section: $(SECTION)"; \
+               $(if $(USERID),echo "Require-User: $(USERID)"; ) \
                $(if $(filter hold,$(PKG_FLAGS)),echo "Status: unknown hold not-installed"; ) \
                $(if $(filter essential,$(PKG_FLAGS)), echo "Essential: yes"; ) \
                $(if $(MAINTAINER),echo "Maintainer: $(MAINTAINER)"; ) \
@@ -173,6 +179,18 @@ ifeq ($(DUMP),)
                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
+       ( \
+               echo "#!/bin/sh"; \
+               echo "[ \"\$$$${IPKG_NO_SCRIPT}\" = \"1\" ] && exit 0"; \
+               echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \
+               echo "default_postinst \$$$$0 \$$$$@"; \
+       ) > $$(IDIR_$(1))/CONTROL/postinst
+       ( \
+               echo "#!/bin/sh"; \
+               echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \
+               echo "default_prerm \$$$$0 \$$$$@"; \
+       ) > $$(IDIR_$(1))/CONTROL/prerm
+       chmod 0755 $$(IDIR_$(1))/CONTROL/prerm
        $(SH_FUNC) (cd $$(IDIR_$(1))/CONTROL; \
                $($(1)_COMMANDS) \
        )