diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-07 17:59:33 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-07 17:59:54 +0200 |
| commit | 4e4ca4e75b078e3834df1a51de9f51671bc04e24 (patch) | |
| tree | 3b5899072aaa60c07a76b6903f22b0e10911def4 /mk | |
| parent | 660828b97932653e8f29779fa9ea23155c442ea2 (diff) | |
add 3.15.rc4 for cubox, revert some module conversion, breaks fb and usb
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/kernel-ver.mk | 6 | ||||
| -rw-r--r-- | mk/linux.mk | 2 | ||||
| -rw-r--r-- | mk/mirrors.mk | 6 | ||||
| -rw-r--r-- | mk/modules.mk | 1 |
4 files changed, 11 insertions, 4 deletions
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 46ef60cc2..3f98b73e9 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -4,6 +4,12 @@ KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 KERNEL_MD5SUM:= d4e06af8b674ac74ba745d52e4382bd3 endif +ifeq ($(ADK_KERNEL_VERSION_3_15_RC4),y) +KERNEL_VERSION:= 3.15-rc4 +KERNEL_MOD_VERSION:= 3.15.0-rc4 +KERNEL_RELEASE:= 1 +KERNEL_MD5SUM:= 0399887fdf394e09bf19cfb4d20a5855 +endif ifeq ($(ADK_KERNEL_VERSION_3_14_3),y) KERNEL_VERSION:= 3.14.3 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) diff --git a/mk/linux.mk b/mk/linux.mk index 6dd7f0f99..063209663 100644 --- a/mk/linux.mk +++ b/mk/linux.mk @@ -5,5 +5,5 @@ PKG_NAME:= linux PKG_VERSION:= $(KERNEL_VERSION) PKG_RELEASE:= $(KERNEL_RELEASE) PKG_MD5SUM:= $(KERNEL_MD5SUM) -PKG_SITES:= ${MASTER_SITE_KERNEL:=kernel/v3.0/} +PKG_SITES:= ${MASTER_SITE_KERNEL} DISTFILES= $(PKG_NAME)-$(PKG_VERSION).tar.xz diff --git a/mk/mirrors.mk b/mk/mirrors.mk index ab7349288..28f683b43 100644 --- a/mk/mirrors.mk +++ b/mk/mirrors.mk @@ -11,8 +11,10 @@ MASTER_SITE_MIRBSD?= \ http://pub.allbsd.org/MirOS/distfiles/ \ MASTER_SITE_KERNEL?= \ - ftp://www.kernel.org/pub/linux/ \ - http://www.kernel.org/pub/linux/ \ + ftp://www.kernel.org/pub/linux/kernel/v3.0/ \ + http://www.kernel.org/pub/linux/kernel/v3.0/ \ + ftp://www.kernel.org/pub/linux/kernel/v3.0/testing/ \ + http://www.kernel.org/pub/linux/kernel/v3.0/testing/ \ MASTER_SITE_XORG?= \ http://www.x.org/releases/individual/xserver/ \ diff --git a/mk/modules.mk b/mk/modules.mk index 017b39ecc..af2b2b446 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1431,7 +1431,6 @@ $(eval $(call KMOD_template,SND_USB_AUDIO,snd-usb-audio,\ # $(eval $(call KMOD_template,BT,bt,\ - $(MODULES_DIR)/kernel/net/ieee802154/6lowpan_iphc \ $(MODULES_DIR)/kernel/net/bluetooth/bluetooth \ ,70)) |