diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-06-12 15:57:45 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-06-12 15:57:45 +0200 |
| commit | 2ca840b83ddd797f872bd6cc282991ec2b60e3ed (patch) | |
| tree | 0b6d4703e7861329111049a85ce88234afc44c81 /mk | |
| parent | 7109403c1d38cd863782417855775562a6e56b2f (diff) | |
update default kernel to 2.6.39
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/image.mk | 8 | ||||
| -rw-r--r-- | mk/kernel-build.mk | 1 | ||||
| -rw-r--r-- | mk/kernel-ver.mk | 4 | ||||
| -rw-r--r-- | mk/modules.mk | 8 |
4 files changed, 8 insertions, 13 deletions
diff --git a/mk/image.mk b/mk/image.mk index e8a74aca6..24e31aa0b 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -65,7 +65,7 @@ kernel-package: $(KERNEL) $(TRACE) target/$(ADK_TARGET_ARCH)-install-kernel-package $(PKG_INSTALL) $(KERNEL_PKG) $(MAKE_TRACE) -TARGET_KERNEL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_ARCH}-${ADK_TARGET_FS}-kernel +TARGET_KERNEL= ${ADK_TARGET_SYSTEM}-${CPU_ARCH}-${ADK_TARGET_FS}-kernel INITRAMFS= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_ARCH}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS} ROOTFSSQUASHFS= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_ARCH}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.img ROOTFSTARBALL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_ARCH}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}+kernel.tar.gz @@ -103,12 +103,6 @@ ${BUILD_DIR}/root.squashfs: ${TARGET_DIR} ${BUILD_DIR}/root.squashfs \ -nopad -noappend -root-owned $(MAKE_TRACE) -ifeq (,${CUSTOM_ROOTFSSQUASHFS_BUILD}) -${BUILD_DIR}/${ROOTFSSQUASHFS}: ${BUILD_DIR}/root.squashfs - cat ${BUILD_DIR}/${TARGET_KERNEL} ${BUILD_DIR}/root.squashfs \ - >${BUILD_DIR}/${ROOTFSSQUASHFS} -endif - createinitramfs: @-rm $(LINUX_DIR)/usr/initramfs_data.cpio* $(MAKE_TRACE) echo N | \ diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index 986eb9c29..c9e1bf7e5 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -26,6 +26,7 @@ $(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig $(TOPDIR touch -c $(LINUX_DIR)/.config $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.config + -rm $(LINUX_DIR)/vmlinux $(TRACE) target/$(ADK_TARGET_ARCH)-kernel-compile ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} LOCALVERSION="" $(MAKE_TRACE) $(TRACE) target/$(ADK_TARGET_ARCH)-kernel-modules-install diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 1741c62d0..46e8e9e5c 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -1,3 +1,3 @@ -KERNEL_VERSION:= 2.6.37 +KERNEL_VERSION:= 2.6.39 KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= c8ee37b4fdccdb651e0603d35350b434 +KERNEL_MD5SUM:= 1aab7a741abe08d42e8eccf20de61e05 diff --git a/mk/modules.mk b/mk/modules.mk index f82a4382f..0d6a86ebb 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1036,9 +1036,9 @@ $(eval $(call KMOD_template,NFS_FS,nfs-fs,\ ,30)) endif -$(eval $(call KMOD_template,EXPORTFS,exportfs,\ - $(MODULES_DIR)/kernel/fs/exportfs/exportfs \ -,20)) +#$(eval $(call KMOD_template,EXPORTFS,exportfs,\ +# $(MODULES_DIR)/kernel/fs/exportfs/exportfs \ +#,20)) $(eval $(call KMOD_template,NFSD,nfsd,\ $(MODULES_DIR)/kernel/fs/nfsd/nfsd \ @@ -1156,7 +1156,7 @@ $(eval $(call KMOD_template,PCMCIA,pcmcia,\ ,60)) $(eval $(call KMOD_template,SERIAL_8250_CS,serial-8250-cs,\ - $(MODULES_DIR)/kernel/drivers/serial/serial_cs \ + $(MODULES_DIR)/kernel/drivers/tty/serial/serial_cs \ ,70)) # |