aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2010-04-29 00:47:05 +0000
committerNicolas Thill <nico@openwrt.org>2010-04-29 00:47:05 +0000
commitbd1fc43e6d90be18ee1dea615e3cf4415e9fde83 (patch)
treed470c404d8ab132824d69201949a1b032c45d95e
parent23aa8be2612b8c0491c1a28a73e634baccb8fd87 (diff)
downloadupstream-bd1fc43e6d90be18ee1dea615e3cf4415e9fde83.tar.gz
upstream-bd1fc43e6d90be18ee1dea615e3cf4415e9fde83.tar.bz2
upstream-bd1fc43e6d90be18ee1dea615e3cf4415e9fde83.zip
target/x86: rearrange image Makefile, indent, reorder, simplify, change some ifeq/ifneq tests
SVN-Revision: 21245
-rw-r--r--target/linux/x86/image/Makefile144
1 files changed, 77 insertions, 67 deletions
diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index a4399a2b4b..b159856203 100644
--- a/target/linux/x86/image/Makefile
+++ b/target/linux/x86/image/Makefile
@@ -9,42 +9,37 @@ include $(INCLUDE_DIR)/image.mk
export PATH=$(TARGET_PATH):/sbin
-ifneq ($(CONFIG_TARGET_x86_olpc),y)
-BOOTOPTS=$(call qstrip,$(CONFIG_X86_GRUB_BOOTOPTS))
-ROOTPART=$(call qstrip,$(CONFIG_X86_GRUB_ROOTPART))
-endif
-
-ifeq ($(CONFIG_TARGET_x86_olpc),y)
-ROOTPART=$(call qstrip,$(CONFIG_OLPC_BOOTSCRIPT_ROOTPART))
-endif
-
GRUB_TERMINALS =
GRUB_SERIAL_CONFIG =
GRUB_TERMINAL_CONFIG =
GRUB_CONSOLE_CMDLINE =
-ifeq ($(CONFIG_X86_GRUB_CONSOLE),y)
-GRUB_CONSOLE_CMDLINE += console=tty0
-GRUB_TERMINALS += console
+ifneq ($(CONFIG_X86_GRUB_CONSOLE),)
+ GRUB_CONSOLE_CMDLINE += console=tty0
+ GRUB_TERMINALS += console
endif
ifneq ($(CONFIG_X86_GRUB_SERIAL),)
-GRUB_CONSOLE_CMDLINE += console=$(call qstrip,$(CONFIG_X86_GRUB_SERIAL)),$(CONFIG_X86_GRUB_BAUDRATE)n8
-GRUB_SERIAL_CONFIG = serial --unit=0 --speed=$(CONFIG_X86_GRUB_BAUDRATE) --word=8 --parity=no --stop=1
-GRUB_TERMINALS += serial
+ GRUB_CONSOLE_CMDLINE += console=$(call qstrip,$(CONFIG_X86_GRUB_SERIAL)),$(CONFIG_X86_GRUB_BAUDRATE)n8
+ GRUB_SERIAL_CONFIG := serial --unit=0 --speed=$(CONFIG_X86_GRUB_BAUDRATE) --word=8 --parity=no --stop=1
+ GRUB_TERMINALS += serial
endif
ifneq ($(GRUB_TERMINALS),)
-GRUB_TERMINAL_CONFIG = terminal --timeout=2 $(GRUB_TERMINALS)
+ GRUB_TERMINAL_CONFIG := terminal --timeout=2 $(GRUB_TERMINALS)
endif
-ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
-ifneq ($(HOST_OS),Darwin)
- define Image/cmdline/squashfs
- block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=squashfs rootwait
- endef
+ifneq ($(CONFIG_X86_GRUB_IMAGES),)
+ ifneq ($(HOST_OS),Darwin)
+
+ BOOTOPTS:=$(call qstrip,$(CONFIG_X86_GRUB_BOOTOPTS))
+ ROOTPART:=$(call qstrip,$(CONFIG_X86_GRUB_ROOTPART))
+ define Image/cmdline/ext2
+ root=$(ROOTPART) rootfstype=ext2 rootwait
+ endef
+
define Image/cmdline/jffs2-64k
block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=jffs2 rootwait
endef
@@ -53,10 +48,10 @@ ifneq ($(HOST_OS),Darwin)
block2mtd.block2mtd=$(ROOTPART),131072,rootfs root=/dev/mtdblock0 rootfstype=jffs2 rootwait
endef
- define Image/cmdline/ext2
- root=$(ROOTPART) rootfstype=ext2 rootwait
+ define Image/cmdline/squashfs
+ block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=squashfs rootwait
endef
-
+
define Image/Build/grub
# left here because the image builder doesnt need these
$(INSTALL_DIR) $(KDIR)/root.grub/boot/grub
@@ -69,7 +64,10 @@ ifneq ($(HOST_OS),Darwin)
-e 's#@TERMINAL_CONFIG@#$(strip $(GRUB_TERMINAL_CONFIG))#g' \
-e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \
./menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst
- PADDING="$(CONFIG_X86_GRUB_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image_x86.sh $(BIN_DIR)/$(IMG_PREFIX)-$(1).image $(CONFIG_X86_GRUB_KERNELPART) $(KDIR)/root.grub $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
+ PADDING="$(CONFIG_X86_GRUB_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image_x86.sh \
+ $(BIN_DIR)/$(IMG_PREFIX)-$(1).image \
+ $(CONFIG_X86_GRUB_KERNELPART) $(KDIR)/root.grub \
+ $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
$(call Image/Build/grub/$(1))
endef
@@ -81,39 +79,27 @@ ifneq ($(HOST_OS),Darwin)
$(STAGING_DIR_HOST)/usr/lib/grub/i386-*/e2fs_stage1_5 \
$(KDIR)/
endef
-else
- define Image/Build/grub
- PADDING="$(CONFIG_X86_GRUB_IMAGES_PAD)" PATH="$(TARGET_PATH)" NOGRUB=1 ./gen_image_x86.sh $(BIN_DIR)/$(IMG_PREFIX)-$(1).image $(CONFIG_X86_GRUB_KERNELPART) "" $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
- endef
-endif
-endif
-ifeq ($(CONFIG_X86_VDI_IMAGES),y)
- define Image/Build/vdi
- # left here because the image builder doesnt need these
- ifeq ($(1),ext2)
- rm $(BIN_DIR)/$(IMG_PREFIX)-ext2.vdi || true
- VBoxManage convertfromraw -format VDI $(BIN_DIR)/$(IMG_PREFIX)-ext2.image $(BIN_DIR)/$(IMG_PREFIX)-ext2.vdi
- endif
- endef
-endif
+ else
-ifeq ($(CONFIG_X86_VMDK_IMAGES),y)
- define Image/Build/vmdk
- # left here because the image builder doesnt need these
- ifeq ($(1),ext2)
- rm $(BIN_DIR)/$(IMG_PREFIX)-ext2.vmdk || true
- qemu-img convert -f raw $(BIN_DIR)/$(IMG_PREFIX)-ext2.image \
- -O vmdk $(BIN_DIR)/$(IMG_PREFIX)-ext2.vmdk
- endif
+ define Image/Build/grub
+ PADDING="$(CONFIG_X86_GRUB_IMAGES_PAD)" PATH="$(TARGET_PATH)" NOGRUB=1 ./gen_image_x86.sh
+ $(BIN_DIR)/$(IMG_PREFIX)-$(1).image \
+ $(CONFIG_X86_GRUB_KERNELPART) "" \
+ $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
endef
+
+ endif
endif
ROOTDELAY=10
-ifeq ($(CONFIG_OLPC_BOOTSCRIPT_IMAGES),y)
- define Image/cmdline/squashfs
- block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=squashfs rootdelay=$(ROOTDELAY)
+ifneq ($(CONFIG_OLPC_BOOTSCRIPT_IMAGES),)
+
+ ROOTPART:=$(call qstrip,$(CONFIG_OLPC_BOOTSCRIPT_ROOTPART))
+
+ define Image/cmdline/ext2
+ root=$(ROOTPART) rootfstype=ext2 rootwait
endef
define Image/cmdline/jffs2-64k
@@ -124,8 +110,8 @@ ifeq ($(CONFIG_OLPC_BOOTSCRIPT_IMAGES),y)
block2mtd.block2mtd=$(ROOTPART),131072,rootfs root=/dev/mtdblock0 rootfstype=jffs2 rootdelay=$(ROOTDELAY)
endef
- define Image/cmdline/ext2
- root=$(ROOTPART) rootfstype=ext2 rootwait
+ define Image/cmdline/squashfs
+ block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=squashfs rootdelay=$(ROOTDELAY)
endef
define Image/Build/bootscript
@@ -134,21 +120,16 @@ ifeq ($(CONFIG_OLPC_BOOTSCRIPT_IMAGES),y)
$(CP) $(KDIR)/bzImage $(KDIR)/root.bootscript/boot/vmlinuz
sed -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(BOOTOPTS)#g' \
./olpc.fth > $(KDIR)/root.bootscript/boot/olpc.fth
- PADDING="$(CONFIG_OLPC_BOOTSCRIPT_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image_olpc.sh $(BIN_DIR)/$(IMG_PREFIX)-$(1).image $(CONFIG_OLPC_BOOTSCRIPT_KERNELPART) $(KDIR)/root.bootscript $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
+ PADDING="$(CONFIG_OLPC_BOOTSCRIPT_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image_olpc.sh \
+ $(BIN_DIR)/$(IMG_PREFIX)-$(1).image \
+ $(CONFIG_OLPC_BOOTSCRIPT_KERNELPART) $(KDIR)/root.bootscript \
+ $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
endef
-endif
-define Image/Prepare
- $(CP) $(LINUX_DIR)/arch/x86/boot/bzImage $(KDIR)/bzImage
-ifeq ($(CONFIG_TARGET_x86_olpc),y)
- $(call Image/Prepare/bootscript)
-else
- $(call Image/Prepare/grub)
endif
-endef
define Image/Build/squashfs
- $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
+ $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
endef
define Image/Build/iso
@@ -167,10 +148,39 @@ define Image/Build/iso
-o $(KDIR)/root.iso $(KDIR)/root.grub
endef
+ifneq ($(CONFIG_X86_VDI_IMAGES),)
+ define Image/Build/vdi
+ # left here because the image builder doesnt need these
+ ifeq ($(1),ext2)
+ rm $(BIN_DIR)/$(IMG_PREFIX)-ext2.vdi || true
+ VBoxManage convertfromraw -format VDI \
+ $(BIN_DIR)/$(IMG_PREFIX)-ext2.image \
+ $(BIN_DIR)/$(IMG_PREFIX)-ext2.vdi
+ endif
+ endef
+endif
+
+ifneq ($(CONFIG_X86_VMDK_IMAGES),)
+ define Image/Build/vmdk
+ # left here because the image builder doesnt need these
+ ifeq ($(1),ext2)
+ rm $(BIN_DIR)/$(IMG_PREFIX)-ext2.vmdk || true
+ qemu-img convert -f raw $(BIN_DIR)/$(IMG_PREFIX)-ext2.image \
+ -O vmdk $(BIN_DIR)/$(IMG_PREFIX)-ext2.vmdk
+ endif
+ endef
+endif
+
define Image/BuildKernel
$(CP) $(KDIR)/bzImage $(BIN_DIR)/$(IMG_PREFIX)-vmlinuz
endef
+define Image/Prepare
+ $(CP) $(LINUX_DIR)/arch/x86/boot/bzImage $(KDIR)/bzImage
+ $(call Image/Prepare/bootscript)
+ $(call Image/Prepare/grub)
+endef
+
define Image/Build
$(call Image/Build/$(1))
$(call Image/Build/bootscript,$(1))
@@ -188,14 +198,14 @@ endef
$(eval $(call BuildImage))
-ifeq ($(CONFIG_X86_VDI_IMAGES),y)
+ifneq ($(CONFIG_X86_VDI_IMAGES),)
$(eval $(call RequireCommand,VBoxManage, \
You need VBoxManage to generate VirtualBox images. \
))
endif
-ifeq ($(CONFIG_X86_VMDK_IMAGES),y)
- $(eval $(call RequireCommand,qemu-img, \
+ifneq ($(CONFIG_X86_VMDK_IMAGES),)
+ $(eval $(call RequireCommand,qemu-img, \
You need qemu-img to generate VMware images. \
- ))
+ ))
endif