mirror/openwrt
1
0
Fork 0
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2024-11-18 22:43:53 +01:00
Code Issues

Add virtualbox images to x86 (#3475)

Browse Source 
SVN-Revision: 11298
This commit is contained in:
Florian Fainelli 2008-05-30 16:50:37 +00:00
parent 9285574b20
commit 8c0c28eef2
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/x86/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
ARCH=i386 ARCH=i386
BOARD:=x86 BOARD:=x86
BOARDNAME:=x86 BOARDNAME:=x86
FEATURES:=squashfs jffs2 ext2 FEATURES:=squashfs jffs2 ext2 vdi
SUBTARGETS=generic SUBTARGETS=generic
LINUX_VERSION:=2.6.25.4 LINUX_VERSION:=2.6.25.4

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

@ -33,3 +33,13 @@ config X86_GRUB_BOOTOPTS
default "" default ""
help help
If you don't know, just leave it blank. If you don't know, just leave it blank.
config X86_VDI_IMAGES
bool "Build VirtuBox image files (VDI). Requires vditool"
depends TARGET_x86
depends TARGET_ROOTFS_EXT2FS
depends X86_GRUB_IMAGES
select PACKAGE_kmod-pcnet32

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

@ -57,6 +57,17 @@ ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
endef endef
endif endif
ifeq ($(CONFIG_X86_VDI_IMAGES),y)
define Image/Build/vdi
# 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
endif
endef
endif
define Image/Prepare define Image/Prepare
$(CP) $(LINUX_DIR)/arch/x86/boot/bzImage $(KDIR)/bzImage $(CP) $(LINUX_DIR)/arch/x86/boot/bzImage $(KDIR)/bzImage
$(call Image/Prepare/grub) $(call Image/Prepare/grub)
@ -86,6 +97,7 @@ endef
define Image/Build define Image/Build
$(call Image/Build/grub,$(1)) $(call Image/Build/grub,$(1))
$(call Image/Build/vdi,$(1))
$(call Image/Build/$(1)) $(call Image/Build/$(1))
$(CP) $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(1).fs $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(1).fs
$(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-vmlinuz $(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-vmlinuz
@ -93,3 +105,9 @@ endef
$(eval $(call BuildImage)) $(eval $(call BuildImage))
ifeq ($(CONFIG_X86_VDI_IMAGES),y)
$(eval $(call RequireCommand,vditool, \
You need vditool to generate VirtualBox images. \
))
endif