X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/b806b008065672cf155ff31b757d36b8f67cac17..938900f0dfd8e76f12f3ffffc79639693f141a3f:/target/linux/x86-2.6/image/Makefile?ds=sidebyside diff --git a/target/linux/x86-2.6/image/Makefile b/target/linux/x86-2.6/image/Makefile index 44c2ff7e3..7c98ea8e4 100644 --- a/target/linux/x86-2.6/image/Makefile +++ b/target/linux/x86-2.6/image/Makefile @@ -8,8 +8,9 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk export PATH=$(TARGET_PATH):/sbin +BOOTOPTS=$(strip $(subst ",, $(CONFIG_X86_GRUB_BOOTOPTS))) ROOTPART=$(strip $(subst ",, $(CONFIG_X86_GRUB_ROOTPART))) -#")) # fix vim's broken syntax highlighting +#"))")) # fix vim's broken syntax highlighting ifeq ($(CONFIG_X86_GRUB_IMAGES),y) @@ -21,42 +22,68 @@ ifeq ($(CONFIG_X86_GRUB_IMAGES),y) $(MAKE) -C grub clean endef + define Image/cmdline/squashfs + block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=squashfs init=/etc/preinit + endef + define Image/cmdline/jffs2-64k - block2mtd.block2mtd=$(ROOTPART),65536 root=/dev/mtdblock0 rootfstype=jffs2 + block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=jffs2 init=/etc/preinit endef define Image/cmdline/jffs2-128k - block2mtd.block2mtd=$(ROOTPART),131072 root=/dev/mtdblock0 rootfstype=jffs2 + block2mtd.block2mtd=$(ROOTPART),131072,rootfs root=/dev/mtdblock0 rootfstype=jffs2 init=/etc/preinit endef define Image/cmdline/ext2 - root=$(ROOTPART) rootfstype=ext2 + root=$(ROOTPART) rootfstype=ext2 init=/etc/preinit endef - + define Image/Build/grub - mkdir -p $(KDIR)/root.grub/boot/grub + # left here because the image builder doesnt need these + $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(CP) \ - $(STAGING_DIR)/usr/lib/grub/i386-pc/stage1 \ - $(STAGING_DIR)/usr/lib/grub/i386-pc/stage2 \ - $(STAGING_DIR)/usr/lib/grub/i386-pc/e2fs_stage1_5 \ + $(KDIR)/*stage* \ $(KDIR)/root.grub/boot/grub/ - $(CP) $(LINUX_DIR)/arch/i386/boot/bzImage $(KDIR)/root.grub/boot/vmlinuz + $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz sed \ - -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(CONFIG_X86_GRUB_BOOTOPTS)#g' \ + -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(BOOTOPTS)#g' \ -e 's#@BAUDRATE@#$(CONFIG_X86_GRUB_BAUDRATE)#g' \ ./grub/menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst - PATH="$(STAGING_DIR)/usr/sbin:$(STAGING_DIR)/bin:$(PATH)" ./gen_image.sh $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).image $(CONFIG_X86_GRUB_KERNELPART) $(KDIR)/root.grub $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1) + PADDING="$(CONFIG_X86_GRUB_IMAGES_PAD)" PATH="$(STAGING_DIR)/usr/sbin:$(STAGING_DIR)/bin:$(PATH)" ./gen_image.sh $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).image $(CONFIG_X86_GRUB_KERNELPART) $(KDIR)/root.grub $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1) + $(call Image/Build/grub/$(1)) + endef +endif + +ifeq ($(CONFIG_X86_GRUB_IMAGES),y) + define Image/Prepare/grub + # for the image builder + $(CP) \ + $(STAGING_DIR)/usr/lib/grub/i386-pc/stage1 \ + $(STAGING_DIR)/usr/lib/grub/i386-pc/stage2 \ + $(STAGING_DIR)/usr/lib/grub/i386-pc/e2fs_stage1_5 \ + $(KDIR)/ + $(CP) $(STAGING_DIR)/usr/sbin/grub $(STAGING_DIR)/bin endef endif define Image/Prepare - cp $(LINUX_DIR)/arch/i386/boot/bzImage $(KDIR)/bzImage + $(CP) $(LINUX_DIR)/arch/i386/boot/bzImage $(KDIR)/bzImage + $(call Image/Prepare/grub) +endef + +define Image/Build/squashfs + $(call prepare_generic_squashfs,$(KDIR)/root.squashfs) +endef + +define Image/BuildKernel + $(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz endef define Image/Build + $(call Image/Build/$(1)) $(call Image/Build/grub,$(1)) - cp $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).fs - cp $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz + $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).fs + $(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz endef $(eval $(call BuildImage))