diff options
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 71 | ||||
| -rw-r--r-- | fix_kvm_emulator.patch | 13 |
3 files changed, 52 insertions, 34 deletions
@@ -36,11 +36,13 @@ pkgbase = opennebula source = opennebula-sunstone.service source = chown_fix.patch source = set_locations.patch + source = fix_kvm_emulator.patch sha512sums = ed572bf1a6e0a4eecb85c1f2beb1f686e6729f74a354f41dbb5113fd089af06013f63d022ee8c068234e5be64df818771a0ba0c452ffbf4fd096dd16cf878926 sha512sums = 6e3ad31cd00c7e781868ceba6399bc1ec0d35331d1e038a3597bf120a53481385bddd5e179cd9aa34c623d8041fd7bf9d2fbef809be1ceef68f979d1356ce226 sha512sums = 646ea55c862631fe5cbed1038633d29d67435338013e80b7e9c0b68f5ae0318e7f75b7d7baee59115cb9abc2ecdbdb24e8fe3a8a6481f25de6796fdb9bddff3e sha512sums = 8d6a311072da61ca49458aaf787daf4ef5c5969a9aa282f2276d679dc38e14e5fd1c23bc51b12a29d2d40b65aa45bd2c38d6741726b09d75a38565b7d4ad4677 sha512sums = 1f20e688a0f6d36a6bc875392473e75c7de77b159b9cbdf262ac0f093b4d65555231ab15897156e2558d0df6ae631f8d79a3265073ea8c0546586937544e47c9 + sha512sums = 997218a2dbc807cf2114fc5bb68a3da8d17cdf38aa3d7b51afaab52cf2638cc46293d42799a6d805b799c7748e326ab2780f81ca73121ebdf320ec046c41407d pkgname = opennebula @@ -38,57 +38,60 @@ source=("http://downloads.opennebula.org/packages/${pkgname}-${pkgver}/${pkgname 'opennebula.service' 'opennebula-sunstone.service' 'chown_fix.patch' - 'set_locations.patch') + 'set_locations.patch' + 'fix_kvm_emulator.patch') sha512sums=('ed572bf1a6e0a4eecb85c1f2beb1f686e6729f74a354f41dbb5113fd089af06013f63d022ee8c068234e5be64df818771a0ba0c452ffbf4fd096dd16cf878926' '6e3ad31cd00c7e781868ceba6399bc1ec0d35331d1e038a3597bf120a53481385bddd5e179cd9aa34c623d8041fd7bf9d2fbef809be1ceef68f979d1356ce226' '646ea55c862631fe5cbed1038633d29d67435338013e80b7e9c0b68f5ae0318e7f75b7d7baee59115cb9abc2ecdbdb24e8fe3a8a6481f25de6796fdb9bddff3e' '8d6a311072da61ca49458aaf787daf4ef5c5969a9aa282f2276d679dc38e14e5fd1c23bc51b12a29d2d40b65aa45bd2c38d6741726b09d75a38565b7d4ad4677' - '1f20e688a0f6d36a6bc875392473e75c7de77b159b9cbdf262ac0f093b4d65555231ab15897156e2558d0df6ae631f8d79a3265073ea8c0546586937544e47c9') + '1f20e688a0f6d36a6bc875392473e75c7de77b159b9cbdf262ac0f093b4d65555231ab15897156e2558d0df6ae631f8d79a3265073ea8c0546586937544e47c9' + '997218a2dbc807cf2114fc5bb68a3da8d17cdf38aa3d7b51afaab52cf2638cc46293d42799a6d805b799c7748e326ab2780f81ca73121ebdf320ec046c41407d') prepare() { - cd "${pkgname}-${pkgver}" + cd "${pkgname}-${pkgver}" - # Patch upstream install script to not attempt to chown the install - # directories because `makepkg` will otherwise fail on a fresh installation. - # We do our own chown in post_install(). + # Patch upstream install script to not attempt to chown the install + # directories because `makepkg` will otherwise fail on a fresh installation. + # We do our own chown in post_install(). patch < "${srcdir}/chown_fix.patch" - patch < "${srcdir}/set_locations.patch" + patch < "${srcdir}/set_locations.patch" + patch -p1 < "${srcdir}/fix_kvm_emulator.patch" } build() { - cd "${pkgname}-${pkgver}" + cd "${pkgname}-${pkgver}" - ########################################################################### - ## ## - ## It is highly recommended that you read the documentation and tweak ## - ## the PKGBUILD accordingly: ## - ## http://docs.opennebula.org/stable/integration/references/compile.html ## - ## ## - ## This package assumes a self-contained install. If you do NOT want a ## - ## self-contained install, then remove `-d /srv/cloud/one` from the ## - ## package() function and MAKE SURE you properly change the ## - ## appropriate sections of opennebula-unstable.install ## - ## ## - ########################################################################### + ########################################################################### + ## ## + ## It is highly recommended that you read the documentation and tweak ## + ## the PKGBUILD accordingly: ## + ## http://docs.opennebula.org/stable/integration/references/compile.html ## + ## ## + ## This package assumes a self-contained install. If you do NOT want a ## + ## self-contained install, then remove `-d /srv/cloud/one` from the ## + ## package() function and MAKE SURE you properly change the ## + ## appropriate sections of opennebula-unstable.install ## + ## ## + ########################################################################### - # This builds the vanilla OpenNebula package. Tweak this line as desired. - scons new_xmlrpc=yes + # This builds the vanilla OpenNebula package. Tweak this line as desired. + scons new_xmlrpc=yes } package() { - cd "${pkgname}-${pkgver}" + cd "${pkgname}-${pkgver}" install -D -m644 "${srcdir}/opennebula.service" "${pkgdir}/usr/lib/systemd/system/opennebula.service" - install -D -m644 "${srcdir}/opennebula-sunstone.service" "${pkgdir}/usr/lib/systemd/system/opennebula-sunstone.service" + install -D -m644 "${srcdir}/opennebula-sunstone.service" "${pkgdir}/usr/lib/systemd/system/opennebula-sunstone.service" - # This checks to see whether OpenNebula is currently installed. To avoid - # a potentially scary message, errors are sent to /dev/null - if [[ ("$(pacman -Qq ${pkgname} 2>/dev/null)" == "${pkgname}") || ("$(pacman -Qq ${_unstable_pkg} 2>/dev/null)" == "${_unstable_pkg}") ]]; then - # Use -k when running ./install.sh to keep previous configuration files - # Note: It is highly recommended to not keep the oned.conf file. - DESTDIR="${pkgdir}" ./install.sh -k -u oneadmin -g cloud - else - # Do not use -k when running ./install.sh for new installations - DESTDIR="${pkgdir}" ./install.sh -u oneadmin -g cloud - fi + # This checks to see whether OpenNebula is currently installed. To avoid + # a potentially scary message, errors are sent to /dev/null + if [[ ("$(pacman -Qq ${pkgname} 2>/dev/null)" == "${pkgname}") || ("$(pacman -Qq ${_unstable_pkg} 2>/dev/null)" == "${_unstable_pkg}") ]]; then + # Use -k when running ./install.sh to keep previous configuration files + # Note: It is highly recommended to not keep the oned.conf file. + DESTDIR="${pkgdir}" ./install.sh -k -u oneadmin -g cloud + else + # Do not use -k when running ./install.sh for new installations + DESTDIR="${pkgdir}" ./install.sh -u oneadmin -g cloud + fi } diff --git a/fix_kvm_emulator.patch b/fix_kvm_emulator.patch new file mode 100644 index 000000000000..145f34936deb --- /dev/null +++ b/fix_kvm_emulator.patch @@ -0,0 +1,13 @@ +Index: opennebula-4.14.2/src/vmm_mad/exec/vmm_exec_kvm.conf +=================================================================== +--- opennebula-4.14.2.orig/src/vmm_mad/exec/vmm_exec_kvm.conf ++++ opennebula-4.14.2/src/vmm_mad/exec/vmm_exec_kvm.conf +@@ -27,7 +27,7 @@ + # - hyperv_options: options used for FEATURES = [ HYPERV = yes ] + # NOTE: raw attribute value is appended to that on the VM template + +-#EMULATOR = /usr/libexec/qemu-kvm ++EMULATOR = /usr/bin/qemu-system-x86_64 + + #VCPU = 1 + |