hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use VBoxManage instead of obsolete vditool to generate VirtualBox images. 

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13821 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Steven Barth 2009-01-02 14:35:18 +00:00
parent e964a25b60
commit c27370463e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,7 @@ config X86_GRUB_BOOTOPTS
config X86_VDI_IMAGES
bool "Build VirtualBox image files (VDI). Requires vditool"
bool "Build VirtualBox image files (VDI). Requires VBoxManage"
depends TARGET_x86
depends TARGET_ROOTFS_EXT2FS
depends X86_GRUB_IMAGES

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

@ -66,7 +66,7 @@ ifeq ($(CONFIG_X86_VDI_IMAGES),y)
# left here because the image builder doesnt need these
ifeq ($(1),ext2)
rm $(BIN_DIR)/openwrt-$(BOARD)-ext2.vdi || true
vditool DD $(BIN_DIR)/openwrt-$(BOARD)-ext2.vdi $(BIN_DIR)/openwrt-$(BOARD)-ext2.image
VBoxManage convertfromraw -format VDI $(BIN_DIR)/openwrt-$(BOARD)-ext2.image $(BIN_DIR)/openwrt-$(BOARD)-ext2.vdi
endif
endef
endif
@ -121,8 +121,8 @@ endef
$(eval $(call BuildImage))
ifeq ($(CONFIG_X86_VDI_IMAGES),y)
$(eval $(call RequireCommand,vditool, \
You need vditool to generate VirtualBox images. \
$(eval $(call RequireCommand,VBoxManage, \
You need VBoxManage to generate VirtualBox images. \
))
endif