2014-03-14 13:12 GMT+01:00 Helmut Schaa <helmut.sc...@googlemail.com>:
> Building a x86 or x86_64 kernel image supporting both, xen and kvm > was not possible before. > > Allow building xen & kvm modules for standard x86 and x86_64 targets. > > Signed-off-by: Helmut Schaa <helmut.sc...@googlemail.com> > --- > package/kernel/linux/modules/virtual.mk | 19 ++++++++++--------- > 1 file changed, 10 insertions(+), 9 deletions(-) > > diff --git > a/package/kernel/linux/modules/virtual.mkb/package/kernel/linux/modules/ > virtual.mk > index e1bbe3f..e34aa03 100644 > --- a/package/kernel/linux/modules/virtual.mk > +++ b/package/kernel/linux/modules/virtual.mk > @@ -10,7 +10,7 @@ VIRTUAL_MENU:=Virtualization Support > define KernelPackage/virtio-balloon > SUBMENU:=$(VIRTUAL_MENU) > TITLE:=VirtIO balloon driver > - DEPENDS:=@TARGET_x86_kvm_guest > + DEPENDS:=@(TARGET_x86_kvm_guest||TARGET_x86||TARGET_x86_64) > Wouldn't it be enough to depend on TARGET_x86||TARGET_x86_64 ? > KCONFIG:=CONFIG_VIRTIO_BALLOON > FILES:=$(LINUX_DIR)/drivers/virtio/virtio_balloon.ko > AUTOLOAD:=$(call AutoLoad,06,virtio-balloon) > @@ -26,7 +26,7 @@ $(eval $(call KernelPackage,virtio-balloon)) > define KernelPackage/virtio-net > SUBMENU:=$(VIRTUAL_MENU) > TITLE:=VirtIO network driver > - DEPENDS:=@TARGET_x86_kvm_guest > + DEPENDS:=@(TARGET_x86_kvm_guest||TARGET_x86||TARGET_x86_64) > KCONFIG:=CONFIG_VIRTIO_NET > FILES:=$(LINUX_DIR)/drivers/net/virtio_net.ko > AUTOLOAD:=$(call AutoLoad,50,virtio_net) > @@ -42,7 +42,7 @@ $(eval $(call KernelPackage,virtio-net)) > define KernelPackage/virtio-random > SUBMENU:=$(VIRTUAL_MENU) > TITLE:=VirtIO Random Number Generator support > - DEPENDS:=@TARGET_x86_kvm_guest > + DEPENDS:=@(TARGET_x86_kvm_guest||TARGET_x86||TARGET_x86_64) > KCONFIG:=CONFIG_HW_RANDOM_VIRTIO > FILES:=$(LINUX_DIR)/drivers/char/hw_random/virtio-rng.ko > AUTOLOAD:=$(call AutoLoad,09,virtio-rng) > @@ -74,7 +74,7 @@ $(eval $(call KernelPackage,xen-privcmd)) > define KernelPackage/xen-fs > SUBMENU:=$(VIRTUAL_MENU) > TITLE:=Xen filesystem > - DEPENDS:=@TARGET_x86_xen_domu +kmod-xen-privcmd > + DEPENDS:=@(TARGET_x86_xen_domu||TARGET_x86||TARGET_x86_64) > +kmod-xen-privcmd > KCONFIG:= \ > CONFIG_XENFS \ > CONFIG_XEN_COMPAT_XENFS=y > @@ -92,7 +92,7 @@ $(eval $(call KernelPackage,xen-fs)) > define KernelPackage/xen-evtchn > SUBMENU:=$(VIRTUAL_MENU) > TITLE:=Xen event channels > - DEPENDS:=@TARGET_x86_xen_domu > + DEPENDS:=@(TARGET_x86_xen_domu||TARGET_x86||TARGET_x86_64) > KCONFIG:=CONFIG_XEN_DEV_EVTCHN > FILES:=$(LINUX_DIR)/drivers/xen/xen-evtchn.ko > AUTOLOAD:=$(call AutoLoad,06,xen-evtchn) > @@ -107,7 +107,8 @@ $(eval $(call KernelPackage,xen-evtchn)) > define KernelPackage/xen-fbdev > SUBMENU:=$(VIRTUAL_MENU) > TITLE:=Xen virtual frame buffer > - DEPENDS:=@TARGET_x86_xen_domu +kmod-fb > + DEPENDS:=@(TARGET_x86_xen_domu||TARGET_x86||TARGET_x86_64) +kmod-fb > + > KCONFIG:= \ > CONFIG_XEN_FBDEV_FRONTEND \ > CONFIG_FB_DEFERRED_IO=y \ > @@ -142,7 +143,7 @@ $(eval $(call KernelPackage,xen-fbdev)) > define KernelPackage/xen-kbddev > SUBMENU:=$(VIRTUAL_MENU) > TITLE:=Xen virtual keyboard and mouse > - DEPENDS:=@TARGET_x86_xen_domu > + DEPENDS:=@(TARGET_x86_xen_domu||TARGET_x86||TARGET_x86_64) > KCONFIG:=CONFIG_XEN_KBDDEV_FRONTEND > FILES:=$(LINUX_DIR)/drivers/input/xen-kbdfront.ko > AUTOLOAD:=$(call AutoLoad,08,xen-kbdfront) > @@ -158,7 +159,7 @@ $(eval $(call KernelPackage,xen-kbddev)) > define KernelPackage/xen-netdev > SUBMENU:=$(VIRTUAL_MENU) > TITLE:=Xen network device frontend > - DEPENDS:=@TARGET_x86_xen_domu > + DEPENDS:=@(TARGET_x86_xen_domu||TARGET_x86||TARGET_x86_64) > KCONFIG:=CONFIG_XEN_NETDEV_FRONTEND > FILES:=$(LINUX_DIR)/drivers/net/xen-netfront.ko > AUTOLOAD:=$(call AutoLoad,09,xen-netfront) > @@ -174,7 +175,7 @@ $(eval $(call KernelPackage,xen-netdev)) > define KernelPackage/xen-pcidev > SUBMENU:=$(VIRTUAL_MENU) > TITLE:=Xen PCI device frontend > - DEPENDS:=@TARGET_x86_xen_domu > + DEPENDS:=@(TARGET_x86_xen_domu||TARGET_x86||TARGET_x86_64) > KCONFIG:=CONFIG_XEN_PCIDEV_FRONTEND > FILES:=$(LINUX_DIR)/drivers/pci/xen-pcifront.ko > AUTOLOAD:=$(call AutoLoad,10,xen-pcifront) > -- > 1.8.1.4 > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel >
_______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
