fix ipsec-tools (missing include, missing dependencies)

[openwrt.git] / include / package.mk

diff --git a/include/package.mk b/include/package.mk
index 38fd93d..cd1a33c 100644 (file)
--- a/include/package.mk
+++ b/include/package.mk
@@ -10,16 +10,16 @@ else
   all: compile
 endif
 
   all: compile
 endif
 

+include $(INCLUDE_DIR)/prereq.mk
+

 define Build/DefaultTargets
   ifeq ($(DUMP),)
 define Build/DefaultTargets
   ifeq ($(DUMP),)

-    ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR))
-      ifeq ($(CONFIG_AUTOREBUILD),y)
+    ifeq ($(CONFIG_AUTOREBUILD),y)
+      ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR))

         $(PKG_BUILD_DIR)/.prepared: package-clean
       endif
         $(PKG_BUILD_DIR)/.prepared: package-clean
       endif

-    endif

 
 

-    ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1)))
-      ifeq ($(CONFIG_AUTOREBUILD),y)
+      ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1)))

         $(PKG_BUILD_DIR)/.built: package-rebuild
       endif
     endif
         $(PKG_BUILD_DIR)/.built: package-rebuild
       endif
     endif


@@ -83,6 +83,7 @@ define Package/Default
   DEFAULT:=
   MENU:=
   SUBMENU:=
   DEFAULT:=
   MENU:=
   SUBMENU:=

+  SUBMENUDEP:=

   TITLE:=
   DESCRIPTION:=
 endef
   TITLE:=
   DESCRIPTION:=
 endef


@@ -142,6 +143,10 @@ define BuildPackage
   ifneq ($(SUBMENU),)
     DUMPINFO += \
        echo "Submenu: $(SUBMENU)";
   ifneq ($(SUBMENU),)
     DUMPINFO += \
        echo "Submenu: $(SUBMENU)";

+    ifneq ($(SUBMENUDEP),)
+      DUMPINFO += \
+         echo "Submenu-Depends: $(SUBMENUDEP)";
+    endif

   endif
 
   ifneq ($(DEFAULT),)
   endif
 
   ifneq ($(DEFAULT),)


@@ -177,7 +182,7 @@ define BuildPackage
   $(eval $(call BuildIPKGVariable,$(1),postinst))
   $(eval $(call BuildIPKGVariable,$(1),prerm))
   $(eval $(call BuildIPKGVariable,$(1),postrm))
   $(eval $(call BuildIPKGVariable,$(1),postinst))
   $(eval $(call BuildIPKGVariable,$(1),prerm))
   $(eval $(call BuildIPKGVariable,$(1),postrm))

-  $$(IDIR_$(1))/CONTROL/control: Makefile $(PKG_BUILD_DIR)/.prepared
+  $$(IDIR_$(1))/CONTROL/control: Makefile $(PKG_BUILD_DIR)/.prepared $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH)

        mkdir -p $$(IDIR_$(1))/CONTROL
        echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
        echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control
        mkdir -p $$(IDIR_$(1))/CONTROL
        echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
        echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control


@@ -207,6 +212,7 @@ define BuildPackage
        -find $$(IDIR_$(1)) -name '.#*' | xargs rm -f
        $(RSTRIP) $$(IDIR_$(1))
        $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
        -find $$(IDIR_$(1)) -name '.#*' | xargs rm -f
        $(RSTRIP) $$(IDIR_$(1))
        $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)

+       @[ -f $$(IPKG_$(1)) ] || false 

 
   $$(INFO_$(1)): $$(IPKG_$(1))
        $(IPKG) install $$(IPKG_$(1))
 
   $$(INFO_$(1)): $$(IPKG_$(1))
        $(IPKG) install $$(IPKG_$(1))


@@ -216,6 +222,10 @@ define BuildPackage
 
   clean: $(1)-clean
 
 
   clean: $(1)-clean
 

+  $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH): $(PKG_BUILD_DIR)/.prepared
+       -rm $(PKG_BUILD_DIR)/.version-$(1)_*
+       @touch $$@
+

   $$(eval $$(call Build/DefaultTargets,$(1)))
 
 endef
   $$(eval $$(call Build/DefaultTargets,$(1)))
 
 endef