commit bf2f018c14abf0429859af12df3ce31ef3ae5dff
author Eliad Peller <eliad@wizery.com> Mon Jul 06 14:35:46 2015 +0300
committer iwlwifi publisher Thu Aug 13 15:01:47 2015 +0300
tree 01068999c511c05d280b50c7bae7e2a4756c9c3d
parent e2fecc42179e827d45b08f1b5724888738ca8c22

[BUGFIX] iwlwifi: Android-make-iwlwifi.mk: consider changed files

The current Makefile works by copying the entire source
directory, and running the actual build commands on the
(newly created) target directory.

However, the Makefile doesn't consider file changes, as
the target directory is defined as order-only dependency,
which depends only on the source dir (rather than the
actual source files).

Fix it by defining a dependency on all files in the source directory.

type=bugfix
bug=not-tracked
fixes=If7bb9684c4bd1df5d1d8672933bab9a1dcb6a803

Change-Id: I2358b5fb7c709f9fcc6e62ca590028c4d3bce708
Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
Reviewed-on: https://gerrit.rds.intel.com/r/59602
Tested-by: IWL Jenkins
Reviewed-by: Benzi Zbit <benzi.zbit@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-on: https://gerrit.rds.intel.com/r/61320
x-iwlwifi-stack-dev: 993856f532b461ecb5f87e6842c1f812144f85ba

Android-make-iwlwifi.mk

diff --git a/Android-make-iwlwifi.mk b/Android-make-iwlwifi.mk
index 8d84c6e..1f42b93 100644
--- a/Android-make-iwlwifi.mk
+++ b/Android-make-iwlwifi.mk
@@ -58,13 +58,14 @@
 
 iwlwifi: iwlwifi_build $(INTEL_IWL_COMPAT_INSTALL) $(INTEL_IWL_MOD_DEP)
 
-$(INTEL_IWL_OUT_DIR): $(INTEL_IWL_SRC_DIR)
+INTEL_IWL_SRC_FILES := $(shell find $(INTEL_IWL_SRC_DIR))
+$(INTEL_IWL_OUT_DIR): $(INTEL_IWL_SRC_FILES)
 	@echo Copying directory $(INTEL_IWL_SRC_DIR) to $(INTEL_IWL_OUT_DIR)
 	@rm -rf $(INTEL_IWL_OUT_DIR)
 	@mkdir -p $(INTEL_IWL_OUT_DIR)
 	@cp -rfl $(INTEL_IWL_SRC_DIR)/. $(INTEL_IWL_OUT_DIR)/
 
-$(IWLWIFI_CONFIGURE): $(INTEL_IWL_KERNEL_DEPEND) | $(INTEL_IWL_OUT_DIR)
+$(IWLWIFI_CONFIGURE): $(INTEL_IWL_KERNEL_DEPEND) $(INTEL_IWL_OUT_DIR)
 	@echo Configuring kernel module iwlwifi with defconfig-$(INTEL_IWL_BOARD_CONFIG)
 	@$(MAKE) -C $(INTEL_IWL_OUT_DIR)/ ARCH=$(TARGET_ARCH) $(CROSS_COMPILE) KLIB_BUILD=$(KERNEL_OUT_ABS_DIR) defconfig-$(INTEL_IWL_BOARD_CONFIG)
 

versions

diff --git a/versions b/versions
index acece52..534f216 100644
--- a/versions
+++ b/versions
@@ -2,5 +2,5 @@
 BACKPORTED_KERNEL_VERSION="(see git)"
 BACKPORTED_KERNEL_NAME="iwlwifi"
 BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__
-BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:release/LinuxCore12:4394:15c608b5"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:release/LinuxCore12:4395:993856f5"
 BACKPORTS_BRANCH_TSTAMP="Jun 02 2015 11:09:32"