KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

change x86 image generation handling to treat only olpc specially

Browse source 
SVN-Revision: 18441
This commit is contained in:
Imre Kaloz 2009-11-17 19:49:25 +00:00
parent 0b27fefa62
commit 93fe520994
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
target/linux/x86/image/Config.in
View file

@ -1,6 +1,6 @@
config X86_GRUB_IMAGES
bool "Build GRUB images (Linux x86 or x86_64 host only)"
depends TARGET_x86_generic
depends !TARGET_x86_olpc
depends TARGET_ROOTFS_EXT2FS || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS || TARGET_ROOTFS_ISO
select PACKAGE_grub
default y

7
target/linux/x86/image/Makefile
View file

@ -9,7 +9,7 @@ include $(INCLUDE_DIR)/image.mk
export PATH=$(TARGET_PATH):/sbin
ifeq ($(CONFIG_TARGET_x86_generic),y)
ifneq ($(CONFIG_TARGET_x86_olpc),y)
BOOTOPTS=$(strip $(subst ",, $(CONFIG_X86_GRUB_BOOTOPTS)))
ROOTPART=$(strip $(subst ",, $(CONFIG_X86_GRUB_ROOTPART)))
#"))")) # fix vim's broken syntax highlighting
@ -120,11 +120,10 @@ endif
define Image/Prepare
$(CP) $(LINUX_DIR)/arch/x86/boot/bzImage $(KDIR)/bzImage
ifeq ($(CONFIG_TARGET_x86_generic),y)
$(call Image/Prepare/grub)
endif
ifeq ($(CONFIG_TARGET_x86_olpc),y)
$(call Image/Prepare/bootscript)
else
$(call Image/Prepare/grub)
endif
endef