From: Felix Fietkau Date: Fri, 28 May 2010 19:48:21 +0000 (+0000) Subject: x86: build fully functional images on Mac OS X, now that grub is fixed X-Git-Tag: v19.07.0-rc1~30431 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=816a9b30f683b8376423ff029d40e0e4a2701026;p=openwrt%2Fstaging%2Fhauke.git x86: build fully functional images on Mac OS X, now that grub is fixed SVN-Revision: 21609 --- diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index 2c4cc350e5..338c8e0a74 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -32,7 +32,6 @@ endif ROOTPART:=$(call qstrip,$(CONFIG_TARGET_ROOTFS_PARTNAME)) ifneq ($(CONFIG_X86_GRUB_IMAGES),) - ifneq ($(HOST_OS),Darwin) BOOTOPTS:=$(call qstrip,$(CONFIG_X86_GRUB_BOOTOPTS)) @@ -83,16 +82,6 @@ ifneq ($(CONFIG_X86_GRUB_IMAGES),) $(KDIR)/ 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 ROOTDELAY=10