madwifi: change the network scripts to use the new wds sta separation feature

[openwrt.git] / include / package.mk

diff --git a/include/package.mk b/include/package.mk
index a981964..da8de5c 100644 (file)
--- a/include/package.mk
+++ b/include/package.mk
@@ -19,6 +19,7 @@ include $(INCLUDE_DIR)/depends.mk
 STAMP_PREPARED=$(PKG_BUILD_DIR)/.prepared$(if $(QUILT)$(DUMP),,_$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPEND),)))
 STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured
 STAMP_BUILT:=$(PKG_BUILD_DIR)/.built
 STAMP_PREPARED=$(PKG_BUILD_DIR)/.prepared$(if $(QUILT)$(DUMP),,_$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPEND),)))
 STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured
 STAMP_BUILT:=$(PKG_BUILD_DIR)/.built

+STAMP_INSTALLED:=$(STAGING_DIR)/stamp/.$(PKG_NAME)_installed

 
 include $(INCLUDE_DIR)/download.mk
 include $(INCLUDE_DIR)/quilt.mk
 
 include $(INCLUDE_DIR)/download.mk
 include $(INCLUDE_DIR)/quilt.mk


@@ -26,9 +27,12 @@ include $(INCLUDE_DIR)/package-defaults.mk
 include $(INCLUDE_DIR)/package-dumpinfo.mk
 include $(INCLUDE_DIR)/package-ipkg.mk
 include $(INCLUDE_DIR)/package-bin.mk
 include $(INCLUDE_DIR)/package-dumpinfo.mk
 include $(INCLUDE_DIR)/package-ipkg.mk
 include $(INCLUDE_DIR)/package-bin.mk

+include $(INCLUDE_DIR)/autotools.mk

 
 override MAKEFLAGS=
 
 override MAKEFLAGS=

-export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
+export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(patsubst %gnueabi,%,$(REAL_GNU_TARGET_NAME))
+CUR_MAKEFILE:=$(filter-out Makefile,$(firstword $(MAKEFILE_LIST)))
+SUBMAKE:=$(NO_TRACE_MAKE) $(if $(CUR_MAKEFILE),-f $(CUR_MAKEFILE))

 
 ifeq ($(DUMP)$(filter prereq clean refresh update,$(MAKECMDGOALS)),)
   ifneq ($(if $(QUILT),,$(CONFIG_AUTOREBUILD)),)
 
 ifeq ($(DUMP)$(filter prereq clean refresh update,$(MAKECMDGOALS)),)
   ifneq ($(if $(QUILT),,$(CONFIG_AUTOREBUILD)),)


@@ -43,11 +47,16 @@ endif
 define Download/default
   FILE:=$(PKG_SOURCE)
   URL:=$(PKG_SOURCE_URL)
 define Download/default
   FILE:=$(PKG_SOURCE)
   URL:=$(PKG_SOURCE_URL)

+  SUBDIR:=$(PKG_SOURCE_SUBDIR)

   PROTO:=$(PKG_SOURCE_PROTO)
   VERSION:=$(PKG_SOURCE_VERSION)
   MD5SUM:=$(PKG_MD5SUM)
 endef
 
   PROTO:=$(PKG_SOURCE_PROTO)
   VERSION:=$(PKG_SOURCE_VERSION)
   MD5SUM:=$(PKG_MD5SUM)
 endef
 

+define sep
+
+endef
+

 define Build/DefaultTargets
   $(if $(QUILT),$(Build/Quilt))
   $(if $(strip $(PKG_SOURCE_URL)),$(call Download,default))
 define Build/DefaultTargets
   $(if $(QUILT),$(Build/Quilt))
   $(if $(strip $(PKG_SOURCE_URL)),$(call Download,default))


@@ -56,24 +65,44 @@ define Build/DefaultTargets
   $(STAMP_PREPARED):
        @-rm -rf $(PKG_BUILD_DIR)
        @mkdir -p $(PKG_BUILD_DIR)
   $(STAMP_PREPARED):
        @-rm -rf $(PKG_BUILD_DIR)
        @mkdir -p $(PKG_BUILD_DIR)

+       $(foreach hook,$(Hooks/Prepare/Pre),$(call $(hook))$(sep))

        $(Build/Prepare)
        $(Build/Prepare)

+       $(foreach hook,$(Hooks/Prepare/Post),$(call $(hook))$(sep))

        touch $$@
 
   $(STAMP_CONFIGURED): $(STAMP_PREPARED)
        touch $$@
 
   $(STAMP_CONFIGURED): $(STAMP_PREPARED)

+       $(foreach hook,$(Hooks/Configure/Pre),$(call $(hook))$(sep))

        $(Build/Configure)
        $(Build/Configure)

+       $(foreach hook,$(Hooks/Configure/Post),$(call $(hook))$(sep))

        touch $$@
 
   $(STAMP_BUILT): $(STAMP_CONFIGURED)
        touch $$@
 
   $(STAMP_BUILT): $(STAMP_CONFIGURED)

