[kernel] kmod-usb-core is buildin on etrax target

[openwrt.git] / include / package.mk

diff --git a/include/package.mk b/include/package.mk
index 79e1f14..9f7cfc8 100644 (file)
--- a/include/package.mk
+++ b/include/package.mk
@@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/unpack.mk
 include $(INCLUDE_DIR)/depends.mk
 
 STAMP_PREPARED=$(PKG_BUILD_DIR)/.prepared$(if $(QUILT)$(DUMP),,_$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPENDS),)))
 include $(INCLUDE_DIR)/depends.mk
 
 STAMP_PREPARED=$(PKG_BUILD_DIR)/.prepared$(if $(QUILT)$(DUMP),,_$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPENDS),)))

-STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured$(if $(QUILT)$(DUMP),,_$(call confvar,$(PKG_CONFIG_DEPENDS)))
+STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured$(if $(DUMP),,_$(call confvar,$(PKG_CONFIG_DEPENDS)))

 STAMP_BUILT:=$(PKG_BUILD_DIR)/.built
 STAMP_INSTALLED:=$(STAGING_DIR)/stamp/.$(PKG_NAME)_installed
 
 STAMP_BUILT:=$(PKG_BUILD_DIR)/.built
 STAMP_INSTALLED:=$(STAGING_DIR)/stamp/.$(PKG_NAME)_installed
 


@@ -26,15 +26,11 @@ include $(INCLUDE_DIR)/quilt.mk
 include $(INCLUDE_DIR)/package-defaults.mk
 include $(INCLUDE_DIR)/package-dumpinfo.mk
 include $(INCLUDE_DIR)/package-ipkg.mk
 include $(INCLUDE_DIR)/package-defaults.mk
 include $(INCLUDE_DIR)/package-dumpinfo.mk
 include $(INCLUDE_DIR)/package-ipkg.mk

-include $(INCLUDE_DIR)/package-debug.mk

 include $(INCLUDE_DIR)/package-bin.mk
 include $(INCLUDE_DIR)/autotools.mk
 
 override MAKEFLAGS=
 CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
 include $(INCLUDE_DIR)/package-bin.mk
 include $(INCLUDE_DIR)/autotools.mk
 
 override MAKEFLAGS=
 CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)

-ifneq ($(CONFIG_LINUX_2_4),)
-  CONFIG_SITE:=$(subst linux-,linux2.4-,$(CONFIG_SITE))
-endif

 CUR_MAKEFILE:=$(filter-out Makefile,$(firstword $(MAKEFILE_LIST)))
 SUBMAKE:=$(NO_TRACE_MAKE) $(if $(CUR_MAKEFILE),-f $(CUR_MAKEFILE))
 
 CUR_MAKEFILE:=$(filter-out Makefile,$(firstword $(MAKEFILE_LIST)))
 SUBMAKE:=$(NO_TRACE_MAKE) $(if $(CUR_MAKEFILE),-f $(CUR_MAKEFILE))
 


@@ -48,6 +44,17 @@ ifeq ($(DUMP)$(filter prereq clean refresh update,$(MAKECMDGOALS)),)
   endif
 endif
 
   endif
 endif
 

+ifeq ($(CONFIG_$(PKG_NAME)_USE_CUSTOM_SOURCE_DIR),y)
+# disable load stage
+PKG_SOURCE_URL:=
+# add hook to install a link to customer source path of dedicated package
+Hooks/Prepare/Pre += prepare_custom_source_directory
+# define empty default action
+define Build/Prepare/Default
+       @: 
+endef
+endif
+

 define Download/default
   FILE:=$(PKG_SOURCE)
   URL:=$(PKG_SOURCE_URL)
 define Download/default
   FILE:=$(PKG_SOURCE)
   URL:=$(PKG_SOURCE_URL)


@@ -130,9 +137,18 @@ define Build/DefaultTargets
 
   prepare: $(STAMP_PREPARED)
   configure: $(STAMP_CONFIGURED)
 
   prepare: $(STAMP_PREPARED)
   configure: $(STAMP_CONFIGURED)

+  dist: $(STAMP_CONFIGURED)
+  distcheck: $(STAMP_CONFIGURED)
+endef
+
+define Build/IncludeOverlay
+  $(eval -include $(wildcard $(TOPDIR)/overlay/*/$(PKG_NAME).mk))
+  define Build/IncludeOverlay
+  endef

 endef
 
 define BuildPackage
 endef
 
 define BuildPackage

+  $(Build/IncludeOverlay)

   $(eval $(Package/Default))
   $(eval $(Package/$(1)))
 
   $(eval $(Package/Default))
   $(eval $(Package/$(1)))
 


@@ -156,10 +172,10 @@ endif
   $(call shexport,Package/$(1)/config)
 
   $(if $(DUMP), \
   $(call shexport,Package/$(1)/config)
 
   $(if $(DUMP), \

-    $(Dumpinfo), \
+    $(Dumpinfo/Package), \

     $(foreach target, \
       $(if $(Package/$(1)/targets),$(Package/$(1)/targets), \
     $(foreach target, \
       $(if $(Package/$(1)/targets),$(Package/$(1)/targets), \

-        $(if $(PKG_TARGETS),$(PKG_TARGETS), ipkg $(if $(CONFIG_DEBUG_DIR),debug)) \
+        $(if $(PKG_TARGETS),$(PKG_TARGETS), ipkg) \

       ), $(BuildTarget/$(target)) \
     ) \
   )
       ), $(BuildTarget/$(target)) \
     ) \
   )


@@ -178,6 +194,8 @@ Build/Prepare=$(call Build/Prepare/Default,)
 Build/Configure=$(call Build/Configure/Default,)
 Build/Compile=$(call Build/Compile/Default,)
 Build/Install=$(if $(PKG_INSTALL),$(call Build/Install/Default,))
 Build/Configure=$(call Build/Configure/Default,)
 Build/Compile=$(call Build/Compile/Default,)
 Build/Install=$(if $(PKG_INSTALL),$(call Build/Install/Default,))

+Build/Dist=$(call Build/Dist/Default,)
+Build/DistCheck=$(call Build/DistCheck/Default,)

 
 $(PACKAGE_DIR):
        mkdir -p $@
 
 $(PACKAGE_DIR):
        mkdir -p $@


@@ -202,3 +220,9 @@ clean: clean-staging FORCE
        $(Build/Clean)
        rm -f $(STAGING_DIR)/packages/$(PKG_NAME).list $(STAGING_DIR_HOST)/packages/$(PKG_NAME).list
        rm -rf $(PKG_BUILD_DIR)
        $(Build/Clean)
        rm -f $(STAGING_DIR)/packages/$(PKG_NAME).list $(STAGING_DIR_HOST)/packages/$(PKG_NAME).list
        rm -rf $(PKG_BUILD_DIR)

+
+dist:
+       $(Build/Dist)
+   
+distcheck:
+       $(Build/DistCheck)