qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00
Code Activity

Merge remote branch 'remotes/backfire/master' into xburst

Browse Source
This commit is contained in:
Mirko Vogt
2010-08-09 12:39:25 +00:00
parent 33d2680ca4 4db13eb19e
commit 4fbb2ba781
131 changed files with 5152 additions and 12102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/x86/Makefile
View File

@@ -12,7 +12,7 @@ BOARDNAME:=x86
FEATURES:=squashfs jffs2 ext2 vdi vmdk pcmcia targz
SUBTARGETS=generic olpc xen_domu ep80579
LINUX_VERSION:=2.6.32.10
LINUX_VERSION:=2.6.32.16
include $(INCLUDE_DIR)/target.mk

4
target/linux/x86/image/Config.in
View File

@@ -36,8 +36,6 @@ config X86_VDI_IMAGES
depends TARGET_x86_generic
depends TARGET_ROOTFS_EXT2FS
select PACKAGE_kmod-pcnet32
help
Requires VBoxManage installed on the build system.
config X86_VMDK_IMAGES
bool "Build VMware image files (VMDK)"
@@ -45,8 +43,6 @@ config X86_VMDK_IMAGES
depends TARGET_x86_generic
depends TARGET_ROOTFS_EXT2FS
select PACKAGE_kmod-e1000
help
Requires qemu-img installed on the build system.
config OLPC_BOOTSCRIPT_IMAGES

14
target/linux/x86/image/Makefile
View File

@@ -154,7 +154,7 @@ ifneq ($(CONFIG_X86_VDI_IMAGES),)
# left here because the image builder doesnt need these
ifeq ($(1),ext2)
rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi || true
VBoxManage convertfromraw -format VDI \
qemu-img convert -f raw -O vdi \
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi
# XXX: VBoxManage insists on setting perms to 0600
@@ -202,15 +202,3 @@ define Image/Build
endef
$(eval $(call BuildImage))
ifneq ($(CONFIG_X86_VDI_IMAGES),)
$(eval $(call RequireCommand,VBoxManage, \
You need VBoxManage to generate VirtualBox images. \
))
endif
ifneq ($(CONFIG_X86_VMDK_IMAGES),)
$(eval $(call RequireCommand,qemu-img, \
You need qemu-img to generate VMware images. \
))
endif