commit: 8de94669e2543c19535a1c7f8ea6222713be05fa
Author: Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
AuthorDate: Sun Sep 20 19:45:44 2020 +0000
Commit: Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
CommitDate: Sun Sep 20 19:45:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/user/ssnb.git/commit/?id=8de94669
Correct some bugs in opennebula-5.12.0.1 ebuild (not working yet)
Signed-off-by: Samuel Bernardo <samuelbernardo.mail <AT> gmail.com>
app-emulation/opennebula/Manifest | 6 +++++-
.../files/patches/fix_kvm_emulator.5.12.0.1.patch | 11 +++++++++++
.../files/patches/install.sh.5.12.0.1.patch | 14 ++++++++++++++
.../files/patches/node-sass.5.12.0.1.patch | 20 ++++++++++++++++++++
.../files/patches/package.js.5.12.0.1.patch | 20 ++++++++++++++++++++
app-emulation/opennebula/opennebula-5.12.0.1.ebuild | 17 +++++++++--------
6 files changed, 79 insertions(+), 9 deletions(-)
diff --git a/app-emulation/opennebula/Manifest
b/app-emulation/opennebula/Manifest
index 580eb32..0ee60ac 100644
--- a/app-emulation/opennebula/Manifest
+++ b/app-emulation/opennebula/Manifest
@@ -40,8 +40,12 @@ AUX openrc/opennebula.confd 189 BLAKE2B
1c2899def707c77fc5abff2538fc3d106a20d8cc
AUX openrc/opennebula.initd 913 BLAKE2B
3ab4d3c1d1d8644e909422b89526f23e168c8b0f4d08495b0844df366438292bc6bccfc4030b51bbcd93d0b60df10b48faaa142ee2ded285b9772a285cc805a2
SHA512
74fb19970136d6d1b4a7b9d6279249c47ca7cbb6e4e9f90555a6ffd93963957fbc9ccb1b97c9355211057d715fb947aea968db40f7d89d61fff34c3b1331879e
AUX openrc/sunstone-server.confd 166 BLAKE2B
88409cce348709fa0dc1794dadefef623245ca838ce4e4cffea3f99deebf93f969b12761ec3761e12c5677a937e4cb3ccf112ad5b1811c1f986fff4d87b11ec4
SHA512
fe70685cd1aad949c8f46c85764ff62f67b55477879b5d125f2f5ed176d13171762e9ef953b6d5cd6e27d4fb9f503b9fe7ac4ef0fa1f9790f86f9698d3b82079
AUX openrc/sunstone-server.initd 788 BLAKE2B
e49f736213f0575d9a040058eff5accd36b00070ed767bb0de39fb0e8e9ae05ed5b34ddf2ae224530b04fd506e7b1f2a4c73ec69ac608b4a5d231bc07653ae6b
SHA512
fa2d6ee6e86e2497adc7792e67140810761c7403ffec3a9def57e7568180c99f17561381462648c8cbe43b12e4b36a146e48973de979b321002c1a566beb727e
+AUX patches/fix_kvm_emulator.5.12.0.1.patch 417 BLAKE2B
f3c800b37095ff95a2887bdb260d2de40c731cf09011b61086c66f6a43e379a0f6be437a35246787f0889d80aeb08054293c5a00caec0ed9148453a160cae129
SHA512
cf85539fd6ee57b6d6ec843c1d3b717052d9e22973f4bbac7d210a1b5a30408bc7274d56fb818cbde2cc35caf9ac1bf9982cc97d7e4cb926e04785f7fc9f651f
AUX patches/fix_kvm_emulator.patch 362 BLAKE2B
704aa77b28d337922c2b0dbfa1865127dc1c2b3e2e4c6995bcf4cfaaffa3a7c4f4c2becc7c982954fb24c1849044828ddc43881d045a344ff788b8126e546c24
SHA512
18b1964cb4e3fc2eaa93a7ef79e4b9b185584d33ad4f7fa33cd33a74516334136d9cf0ee25921c189250420b751c753cb0142227e8de39e14f8d110e97cd8e30
+AUX patches/install.sh.5.12.0.1.patch 560 BLAKE2B
aa9ed2bc271f029f9e8f2a53c79ff07176f34df43d807c21fd49d4d82f39c54a057aac338bd7ab0c91495bf678481cc7f1f3621c1c47801bdfcc10520fcda3b1
SHA512
6d178d5f904cccf4c7dd324e7dbda367c9d7aeaa04c5e901f9c4ebeb2c68d2d68b49618a21043c4c0640f659806a5b7c74a7e0dd4ea402636f10dd6a9a37297e
AUX patches/install.sh.patch 987 BLAKE2B
ed9682609aa7867087ecad73f117738f494eefa740053b73a25cb703a58b24630afd7dac5b463b0e938fa212ceb2555c90b10c05d2cf6adeb572ea2361bbfd3c
SHA512
ea2aac1d9df1ae976f96be119813b366e3b7eae2d14ba75352ed975fb337f1ecfb7a0fc22628b16fc6b0498e46ff8d1c1415ccc569559c3cbb45b414dd9be540
+AUX patches/node-sass.5.12.0.1.patch 669 BLAKE2B
02518ca6cf66d249e0ab24afeab6294423a64ba183fae292709c06a921bbcf49cddbef5b6f05686d2b3785b1fbdc73109814d0425e9d77c870bf5e4d17ffcd23
SHA512
83b297d1c5394ed7e1074f00cb7ed2447427fd4dc3410a7324ecab5ef06f37a656d1027d3c672e37d1c224566f4b0009420fda3c61a54a71bdcc0fe02ef7b0fe
+AUX patches/package.js.5.12.0.1.patch 681 BLAKE2B
6efa8e29b3ac1ca16092abaff01e6d0c7f7e10b41cbf333cbd13710ca7bbf12189b2313071bc6038af097179175a1630c7a48860e9e62a37691d5868ffd49573
SHA512
54de87611112ba4e3841867488b0de160c7fee321a3a0f95003750c2a31858c0bfb5a2546eef11f571fe2c303c62630877d17d2315245e25e306a7a7241c95e8
AUX sudoers/opennebula 1456 BLAKE2B
f25ac0f3c1b9f44644e3edddbe578d611204bdc683990a359ff51eb8d540870fda53eb5d0816bac22327369e59d7acf783adbc3a19c127e76985c7578733c8e1
SHA512
5eabdc11b16be8b34c12094ba108012916a6d2a4b06ecc421a5a0d6b7e720bcbdc698ace8b003726acc3b9d637a558540d0630bfc59335104ffed3006e13e0fa
AUX sudoers/opennebula-node 69 BLAKE2B
7292f9aeb4b2599190cda6148700fbedc4c1d00e7295df6f2033baa4189b5b1abd74f76a5ac7ca6dc7c587176e10b2b7f58f7d81019d7b73a74b64cf265210e6
SHA512
f3e7a39d1c5533e8ac4338326a48b49fd2ab73f0a20bbe23280f64d05f1312663c616ce2ad6e5fed2c09bdbef0243f5a8a9f4ec361aac6aa57d1bdf008508846
AUX sudoers/opennebula-node-lxd 41 BLAKE2B
b0533db80686c1075a89df5b38b7b199a7d3dd022ad675405d021c5dadd76ca784c3ae1962cc273ebea2686f060a2ac9e8f9e088846cbdbea6e325a16b3d96c8
SHA512
86043f606d9fcbfb0288ac286fe0f31db11aba3b39164ec92cdaf23e4ece3d0a9909f8d8b26533cd7801eb79b342dc5f55487a2bd06ac058d46d66c410b37ff1
@@ -66,5 +70,5 @@ DIST opennebula-5.12.0.1.tar.gz 5559467 BLAKE2B
397ffcbf185b38ea0ec811997751ed8a
EBUILD opennebula-5.10.1.ebuild 9405 BLAKE2B
fd6dfefc76da0aaadc993b7ed1593b8826fb642a92797220c9ce6226b846539900f6e7914730decfe57f79514654506e9a1aed76ebd28c1fc797d71ee5a6b2ba
SHA512
360d3323e46a1253f6489c696e020ea38e260923d6b0fcb50154b0cb412b4bd3db994365a072915f5a8411032cea12dd8b87fe2f730e418d6742dd7218722a66
EBUILD opennebula-5.10.4.ebuild 9735 BLAKE2B
dd7f5bf32aea6bd30f4ca75d7db123fb9ce03f1357d789fefa76a46b7a4f1a669df0d68d5239e85a40da591d7bbf993f759a02704ba468b6c04f6445401343f4
SHA512
3c54819ee10cb07fe7ea41dd0b65b8de9075ac96e34524c512cd58457071b00f7be85f3bd062a57aa4459703b29d98c2b577a97c6b03093699b99021b59cfdf5
EBUILD opennebula-5.10.5.ebuild 9891 BLAKE2B
253d6ef23eaf8980373ee19c2035aadf3b9363702954dd87be48c7ab87961683834fe857d22d2ae5d112269e940f0f053b070113576b5bde421e69d9484074fd
SHA512
04a4e30d1b59ce11d7d135e76bde6c3581318274da81eb27b2055a7fc48060f388888ce62e6c32a7f68dade5221982f80e4773ef36f54acf23638d1b89e90242
-EBUILD opennebula-5.12.0.1.ebuild 9892 BLAKE2B
17c44134a38dc97b14e4b5e2ba4b5e38def278c86c93edfa726e83307047f393f71d863fe2a1cfc172dae5aaa28b99aca07fde62431c9b58067c9653a2206d8d
SHA512
88b296ccd330968e5133e3c1975f217ca1cdeea0c8969e9e1989e454c9fe1750e4fbc9b5e4ec945e65a141791811f9d0f4a9952fdcb2077e6a099f0bd4483c5d
+EBUILD opennebula-5.12.0.1.ebuild 9933 BLAKE2B
6ce863cb39dfc90ef06faa3a8a933dceb3d535d98f22e0333ab4d241e71b09f4563a6fc668a38fbbfe03ad0179d2ee866d5de24791aa13576323a477731850b3
SHA512
6c0edfc676f204c0076cf62f63a96a347bcee3ca82fc371089c855410cb9c9a7dcf5a2d83226bc77e84aa18b987ede256bca9ba21673eee516a5825af5c35144
MISC metadata.xml 931 BLAKE2B
abb0ecf04eb6fc45f64c5d2d6636591c9d706fbf1902943a80f7e058443787824581219fb8457a83192e4e2b672521609449d4eef78ab677f8c093fe939034b6
SHA512
c3770f399572b16601e7eeaf4a1eb4b5eea950ad18239be8719124f60f3edd02da4c7b28b177329d70b0810ee7d8597e522dd62a1bd4c8ea1194acf0d92dfeb2
diff --git
a/app-emulation/opennebula/files/patches/fix_kvm_emulator.5.12.0.1.patch
b/app-emulation/opennebula/files/patches/fix_kvm_emulator.5.12.0.1.patch
new file mode 100644
index 0000000..7b7e4fc
--- /dev/null
+++ b/app-emulation/opennebula/files/patches/fix_kvm_emulator.5.12.0.1.patch
@@ -0,0 +1,11 @@
+diff -Naur a/src/vmm_mad/exec/vmm_exec_kvm.conf
b/src/vmm_mad/exec/vmm_exec_kvm.conf
+--- a/src/vmm_mad/exec/vmm_exec_kvm.conf 2020-07-14 18:02:27.000000000
+0100
++++ b/src/vmm_mad/exec/vmm_exec_kvm.conf 2020-09-20 19:32:44.702940463
+0100
+@@ -29,6 +29,7 @@
+ # 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
+
diff --git a/app-emulation/opennebula/files/patches/install.sh.5.12.0.1.patch
b/app-emulation/opennebula/files/patches/install.sh.5.12.0.1.patch
new file mode 100644
index 0000000..920597e
--- /dev/null
+++ b/app-emulation/opennebula/files/patches/install.sh.5.12.0.1.patch
@@ -0,0 +1,14 @@
+diff -Naur a/install.sh b/install.sh
+--- a/install.sh 2020-07-14 18:02:27.000000000 +0100
++++ b/install.sh 2020-09-20 14:11:35.962024833 +0100
+@@ -108,8 +108,8 @@
+ ONEHEM_LOCATION="$LIB_LOCATION/onehem"
+ SYSTEM_DS_LOCATION="$VAR_LOCATION/datastores/0"
+ DEFAULT_DS_LOCATION="$VAR_LOCATION/datastores/1"
+- RUN_LOCATION="/var/run/one"
+- LOCK_LOCATION="/var/lock/one"
++ RUN_LOCATION="/run/one"
++ LOCK_LOCATION="/run/lock/one"
+ INCLUDE_LOCATION="/usr/include"
+ SHARE_LOCATION="/usr/share/one"
+ MAN_LOCATION="/usr/share/man/man1"
diff --git a/app-emulation/opennebula/files/patches/node-sass.5.12.0.1.patch
b/app-emulation/opennebula/files/patches/node-sass.5.12.0.1.patch
new file mode 100644
index 0000000..1c70a05
--- /dev/null
+++ b/app-emulation/opennebula/files/patches/node-sass.5.12.0.1.patch
@@ -0,0 +1,20 @@
+diff -Naur a/src/sunstone/public/Gruntfile.js
b/src/sunstone/public/Gruntfile.js
+--- a/src/sunstone/public/Gruntfile.js 2020-07-14 18:02:27.000000000 +0100
++++ b/src/sunstone/public/Gruntfile.js 2020-09-20 13:18:19.158839478 +0100
+@@ -15,11 +15,16 @@
+ /* --------------------------------------------------------------------------
*/
+
+ module.exports = function(grunt) {
++ const sass = require('node-sass');
++
++ require('load-grunt-tasks')(grunt);
++
+ grunt.initConfig({
+ pkg: grunt.file.readJSON("package.json"),
+
+ sass: {
+ options: {
++ implementation: sass,
+ includePaths: ["bower_components/foundation-sites/scss"]
+ },
+ dist: {
diff --git a/app-emulation/opennebula/files/patches/package.js.5.12.0.1.patch
b/app-emulation/opennebula/files/patches/package.js.5.12.0.1.patch
new file mode 100644
index 0000000..7be32bd
--- /dev/null
+++ b/app-emulation/opennebula/files/patches/package.js.5.12.0.1.patch
@@ -0,0 +1,20 @@
+diff -Naur a/src/sunstone/public/package.json
b/src/sunstone/public/package.json
+--- a/src/sunstone/public/package.json 2020-07-14 18:02:27.000000000 +0100
++++ b/src/sunstone/public/package.json 2020-09-20 15:39:20.106057317 +0100
+@@ -2,11 +2,12 @@
+ "name": "opennebula-sunstone",
+ "version": "0.0.1",
+ "devDependencies": {
+- "grunt": "<1.1.0",
++ "grunt": "^1.3.0",
+ "grunt-cli": "^1.2.0",
+ "grunt-contrib-requirejs": "^1.0.0",
+- "grunt-contrib-watch": "^1.0.0",
+- "grunt-sass": "^1.2.1",
+- "node-sass": "^3.10.1"
++ "grunt-contrib-watch": "^1.1.0",
++ "grunt-sass": "^3.1.0",
++ "node-sass": "^4.12.0",
++ "load-grunt-tasks": "^5.1.0"
+ }
+ }
diff --git a/app-emulation/opennebula/opennebula-5.12.0.1.ebuild
b/app-emulation/opennebula/opennebula-5.12.0.1.ebuild
index 517b563..5c13e80 100644
--- a/app-emulation/opennebula/opennebula-5.12.0.1.ebuild
+++ b/app-emulation/opennebula/opennebula-5.12.0.1.ebuild
@@ -91,8 +91,10 @@ ONEUSER="oneadmin"
ONEGROUP="oneadmin"
PATCHES=(
- "${FILESDIR}/patches/fix_kvm_emulator.patch"
- "${FILESDIR}/patches/install.sh.patch"
+ "${FILESDIR}/patches/install.sh.${PV}.patch"
+ "${FILESDIR}/patches/node-sass.${PV}.patch"
+ "${FILESDIR}/patches/fix_kvm_emulator.${PV}.patch"
+ "${FILESDIR}/patches/package.js.${PV}.patch"
)
test_netsandbox() {
@@ -121,6 +123,10 @@ src_unpack() {
}
src_prepare() {
+ default
+ eapply_user
+ #EPATCH_SOURCE="${FILESDIR}/patches" EPATCH_SUFFIX="patch"
EPATCH_FORCE="yes" epatch
+
# install missing source file
#cp "${FILESDIR}"/${P}/parsers/* "${S}"/src/parsers/ || die "copy
parsers files failed"
@@ -128,9 +134,6 @@ src_prepare() {
use docker && make -C src/docker_machine/src/docker_machine vendor
for f in $(grep -rlI "/usr/lib/one" .); do sed -i -e
"s/\/usr\/lib\/one/\/usr\/$(get_libdir)\/one/g" $f; done || die "correct lib
dir failed"
- # grunt-sass and node-sass versions
- #sed -i -e 's|2.1.0|3.1.0|' -e 's|4.13.0|4.14.0|'
src/sunstone/public/package.json || die "sed failed"
-
# As we install from the github release sources we need to build
sunstone as well.
# To do that we need the npm environment set up
#
https://docs.opennebula.org/5.4/integration/references/sunstone_dev.html#sunstone-dev
@@ -139,8 +142,6 @@ src_prepare() {
#export PATH=$PATH:$PWD/node_modules/.bin
#./build.sh || die "Prepare minified files failed."
popd >/dev/null
-
- eapply_user
}
src_configure() {
@@ -163,7 +164,7 @@ src_compile() {
##
##
###########################################################################
local myconf
- myconf+="parsers=yes new_xmlrpc=yes "
+ myconf+="parsers=yes "
use extras && myconf+="new_xmlrpc=yes "
use mysql && myconf+="mysql=yes " || myconf+="mysql=no "
use sunstone && myconf+="sunstone=yes "
