From 8f219fb9f03a068a7d9e26f43affefa0b1c4b836 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 31 Dec 2010 20:29:39 +0100 Subject: should be without path, just the name of the kernel --- target/x86/Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'target/x86') diff --git a/target/x86/Makefile b/target/x86/Makefile index 4a1ea372b..436ca25ce 100644 --- a/target/x86/Makefile +++ b/target/x86/Makefile @@ -16,19 +16,19 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) endif ifeq ($(ADK_TARGET_FS),nfsroot) imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) - @cp $(KERNEL) $(TARGET_KERNEL) - @echo 'The linux kernel is here: $(TARGET_KERNEL)' + @cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL) + @echo 'The linux kernel is here: $(BIN_DIR)/$(TARGET_KERNEL)' @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSUSERTARBALL}' endif ifeq ($(ADK_TARGET_FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86),y) - @cp $(KERNEL) $(TARGET_KERNEL) + @cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL) @echo "Use following command to create a QEMU Image:" @echo "sudo ./scripts/create-image.sh -f ${ADK_TARGET_ROOTFS} qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following command line:" - @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(TARGET_KERNEL) qemu-${CPU_ARCH}.img' + @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' endif endif ifeq ($(ADK_TARGET_FS),usb) @@ -38,20 +38,20 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) - @cp $(KERNEL) $(TARGET_KERNEL) - @echo 'The kernel file is: ${TARGET_KERNEL}' + @cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL) + @echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}' @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86),y) @echo "Start qemu with following command line:" - @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}' + @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/$(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}' endif endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs - @cp $(KERNEL) ${TARGET_KERNEL} - @echo 'The kernel+initramfs file is: ${TARGET_KERNEL}' + @cp $(KERNEL) $(BIN_DIR)/${TARGET_KERNEL} + @echo 'The kernel+initramfs file is: $(BIN_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86),y) @echo "Start qemu with following command line:" - @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(TARGET_KERNEL)' + @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/$(TARGET_KERNEL)' endif endif -- cgit v1.2.3 From dfadb4d959da4c63d0c634f0d50713f3fa679e50 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 2 Jan 2011 13:22:45 +0100 Subject: make bulk fixes. fix toolchain building for sparc64/ppc --- target/x86/files/etc/network/interfaces | 5 ----- target/x86/files/etc/tmpfs | 1 - target/x86/sys-available/qemu | 13 ------------- target/x86/sys-available/qemu-x86 | 13 +++++++++++++ target/x86/sys-available/toolchain | 9 --------- target/x86/sys-available/toolchain-x86 | 9 +++++++++ 6 files changed, 22 insertions(+), 28 deletions(-) delete mode 100644 target/x86/files/etc/network/interfaces delete mode 100644 target/x86/files/etc/tmpfs delete mode 100644 target/x86/sys-available/qemu create mode 100644 target/x86/sys-available/qemu-x86 delete mode 100644 target/x86/sys-available/toolchain create mode 100644 target/x86/sys-available/toolchain-x86 (limited to 'target/x86') diff --git a/target/x86/files/etc/network/interfaces b/target/x86/files/etc/network/interfaces deleted file mode 100644 index 104c1a1b6..000000000 --- a/target/x86/files/etc/network/interfaces +++ /dev/null @@ -1,5 +0,0 @@ -auto lo -iface lo inet loopback - -auto eth0 -iface eth0 inet dhcp diff --git a/target/x86/files/etc/tmpfs b/target/x86/files/etc/tmpfs deleted file mode 100644 index 08558e471..000000000 --- a/target/x86/files/etc/tmpfs +++ /dev/null @@ -1 +0,0 @@ -16384 diff --git a/target/x86/sys-available/qemu b/target/x86/sys-available/qemu deleted file mode 100644 index 97275c43d..000000000 --- a/target/x86/sys-available/qemu +++ /dev/null @@ -1,13 +0,0 @@ -config ADK_TARGET_SYSTEM_QEMU_X86 - bool "Qemu Emulator" - select ADK_x86 - select ADK_qemu - select ADK_CPU_I686 - select ADK_HARDWARE_QEMU - select ADK_TARGET_WITH_VGA - select ADK_TARGET_WITH_INPUT - select ADK_TARGET_WITH_PCI - select ADK_TARGET_WITH_HDD - help - Support for Qemu Emulator. - diff --git a/target/x86/sys-available/qemu-x86 b/target/x86/sys-available/qemu-x86 new file mode 100644 index 000000000..378d9fb8e --- /dev/null +++ b/target/x86/sys-available/qemu-x86 @@ -0,0 +1,13 @@ +config ADK_TARGET_SYSTEM_QEMU_X86 + bool "Qemu Emulator" + select ADK_x86 + select ADK_qemu_x86 + select ADK_CPU_I686 + select ADK_HARDWARE_QEMU + select ADK_TARGET_WITH_VGA + select ADK_TARGET_WITH_INPUT + select ADK_TARGET_WITH_PCI + select ADK_TARGET_WITH_HDD + help + Support for Qemu Emulator. + diff --git a/target/x86/sys-available/toolchain b/target/x86/sys-available/toolchain deleted file mode 100644 index 55fb36ce8..000000000 --- a/target/x86/sys-available/toolchain +++ /dev/null @@ -1,9 +0,0 @@ -config ADK_TARGET_SYSTEM_TOOLCHAIN_X86 - bool "Toolchain only" - select ADK_x86 - select ADK_toolchain - select ADK_CPU_I686 - select ADK_TOOLCHAIN_ONLY - help - Build a x86 toolchain (i686 optimized). - diff --git a/target/x86/sys-available/toolchain-x86 b/target/x86/sys-available/toolchain-x86 new file mode 100644 index 000000000..5c2871f3b --- /dev/null +++ b/target/x86/sys-available/toolchain-x86 @@ -0,0 +1,9 @@ +config ADK_TARGET_SYSTEM_TOOLCHAIN_X86 + bool "Toolchain only" + select ADK_x86 + select ADK_toolchain_x86 + select ADK_CPU_I686 + select ADK_TOOLCHAIN_ONLY + help + Build a x86 toolchain (i686 optimized). + -- cgit v1.2.3