[source] git-kernel: $(SUBDIR) should always be $(LINUX_VERSION)

LEDE Commits lede-commits at lists.infradead.org
Thu Jan 19 04:06:33 PST 2017


nbd pushed a commit to source.git, branch lede-17.01:
https://git.lede-project.org/c76da7757323d268b394cbda2e4748eedbb2496a

commit c76da7757323d268b394cbda2e4748eedbb2496a
Author: Mirko Vogt <mirko-openwrt at nanl.de>
AuthorDate: Wed Jan 18 14:36:45 2017 +0100

    git-kernel: $(SUBDIR) should always be $(LINUX_VERSION)
    
    Before SUBDIR was set to $(PATCHVER) which may
    or may not include the minor version number of
    the linux kernel version. Usually it doesn't.
    
    So the git-clone'd linux kernel was packed without
    the minor version number taken into account, which
    broke further processing, as it expected the
    extracted dir being named linux-$(LINUX_VERSION)
    (=with minor version) rather than linux-$(PATCHVER)
    (=without minor version).
    
    Changing SUBDIR to $(LINUX_VERSION) creates
    consistent behaviour here.
    
    Signed-off-by: Mirko Vogt <mirko-openwrt at nanl.de>
---
 include/kernel-build.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 2bf47b1..32da94b 100644
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -60,7 +60,7 @@ define Download/git-kernel
   PROTO:=git
   VERSION:=$(CONFIG_KERNEL_GIT_BRANCH)
   FILE:=$(LINUX_SOURCE)
-  SUBDIR:=linux-$(KERNEL_PATCHVER)
+  SUBDIR:=linux-$(LINUX_VERSION)
   OPTS:=$(KERNEL_GIT_OPTS)
 endef
 



More information about the lede-commits mailing list