diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-09-14 19:09:08 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-09-14 19:09:08 +0200 |
| commit | f025ebb7aa85ede947fc809c43b898bac8e0f9b3 (patch) | |
| tree | 16f028c6a2ffe4a1fa0b33ee9607c23cb62ee01f /mk | |
| parent | 05d0076d97ed69a531df1aa5cde3a1e6ed17f922 (diff) | |
| parent | 9d7af809f7881ed2dba51bf9e59ace51c6848ed6 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/kernel-build.mk | 3 | ||||
| -rw-r--r-- | mk/modules.mk | 20 |
2 files changed, 19 insertions, 4 deletions
diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index 8ee6d1ac3..ebc58a7d0 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -27,11 +27,12 @@ $(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.config $(TRACE) target/$(ADK_TARGET)-kernel-compile - $(MAKE) ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} $(MAKE_TRACE) + $(MAKE) ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} LOCALVERSION="" $(MAKE_TRACE) $(TRACE) target/$(ADK_TARGET)-kernel-modules-install rm -rf $(LINUX_BUILD_DIR)/modules $(MAKE) ${KERNEL_MAKE_OPTS} DEPMOD=true \ INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules \ + LOCALVERSION="" \ modules_install $(MAKE_TRACE) $(TRACE) target/$(ADK_TARGET)-create-packages ifneq ($(strip $(TARGETS)),) diff --git a/mk/modules.mk b/mk/modules.mk index 10f9a6266..dcdbe57a4 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -361,12 +361,20 @@ $(eval $(call KMOD_template,NETFILTER_XT_TARGET_CLASSIFY,netfiler-xt-target-clas $(MODULES_DIR)/kernel/net/netfilter/xt_CLASSIFY \ ,50)) +ifeq ($(KERNEL_VERSION),2.6.35) +CONNMARK:=xt_connmark +MARK:=xt_mark +else +CONNMARK:=xt_CONNMARK +MARK:=xt_MARK +endif + $(eval $(call KMOD_template,NETFILTER_XT_TARGET_CONNMARK,netfilter-xt-target-connmark,\ - $(MODULES_DIR)/kernel/net/netfilter/xt_CONNMARK \ + $(MODULES_DIR)/kernel/net/netfilter/$(CONNMARK) \ ,50)) $(eval $(call KMOD_template,NETFILTER_XT_TARGET_MARK,netfilter-xt-target-mark,\ - $(MODULES_DIR)/kernel/net/netfilter/xt_MARK \ + $(MODULES_DIR)/kernel/net/netfilter/$(MARK) \ ,50)) $(eval $(call KMOD_template,NETFILTER_XT_TARGET_NFQUEUE,netfilter-xt-target-nfqueue,\ @@ -1217,8 +1225,14 @@ $(eval $(call KMOD_template,USB_HSO,usb-hso,\ $(MODULES_DIR)/kernel/drivers/net/usb/hso \ ,75)) +ifeq ($(KERNEL_VERSION),2.6.35) +SNDUSB:=snd-usbmidi-lib +else +SNDUSB:=snd-usb-lib +endif + $(eval $(call KMOD_template,SND_USB_AUDIO,snd-usb-audio,\ - $(MODULES_DIR)/kernel/sound/usb/snd-usb-lib \ + $(MODULES_DIR)/kernel/sound/usb/$(SNDUSB) \ $(MODULES_DIR)/kernel/sound/usb/snd-usb-audio \ ,75)) |