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-a3cf2f4a3e73master
parent
439ca1b72b
commit
12abbd4d08
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue