From 8f219fb9f03a068a7d9e26f43affefa0b1c4b836 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 31 Dec 2010 20:29:39 +0100
Subject:  should be without path, just the name of the kernel

---
 target/x86_64/Makefile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'target/x86_64')

diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile
index ed90f443e..3ae8b112d 100644
--- a/target/x86_64/Makefile
+++ b/target/x86_64/Makefile
@@ -16,7 +16,7 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86_64),y)
 	@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-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
+	@echo 'qemu-system-x86_64 -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)
@@ -26,20 +26,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_64),y)
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}'
+	@echo 'qemu-system-x86_64 -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 file is: ${TARGET_KERNEL}'
+	@cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
+	@echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
 ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86_64),y)
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(TARGET_KERNEL)'
+	@echo 'qemu-system-x86_64 -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 <wbx@openadk.org>
Date: Sun, 2 Jan 2011 13:22:45 +0100
Subject: make bulk fixes. fix toolchain building for sparc64/ppc

---
 target/x86_64/files/etc/network/interfaces   |  5 -----
 target/x86_64/files/etc/tmpfs                |  1 -
 target/x86_64/sys-available/qemu             | 12 ------------
 target/x86_64/sys-available/qemu-x86_64      | 12 ++++++++++++
 target/x86_64/sys-available/toolchain        |  8 --------
 target/x86_64/sys-available/toolchain-x86_64 |  8 ++++++++
 6 files changed, 20 insertions(+), 26 deletions(-)
 delete mode 100644 target/x86_64/files/etc/network/interfaces
 delete mode 100644 target/x86_64/files/etc/tmpfs
 delete mode 100644 target/x86_64/sys-available/qemu
 create mode 100644 target/x86_64/sys-available/qemu-x86_64
 delete mode 100644 target/x86_64/sys-available/toolchain
 create mode 100644 target/x86_64/sys-available/toolchain-x86_64

(limited to 'target/x86_64')

diff --git a/target/x86_64/files/etc/network/interfaces b/target/x86_64/files/etc/network/interfaces
deleted file mode 100644
index 104c1a1b6..000000000
--- a/target/x86_64/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_64/files/etc/tmpfs b/target/x86_64/files/etc/tmpfs
deleted file mode 100644
index 08558e471..000000000
--- a/target/x86_64/files/etc/tmpfs
+++ /dev/null
@@ -1 +0,0 @@
-16384
diff --git a/target/x86_64/sys-available/qemu b/target/x86_64/sys-available/qemu
deleted file mode 100644
index 464f284fa..000000000
--- a/target/x86_64/sys-available/qemu
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_X86_64
-	bool "Qemu Emulator"
-	select ADK_x86_64
-	select ADK_qemu
-	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_64/sys-available/qemu-x86_64 b/target/x86_64/sys-available/qemu-x86_64
new file mode 100644
index 000000000..e7dd37fa8
--- /dev/null
+++ b/target/x86_64/sys-available/qemu-x86_64
@@ -0,0 +1,12 @@
+config ADK_TARGET_SYSTEM_QEMU_X86_64
+	bool "Qemu Emulator"
+	select ADK_x86_64
+	select ADK_qemu_x86_64
+	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_64/sys-available/toolchain b/target/x86_64/sys-available/toolchain
deleted file mode 100644
index 1552e0599..000000000
--- a/target/x86_64/sys-available/toolchain
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64
-	bool "Toolchain only"
-	select ADK_x86_64
-	select ADK_toolchain
-	select ADK_TOOLCHAIN_ONLY
-	help
-	  Build a x86_64 toolchain.
-
diff --git a/target/x86_64/sys-available/toolchain-x86_64 b/target/x86_64/sys-available/toolchain-x86_64
new file mode 100644
index 000000000..be6a9f5b9
--- /dev/null
+++ b/target/x86_64/sys-available/toolchain-x86_64
@@ -0,0 +1,8 @@
+config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64
+	bool "Toolchain only"
+	select ADK_x86_64
+	select ADK_toolchain_x86_64
+	select ADK_TOOLCHAIN_ONLY
+	help
+	  Build a x86_64 toolchain.
+
-- 
cgit v1.2.3