diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-11-18 21:36:54 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-11-18 21:36:54 +0100 |
| commit | e2bff9d3ecca84e5688b9a3e9762a22046c042ca (patch) | |
| tree | 1ad3d0de27b805dff260a50d93e0162af4190363 /target/x86/Makefile | |
| parent | 0373afa7a5f3f5eb9c0e84bb2594f727a9b05b81 (diff) | |
| parent | 434f07ef1c5d536e9e94561b5e7a066f1d9cd954 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/x86/Makefile')
| -rw-r--r-- | target/x86/Makefile | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/target/x86/Makefile b/target/x86/Makefile index 3c95fc2d1..15bf7258e 100644 --- a/target/x86/Makefile +++ b/target/x86/Makefile @@ -9,6 +9,12 @@ include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage +$(TOOLS_BUILD_DIR): + @mkdir -p $(TOOLS_BUILD_DIR) + +tools-compile: $(TOOLS_BUILD_DIR) + $(MAKE) -C ../tools/grub prepare compile install + createinitcrypt: $(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="./initramfs_list"#' $(LINUX_DIR)/.config echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config @@ -24,16 +30,36 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @cp $(KERNEL) ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" +ifeq ($(ADK_HARDWARE_QEMU_X86),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 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu-${CPU_ARCH}.img' +endif endif ifeq ($(FS),usb) -imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) +imageinstall: tools-compile $(BIN_DIR)/$(ROOTFSTARBALL) @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" @echo "To install everything to USB use scripts/install.sh" endif +ifeq ($(FS),initramfs) +imageinstall: $(BIN_DIR)/$(INITRAMFS) + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel + @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' + @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' +ifeq ($(ADK_HARDWARE_QEMU_X86),y) + @echo "Start qemu with following command line:" + @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -initrd ${BIN_DIR}/${INITRAMFS}' +endif +endif ifeq ($(FS),initramfs-piggyback) imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs @cp $(KERNEL) ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel - @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' + @echo 'The kernel+initramfs file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' +ifeq ($(ADK_HARDWARE_QEMU_X86),y) + @echo "Start qemu with following command line:" + @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel' +endif endif ifeq ($(FS),encrypted) imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) createinitcrypt |