diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:40:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:40:13 +0100 |
| commit | 2b38e5af3eb58c27cc646fed11ac1a24805fa05d (patch) | |
| tree | 780bd8869c0ed798d8c0abce17869a29cc01fb01 /target/x86 | |
| parent | 2a2320b4292d4e370cc95aea61525ebd7dc11337 (diff) | |
| parent | 34592482701199604242848b80c39bd07b6c7716 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/x86')
| -rw-r--r-- | target/x86/Makefile | 20 | ||||
| -rw-r--r-- | target/x86/files/etc/network/interfaces | 5 | ||||
| -rw-r--r-- | target/x86/files/etc/tmpfs | 1 | ||||
| -rw-r--r-- | target/x86/sys-available/qemu-x86 (renamed from target/x86/sys-available/qemu) | 2 | ||||
| -rw-r--r-- | target/x86/sys-available/toolchain-x86 (renamed from target/x86/sys-available/toolchain) | 2 |
5 files changed, 12 insertions, 18 deletions
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 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-x86 index 97275c43d..378d9fb8e 100644 --- a/target/x86/sys-available/qemu +++ b/target/x86/sys-available/qemu-x86 @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_QEMU_X86 bool "Qemu Emulator" select ADK_x86 - select ADK_qemu + select ADK_qemu_x86 select ADK_CPU_I686 select ADK_HARDWARE_QEMU select ADK_TARGET_WITH_VGA diff --git a/target/x86/sys-available/toolchain b/target/x86/sys-available/toolchain-x86 index 55fb36ce8..5c2871f3b 100644 --- a/target/x86/sys-available/toolchain +++ b/target/x86/sys-available/toolchain-x86 @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_X86 bool "Toolchain only" select ADK_x86 - select ADK_toolchain + select ADK_toolchain_x86 select ADK_CPU_I686 select ADK_TOOLCHAIN_ONLY help |