diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-04-27 15:53:00 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-04-27 15:53:00 +0000 |
| commit | db6a8626c253df10cecb378f02be503eb7039c66 (patch) | |
| tree | 090bd23485a06b25d7416926be7177c9bf4b91e5 | |
| parent | 41ac6296955b755d2ca81d318954bfa882e742f6 (diff) | |
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
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15451 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/package.mk | 4 | ||||
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rw-r--r-- | package/hostapd/Makefile | 12 | ||||
| -rw-r--r-- | package/mac80211/Makefile | 4 | ||||
| -rw-r--r-- | package/wpa_supplicant/Makefile | 8 | ||||
| -rw-r--r-- | package/wprobe/Makefile | 8 |
6 files changed, 22 insertions, 16 deletions
diff --git a/include/package.mk b/include/package.mk index 9bffcd1563..bd52c85265 100644 --- a/include/package.mk +++ b/include/package.mk @@ -16,8 +16,8 @@ include $(INCLUDE_DIR)/host.mk 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_DEPEND),))) -STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured +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_BUILT:=$(PKG_BUILD_DIR)/.built STAMP_INSTALLED:=$(STAGING_DIR)/stamp/.$(PKG_NAME)_installed diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 050f0f9efe..5578c90da8 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=base-files PKG_RELEASE:=18 -PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ +PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ include $(INCLUDE_DIR)/package.mk diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile index 4955979309..0c1d6fc776 100644 --- a/package/hostapd/Makefile +++ b/package/hostapd/Makefile @@ -16,18 +16,20 @@ PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/ PKG_SOURCE_SUBDIR:=hostapd-$(PKG_VERSION) PKG_SOURCE_VERSION:=$(PKG_REV) PKG_MD5SUM:=83630d11fa66ade9091f1b304fccd74c -PKG_BUILD_DEPENDS:=PACKAGE_kmod-madwifi:madwifi PACKAGE_kmod-mac80211:mac80211 PACKAGE_kmod-mac80211:libnl -include $(INCLUDE_DIR)/package.mk +PKG_BUILD_DEPENDS:= \ + PACKAGE_kmod-madwifi:madwifi \ + PACKAGE_kmod-mac80211:mac80211 \ + PACKAGE_kmod-mac80211:libnl \ -PKG_CONFDEPS := \ +PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_kmod-ath9k \ CONFIG_PACKAGE_kmod-mac80211 \ CONFIG_PACKAGE_kmod-madwifi \ CONFIG_PACKAGE_hostapd \ - CONFIG_PACKAGE_hostapd-mini + CONFIG_PACKAGE_hostapd-mini \ -STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,$(PKG_CONFDEPS)) +include $(INCLUDE_DIR)/package.mk DRIVER_MAKEOPTS= \ CONFIG_DRIVER_NL80211=$(CONFIG_PACKAGE_kmod-mac80211) \ diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index a2a92f7d77..7ab65f5c69 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -28,8 +28,10 @@ endif PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION) +PKG_CONFIG_DEPENDS:= \ + CONFIG_PACKAGE_kmod-mac80211 \ + include $(INCLUDE_DIR)/package.mk -STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_kmod-mac80211) WMENU:=Wireless Drivers diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile index 0ad2ff31f8..de1a0a476a 100644 --- a/package/wpa_supplicant/Makefile +++ b/package/wpa_supplicant/Makefile @@ -15,10 +15,14 @@ PKG_MD5SUM:=0efb8fcedf0a8acf6f423dfdb0658fdd PKG_SOURCE_URL:=http://hostap.epitest.fi/releases PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_BUILD_DEPENDS:=PACKAGE_kmod-madwifi:madwifi +PKG_BUILD_DEPENDS:= \ + PACKAGE_kmod-madwifi:madwifi \ + +PKG_CONFIG_DEPENDS:= \ + CONFIG_PACKAGE_kmod-madwifi \ + CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK \ include $(INCLUDE_DIR)/package.mk -STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_kmod-madwifi CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK) define Package/wpa-supplicant SECTION:=net diff --git a/package/wprobe/Makefile b/package/wprobe/Makefile index bbc2b88c94..cea23d2a3b 100644 --- a/package/wprobe/Makefile +++ b/package/wprobe/Makefile @@ -12,13 +12,11 @@ PKG_VERSION:=1 PKG_BUILD_DEPENDS:=libnl PACKAGE_wprobe-export:libipfix -include $(INCLUDE_DIR)/package.mk - -PKG_CONFDEPS = \ +PKG_CONFIG_DEPENDS = \ CONFIG_PACKAGE_kmod-wprobe \ - CONFIG_PACKAGE_wprobe-export + CONFIG_PACKAGE_wprobe-export \ -STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,$(PKG_CONFDEPS)) +include $(INCLUDE_DIR)/package.mk define KernelPackage/wprobe SUBMENU:=Network Support |