From 92dd4fee15cb7c33868c7d7213f82136955397b1 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 29 May 2010 14:29:22 +0200
Subject: upgrade all targets to Linux 2.6.34

---
 target/rescue-x86/Makefile  | 14 +-------------
 target/rescue-x86/target.mk |  4 ++--
 2 files changed, 3 insertions(+), 15 deletions(-)

(limited to 'target/rescue-x86')

diff --git a/target/rescue-x86/Makefile b/target/rescue-x86/Makefile
index 0d7d19d48..94f5a6742 100644
--- a/target/rescue-x86/Makefile
+++ b/target/rescue-x86/Makefile
@@ -11,18 +11,6 @@ kernel-install:
 	@cp $(LINUX_DIR)/arch/x86/boot/bzImage \
 		$(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
 
-createinit:
-	@-rm $(LINUX_DIR)/usr/initramfs_data.cpio.*
-	$(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="${BUILD_DIR}/${INITRAMFS_PIGGYBACK}"#' \
-		$(LINUX_DIR)/.config
-	echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config
-	echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config
-	echo N |$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
-		CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE) 
-	$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
-		CC="$(TARGET_CC)" $(MAKE_TRACE)
-	@cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
-
 ifeq ($(FS),initramfs)
 imageinstall: $(BIN_DIR)/$(INITRAMFS)
 	@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@@ -31,7 +19,7 @@ imageinstall: $(BIN_DIR)/$(INITRAMFS)
 endif
 
 ifeq ($(FS),initramfs-piggyback)
-imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinit
+imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs
 	@echo 'The kernel+initramfs file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
 	@echo 'Login as user root with password linux123 via ssh or console'
 endif
diff --git a/target/rescue-x86/target.mk b/target/rescue-x86/target.mk
index 0bd943db7..303f276c0 100644
--- a/target/rescue-x86/target.mk
+++ b/target/rescue-x86/target.mk
@@ -1,7 +1,7 @@
 ARCH:=			x86
 CPU_ARCH:=		i686
-KERNEL_VERSION:=	2.6.33
+KERNEL_VERSION:=	2.6.34
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		c3883760b18d50e8d78819c54d579b00
+KERNEL_MD5SUM:=		10eebcb0178fb4540e2165bfd7efc7ad
 TARGET_OPTIMIZATION:=	-O2 -pipe
 TARGET_CFLAGS_ARCH:=	-march=i686
-- 
cgit v1.2.3