summaryrefslogtreecommitdiff
path: root/mk/image.mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-06-12 15:57:45 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2011-06-12 15:57:45 +0200
commit2ca840b83ddd797f872bd6cc282991ec2b60e3ed (patch)
tree0b6d4703e7861329111049a85ce88234afc44c81 /mk/image.mk
parent7109403c1d38cd863782417855775562a6e56b2f (diff)
update default kernel to 2.6.39
Diffstat (limited to 'mk/image.mk')
-rw-r--r--mk/image.mk8
1 files changed, 1 insertions, 7 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 | \