diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-06-07 12:34:57 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-06-07 12:34:57 +0200 |
commit | d22b78be7b2b95ba028c6584e9ee5abb69a375cb (patch) | |
tree | 039da0ef61265cda4512279d36aea46c4670a715 /target/rescue-x86_64 | |
parent | 702e216210d58f1301c80d4e55af5d29f813eb19 (diff) | |
parent | 2e2eee9052d2c487d7114818ca446c370dba7f49 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/rescue-x86_64')
-rw-r--r-- | target/rescue-x86_64/Makefile | 15 | ||||
-rw-r--r-- | target/rescue-x86_64/target.mk | 4 |
2 files changed, 3 insertions, 16 deletions
diff --git a/target/rescue-x86_64/Makefile b/target/rescue-x86_64/Makefile index 6e4f275ee..3636045dd 100644 --- a/target/rescue-x86_64/Makefile +++ b/target/rescue-x86_64/Makefile @@ -9,19 +9,6 @@ include $(TOPDIR)/mk/image.mk kernel-install: -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 'CONFIG_INITRAMFS_COMPRESSION_LZMA=y' >> $(LINUX_DIR)/.config - echo N |$(MAKE) -C $(LINUX_DIR) V=0 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \ - CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE) - $(MAKE) -C $(LINUX_DIR) V=0 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) @cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel @@ -31,7 +18,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 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_64/target.mk b/target/rescue-x86_64/target.mk index 8ed9f234a..4033eed32 100644 --- a/target/rescue-x86_64/target.mk +++ b/target/rescue-x86_64/target.mk @@ -1,7 +1,7 @@ ARCH:= x86 CPU_ARCH:= x86_64 -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:= |