OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 2 Rev 3
Line 57... Line 57...
57 LINUX_UNAME_VERSION:=$(LINUX_UNAME_VERSION)-$(strip $(lastword $(subst -, ,$(LINUX_VERSION)))) 57 LINUX_UNAME_VERSION:=$(LINUX_UNAME_VERSION)-$(strip $(lastword $(subst -, ,$(LINUX_VERSION))))
58 endif 58 endif
Line 59... Line 59...
59   59  
Line 60... Line -...
60 LINUX_KERNEL:=$(KERNEL_BUILD_DIR)/vmlinux -  
61   -  
62 ifneq (,$(findstring -rc,$(LINUX_VERSION))) -  
63 LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.gz 60 LINUX_KERNEL:=$(KERNEL_BUILD_DIR)/vmlinux
64 else -  
65 LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.xz -  
66 endif 61  
67   -  
68 ifneq (,$(findstring -rc,$(LINUX_VERSION))) 62 LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.xz
69 LINUX_SITE:=https://git.kernel.org/torvalds/t 63 TESTING:=$(if $(findstring -rc,$(LINUX_VERSION)),/testing,)
70 else ifeq ($(call qstrip,$(CONFIG_EXTERNAL_KERNEL_TREE))$(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI)),) 64 ifeq ($(call qstrip,$(CONFIG_EXTERNAL_KERNEL_TREE))$(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI)),)
71 LINUX_SITE:=@KERNEL/linux/kernel/v$(word 1,$(subst ., ,$(KERNEL_BASE))).x 65 LINUX_SITE:=@KERNEL/linux/kernel/v$(word 1,$(subst ., ,$(KERNEL_BASE))).x$(TESTING)
72 else 66 else
Line 73... Line 67...
73 LINUX_UNAME_VERSION:=$(strip $(shell cat $(LINUX_DIR)/include/config/kernel.release 2>/dev/null)) 67 LINUX_UNAME_VERSION:=$(strip $(shell cat $(LINUX_DIR)/include/config/kernel.release 2>/dev/null))
Line 101... Line 95...
101 LINUX_KARCH := $(ARCH) 95 LINUX_KARCH := $(ARCH)
102 endif 96 endif
Line 103... Line 97...
103   97  
Line 104... Line 98...
104 KERNEL_MAKE = $(MAKE) $(KERNEL_MAKEOPTS) 98 KERNEL_MAKE = $(MAKE) $(KERNEL_MAKEOPTS)
105   99  
106 KERNEL_MAKE_FLAGS = \ 100 KERNEL_MAKE_FLAGS := \
107 HOSTCFLAGS="$(HOST_CFLAGS) -Wall -Wmissing-prototypes -Wstrict-prototypes" \ 101 HOSTCFLAGS="$(HOST_CFLAGS) -Wall -Wmissing-prototypes -Wstrict-prototypes" \
108 CROSS_COMPILE="$(KERNEL_CROSS)" \ 102 CROSS_COMPILE="$(KERNEL_CROSS)" \
109 ARCH="$(LINUX_KARCH)" \ 103 ARCH="$(LINUX_KARCH)" \
Line 241... Line 235...
241 else \ 235 else \
242 echo "ERROR: module '$$$$$$$$mod' is missing." >&2; \ 236 echo "ERROR: module '$$$$$$$$mod' is missing." >&2; \
243 exit 1; \ 237 exit 1; \
244 fi; \ 238 fi; \
245 done; 239 done;
246 $(call ModuleAutoLoad,$(1),$$(1),$(filter-out 0-,$(word 1,$(AUTOLOAD))-),$(filter-out 0,$(word 2,$(AUTOLOAD))),$(sort $(wordlist 3,99,$(AUTOLOAD)))) 240 $(call ModuleAutoLoad,$(1),$$(1),$(filter-out 0-,$(word 1,$(AUTOLOAD))-),$(filter-out 0,$(word 2,$(AUTOLOAD))),$(wordlist 3,99,$(AUTOLOAD)))
247 $(call KernelPackage/$(1)/install,$$(1)) 241 $(call KernelPackage/$(1)/install,$$(1))
248 endef 242 endef
249 $(if $(CONFIG_PACKAGE_kmod-$(1)), 243 $(if $(CONFIG_PACKAGE_kmod-$(1)),
250 else 244 else
251 compile: $(1)-disabled 245 compile: $(1)-disabled
Line 257... Line 251...
257 endef 251 endef
258 ) 252 )
259 endif 253 endif
260 $$(eval $$(call BuildPackage,kmod-$(1))) 254 $$(eval $$(call BuildPackage,kmod-$(1)))
Line 261... Line 255...
261   255  
262 $$(IPKG_kmod-$(1)): $$(wildcard $$(call version_filter,$$(FILES))) -  
263   256 $$(IPKG_kmod-$(1)): $$(wildcard $$(FILES))
Line 264... Line 257...
264 endef 257 endef
Line 265... Line 258...
265   258