summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-05-28 19:48:21 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-05-28 19:48:21 +0000
commit0ef361248d7c90fae5e572cfbb64933ce7f63245 (patch)
treedb3ccdd77bdb74c122e1e84a48213777386da0ff
parentfff3269970f2013f339b0fe926bf6c0cbc305f0f (diff)
x86: build fully functional images on Mac OS X, now that grub is fixed
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21609 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/x86/image/Makefile11
1 files changed, 0 insertions, 11 deletions
diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index 2c4cc350e..338c8e0a7 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