x86: build fully functional images on Mac OS X, now that grub is fixed

SVN-Revision: 21609
This commit is contained in:
Felix Fietkau 2010-05-28 19:48:21 +00:00
parent 93dd5cdde9
commit 816a9b30f6

View File

@ -32,7 +32,6 @@ endif
ROOTPART:=$(call qstrip,$(CONFIG_TARGET_ROOTFS_PARTNAME)) ROOTPART:=$(call qstrip,$(CONFIG_TARGET_ROOTFS_PARTNAME))
ifneq ($(CONFIG_X86_GRUB_IMAGES),) ifneq ($(CONFIG_X86_GRUB_IMAGES),)
ifneq ($(HOST_OS),Darwin)
BOOTOPTS:=$(call qstrip,$(CONFIG_X86_GRUB_BOOTOPTS)) BOOTOPTS:=$(call qstrip,$(CONFIG_X86_GRUB_BOOTOPTS))
@ -83,16 +82,6 @@ ifneq ($(CONFIG_X86_GRUB_IMAGES),)
$(KDIR)/ $(KDIR)/
endef endef
else
define Image/Build/grub
PADDING="$(CONFIG_TARGET_IMAGES_PAD)" PATH="$(TARGET_PATH)" NOGRUB=1 ./gen_image_x86.sh \
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
$(CONFIG_TARGET_KERNEL_PARTSIZE) "" \
$(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1)
endef
endif
endif endif
ROOTDELAY=10 ROOTDELAY=10