aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-05-28 19:48:21 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-05-28 19:48:21 +0000
commit12abbd4d08dc91ba45ba890aba3f2727ad41baad (patch)
treedb3ccdd77bdb74c122e1e84a48213777386da0ff
parent439ca1b72b94b7f38e88b2c0450818d0e5a1f844 (diff)
downloadupstream-12abbd4d08dc91ba45ba890aba3f2727ad41baad.tar.gz
upstream-12abbd4d08dc91ba45ba890aba3f2727ad41baad.tar.bz2
upstream-12abbd4d08dc91ba45ba890aba3f2727ad41baad.zip
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 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