diff options
author | Jesse Gilles <jgilles@multitech.com> | 2014-03-03 12:17:33 -0600 |
---|---|---|
committer | Jesse Gilles <jgilles@multitech.com> | 2014-03-03 12:17:33 -0600 |
commit | 08f6c711e6e0c535738243d88373f759ae068ce2 (patch) | |
tree | 1f8344a60ad4f4e43dff8d794f09ebe576f681c0 /multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx-r5.sp7.01/0001-git-version-use-compat-base-tree.patch | |
parent | 1aecb1ed1e0efa0b9952040655a019b4e2e70864 (diff) | |
parent | 6e3d4cdcca42bd552e74bc7495ded9ef5d5be9c4 (diff) |
Merge branch 'ti-wl1271-r5.sp7.01'
Diffstat (limited to 'multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx-r5.sp7.01/0001-git-version-use-compat-base-tree.patch')
-rwxr-xr-x | multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx-r5.sp7.01/0001-git-version-use-compat-base-tree.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx-r5.sp7.01/0001-git-version-use-compat-base-tree.patch b/multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx-r5.sp7.01/0001-git-version-use-compat-base-tree.patch new file mode 100755 index 0000000..61fe912 --- /dev/null +++ b/multitech/recipes/compat-wireless/ti-compat-wireless-wl12xx-r5.sp7.01/0001-git-version-use-compat-base-tree.patch @@ -0,0 +1,29 @@ +For compat-wireless based builds use compat_base_tree_version in version.h +When building with compat-wireless mechanism, the version info captured in version.h reflects target kernel and not the wl12xx version. +Signed-off-by: Vishal Mahaveer <vishalm@ti.com> + +diff a/drivers/net/wireless/wl12xx/Makefile b/drivers/net/wireless/wl12xx/Makefile + +--- a/drivers/net/wireless/wl12xx/Makefile 2012-08-12 18:18:10.000000000 +0300 ++++ b/drivers/net/wireless/wl12xx/Makefile 2012-08-13 13:55:11.000000000 +0300 +@@ -3,12 +3,16 @@ + + define filechk_version.h + (echo 'static const char *wl12xx_timestamp = __TIMESTAMP__;'; \ +- echo 'static const char *wl12xx_git_head = \ +- "$(shell git describe --dirty)";') ++ echo '#ifdef COMPAT_BASE_TREE_VERSION'; \ ++ echo 'static const char *wl12xx_git_head = COMPAT_BASE_TREE_VERSION;'; \ ++ echo '#else'; \ ++ echo 'static const char *wl12xx_git_head = \ ++ "$(shell git describe --dirty)";'; \ ++ echo '#endif') + endef + +-$(obj)/version.h: .git/HEAD .git/index .git/refs/tags +- @$(call filechk,version.h) ++#$(obj)/version.h: .git/HEAD .git/index .git/refs/tags ++# @$(call filechk,version.h) + + $(obj)/main.c: $(src)/version.h + |