+       $(foreach hook,$(Hooks/Compile/Pre),$(call $(hook))$(sep))

        $(Build/Compile)
        $(Build/Compile)

-       $(call Build/InstallDev,$(STAGING_DIR))
+       $(foreach hook,$(Hooks/Compile/Post),$(call $(hook))$(sep))
+       touch $$@
+
+  $(STAMP_INSTALLED): $(STAMP_BUILT)
+       $(SUBMAKE) -j1 clean-staging
+       rm -rf $(TMP_DIR)/stage-$(PKG_NAME)
+       mkdir -p $(TMP_DIR)/stage-$(PKG_NAME)/host $(STAGING_DIR)/packages $(STAGING_DIR_HOST)/packages
+       $(call Build/InstallDev,$(TMP_DIR)/stage-$(PKG_NAME),$(TMP_DIR)/stage-$(PKG_NAME)/host)
+       if [ -d $(TMP_DIR)/stage-$(PKG_NAME) ]; then \
+               (cd $(TMP_DIR)/stage-$(PKG_NAME); find ./ > $(STAGING_DIR)/packages/$(PKG_NAME).list); \
+               $(CP) $(TMP_DIR)/stage-$(PKG_NAME)/* $(STAGING_DIR)/; \
+       fi
+       rm -rf $(TMP_DIR)/stage-$(PKG_NAME)

        touch $$@
 
   ifdef Build/InstallDev
        touch $$@
 
   ifdef Build/InstallDev

-    compile: $(STAMP_BUILT)
+    compile: $(STAMP_INSTALLED)

   endif
 
   define Build/DefaultTargets
   endef
   endif
 
   define Build/DefaultTargets
   endef

+
+  prepare: $(STAMP_PREPARED)
+  configure: $(STAMP_CONFIGURED)

 endef
 
 define BuildPackage
 endef
 
 define BuildPackage


@@ -110,20 +139,12 @@ endif
   $(if $(DUMP),,$(call Build/DefaultTargets,$(1)))
 endef
 
   $(if $(DUMP),,$(call Build/DefaultTargets,$(1)))
 endef
 

-# prevent libtool from setting rpath when linking
-define libtool_disable_rpath
-       find $(PKG_BUILD_DIR) -name 'libtool' | $(XARGS) \
-               $(SED) 's,^hardcode_libdir_flag_spec=.*,hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ ",g'
-endef
-
-# prevent libtool from linking against host development libraries
-define libtool_fixup_libdir
-       find $(PKG_BUILD_DIR) -name '*.la' | $(XARGS) \
-               $(SED) "s,^libdir='/usr/lib',libdir='$(strip $(1))/usr/lib',g"
+define pkg_install_files
+       $(foreach install_file,$(1),$(INSTALL_DIR) $(3)/`dirname $(install_file)`; $(INSTALL_DATA) $(2)/$(install_file) $(3)/`dirname $(install_file)`;)

 endef
 
 endef
 

-define pkg_install_files
-       $(foreach install_file,$(3),$(INSTALL_DIR) $(2)/`dirname $(install_file)`; $(CP) $(1)/$(install_file) $(2)/`dirname $(install_file)`;)
+define pkg_install_bin
+       $(foreach install_apps,$(1),$(INSTALL_DIR) $(3)/`dirname $(install_apps)`; $(INSTALL_BIN) $(2)/$(install_apps) $(3)/`dirname $(install_apps)`;)

 endef
 
 define Build/Prepare
 endef
 
 define Build/Prepare


@@ -140,15 +161,24 @@ endef
 
 $(PACKAGE_DIR):
        mkdir -p $@
 
 $(PACKAGE_DIR):
        mkdir -p $@

-               
+       

 dumpinfo:
 download:
 dumpinfo:
 download:

-prepare: $(STAMP_PREPARED)
-configure: $(STAMP_CONFIGURED)
+prepare:
+configure:

 compile:
 install:
 compile:
 install:

-clean: FORCE
-       $(call Build/UninstallDev,$(STAGING_DIR))
+clean-staging: FORCE
+       rm -f $(STAMP_INSTALLED)
+       @-(\
+               cd "$(STAGING_DIR)"; \
+               if [ -f packages/$(PKG_NAME).list ]; then \
+                       cat packages/$(PKG_NAME).list | xargs -r rm -f 2>/dev/null; \
+               fi; \
+       )
+
+clean: clean-staging FORCE
+       $(call Build/UninstallDev,$(STAGING_DIR),$(STAGING_DIR_HOST))

        $(Build/Clean)
        $(Build/Clean)

-       @rm -f $(STAGING_DIR)/stamp/.$(PKG_NAME)-installed
-       @rm -rf $(PKG_BUILD_DIR)
+       rm -f $(STAGING_DIR)/packages/$(PKG_NAME).list $(STAGING_DIR_HOST)/packages/$(PKG_NAME).list
+       rm -rf $(PKG_BUILD_DIR)