Changeset 15451


Ignore:
Timestamp:
2009-04-27T17:53:00+02:00 (9 years ago)
Author:
nico
Message:

introduce a generic PKG_CONFIG_DEPENDS for packages that need to be reconfigured when certain CONFIG options changed, rename PKG_BUILD_DEPEND to PKG_BUILD_DEPENDS

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/package.mk

    r15339 r15451  
    1717include $(INCLUDE_DIR)/depends.mk 
    1818 
    19 STAMP_PREPARED=$(PKG_BUILD_DIR)/.prepared$(if $(QUILT)$(DUMP),,_$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPEND),))) 
    20 STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured 
     19STAMP_PREPARED=$(PKG_BUILD_DIR)/.prepared$(if $(QUILT)$(DUMP),,_$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPENDS),))) 
     20STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured$(if $(QUILT)$(DUMP),,_$(call confvar,$(PKG_CONFIG_DEPENDS))) 
    2121STAMP_BUILT:=$(PKG_BUILD_DIR)/.built 
    2222STAMP_INSTALLED:=$(STAGING_DIR)/stamp/.$(PKG_NAME)_installed 
  • trunk/package/base-files/Makefile

    r15368 r15451  
    1212PKG_RELEASE:=18 
    1313 
    14 PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ 
     14PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ 
    1515 
    1616include $(INCLUDE_DIR)/package.mk 
  • trunk/package/hostapd/Makefile

    r15245 r15451  
    1717PKG_SOURCE_VERSION:=$(PKG_REV) 
    1818PKG_MD5SUM:=83630d11fa66ade9091f1b304fccd74c 
    19 PKG_BUILD_DEPENDS:=PACKAGE_kmod-madwifi:madwifi PACKAGE_kmod-mac80211:mac80211 PACKAGE_kmod-mac80211:libnl 
    2019 
    21 include $(INCLUDE_DIR)/package.mk 
     20PKG_BUILD_DEPENDS:= \ 
     21        PACKAGE_kmod-madwifi:madwifi \ 
     22        PACKAGE_kmod-mac80211:mac80211 \ 
     23        PACKAGE_kmod-mac80211:libnl \ 
    2224 
    23 PKG_CONFDEPS := \ 
     25PKG_CONFIG_DEPENDS:= \ 
    2426        CONFIG_PACKAGE_kmod-ath9k \ 
    2527        CONFIG_PACKAGE_kmod-mac80211 \ 
    2628        CONFIG_PACKAGE_kmod-madwifi \ 
    2729        CONFIG_PACKAGE_hostapd \ 
    28         CONFIG_PACKAGE_hostapd-mini 
     30        CONFIG_PACKAGE_hostapd-mini \ 
    2931 
    30 STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,$(PKG_CONFDEPS)) 
     32include $(INCLUDE_DIR)/package.mk 
    3133 
    3234DRIVER_MAKEOPTS= \ 
  • trunk/package/mac80211/Makefile

    r15245 r15451  
    2929PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION) 
    3030 
     31PKG_CONFIG_DEPENDS:= \ 
     32        CONFIG_PACKAGE_kmod-mac80211 \ 
     33 
    3134include $(INCLUDE_DIR)/package.mk 
    32 STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_kmod-mac80211) 
    3335 
    3436WMENU:=Wireless Drivers 
  • trunk/package/wpa_supplicant/Makefile

    r15245 r15451  
    1616PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1717 
    18 PKG_BUILD_DEPENDS:=PACKAGE_kmod-madwifi:madwifi 
     18PKG_BUILD_DEPENDS:= \ 
     19        PACKAGE_kmod-madwifi:madwifi \ 
     20 
     21PKG_CONFIG_DEPENDS:= \ 
     22        CONFIG_PACKAGE_kmod-madwifi \ 
     23        CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK \ 
    1924 
    2025include $(INCLUDE_DIR)/package.mk 
    21 STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_kmod-madwifi CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK) 
    2226 
    2327define Package/wpa-supplicant 
  • trunk/package/wprobe/Makefile

    r15354 r15451  
    1313PKG_BUILD_DEPENDS:=libnl PACKAGE_wprobe-export:libipfix 
    1414 
     15PKG_CONFIG_DEPENDS = \ 
     16        CONFIG_PACKAGE_kmod-wprobe \ 
     17        CONFIG_PACKAGE_wprobe-export \ 
     18 
    1519include $(INCLUDE_DIR)/package.mk 
    16  
    17 PKG_CONFDEPS = \ 
    18         CONFIG_PACKAGE_kmod-wprobe \ 
    19         CONFIG_PACKAGE_wprobe-export 
    20  
    21 STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,$(PKG_CONFDEPS)) 
    2220 
    2321define KernelPackage/wprobe 
Note: See TracChangeset for help on using the changeset viewer.