diff options
| author | Jonathan Bauer | 2017-08-18 14:04:33 +0200 |
|---|---|---|
| committer | root | 2017-08-18 14:04:33 +0200 |
| commit | 1364edb065806c0f4b6610e22bcc4ca23c8a62ad (patch) | |
| tree | 2e4c03ac7821f08e5387a33aac577b5426220eeb | |
| parent | [qemukvm] +x on qemukvm setup script and fix service deps (diff) | |
| download | mltk-1364edb065806c0f4b6610e22bcc4ca23c8a62ad.tar.gz mltk-1364edb065806c0f4b6610e22bcc4ca23c8a62ad.tar.xz mltk-1364edb065806c0f4b6610e22bcc4ca23c8a62ad.zip | |
[qemukvm] reworked dep on irqbypass
* now added as part of rootfs-stage32
| -rw-r--r-- | core/modules/qemukvm/module.build | 6 | ||||
| -rw-r--r-- | core/modules/qemukvm/module.conf | 2 | ||||
| -rw-r--r-- | core/rootfs/rootfs-stage32/module.conf | 2 | ||||
| l--------- | core/targets/qemukvm/kernel | 1 |
4 files changed, 2 insertions, 9 deletions
diff --git a/core/modules/qemukvm/module.build b/core/modules/qemukvm/module.build index 2add4733..f2a0df9e 100644 --- a/core/modules/qemukvm/module.build +++ b/core/modules/qemukvm/module.build @@ -10,12 +10,6 @@ build() { tarcopy "$(cat "${COPYLIST}" | sort -u)" "${MODULE_BUILD_DIR}" - - # add irqbypass kernel module needed by kvm - # TODO this seems to be dependent on the kernel version, so make it check that.... - cd "${KERNEL_BASE_DIR}" - tarcopy "lib/modules/${TARGET_KERNEL_LONG}/kernel/virt" "${MODULE_BUILD_DIR}" - cd - &>/dev/null } post_copy() { diff --git a/core/modules/qemukvm/module.conf b/core/modules/qemukvm/module.conf index 594c7918..0cf394cf 100644 --- a/core/modules/qemukvm/module.conf +++ b/core/modules/qemukvm/module.conf @@ -1,5 +1,5 @@ #!/bin/bash -REQUIRED_MODULES="kernel" +REQUIRED_MODULES="" REQUIRED_DIRECTORIES=" / " diff --git a/core/rootfs/rootfs-stage32/module.conf b/core/rootfs/rootfs-stage32/module.conf index 9324a917..84b98d1f 100644 --- a/core/rootfs/rootfs-stage32/module.conf +++ b/core/rootfs/rootfs-stage32/module.conf @@ -149,7 +149,7 @@ REQUIRED_KERNEL_MODULES=" kernel/drivers/net/macvtap.ko kernel/drivers/net/veth.ko kernel/drivers/net/vxlan.ko - kernel/net/openvswitch/openvswitch.ko + kernel/virt " REQUIRED_FIRMWARE=" 3com diff --git a/core/targets/qemukvm/kernel b/core/targets/qemukvm/kernel deleted file mode 120000 index 1369e8ff..00000000 --- a/core/targets/qemukvm/kernel +++ /dev/null @@ -1 +0,0 @@ -../../modules/kernel-vanilla
\ No newline at end of file |