Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
dcdb
dcdb
Commits
ce5173fc
Commit
ce5173fc
authored
Dec 13, 2019
by
Daniele Tafani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgraded OPA plugin to OPA stack v 10.10.0.0.445 + temporarily disabled OPA
parent
141ebab3
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
17 deletions
+16
-17
config.mk
config.mk
+1
-1
dcdbpusher/Makefile
dcdbpusher/Makefile
+2
-2
dependencies.mk
dependencies.mk
+11
-12
patches/IntelOPA-Basic.SLES124-x86_64.10.10.0.0.445.patch
patches/IntelOPA-Basic.SLES124-x86_64.10.10.0.0.445.patch
+2
-2
No files found.
config.mk
View file @
ce5173fc
...
...
@@ -3,7 +3,7 @@ DCDBDEPSPATH ?= $(DCDBBASEPATH)/deps
DCDBDEPLOYPATH
?=
$(DCDBBASEPATH)
/install
# dcdbpusher plugins to be built
PLUGINS
=
procfs pdu sysfs
opa
ipmi bacnet snmp gpfsmon msr tester
PLUGINS
=
procfs pdu sysfs ipmi bacnet snmp gpfsmon msr tester
# data analytics plugins to be built
OPERATORS
=
aggregator smoothing regressor job_aggregator testeroperator filesink smucngperf persystsql
...
...
dcdbpusher/Makefile
View file @
ce5173fc
...
...
@@ -105,8 +105,8 @@ libdcdbplugin_tester.$(LIBEXT): sensors/tester/TesterSensorGroup.o sensors/teste
libdcdbplugin_gpfsmon.$(LIBEXT)
:
sensors/gpfsmon/GpfsmonSensorGroup.o sensors/gpfsmon/GpfsmonConfigurator.o
$(CXX)
$(LIBFLAGS)$@
-o
$@
$^
-L
$(DCDBDEPLOYPATH)
/lib/
-lboost_log
-lboost_system
libdcdbplugin_opa.$(LIBEXT)
:
sensors/opa/OpaSensorGroup.o sensors/opa/OpaConfigurator.o
$(CXX)
$(LIBFLAGS)$@
-o
$@
$^
-L
$(DCDBDEPLOYPATH)
/lib/
-lboost_log
-lboost_system
-lopamgt
-lssl
#
libdcdbplugin_opa.$(LIBEXT): sensors/opa/OpaSensorGroup.o sensors/opa/OpaConfigurator.o
#
$(CXX) $(LIBFLAGS)$@ -o $@ $^ -L$(DCDBDEPLOYPATH)/lib/ -lboost_log -lboost_system -lopamgt -lssl
libdcdbplugin_msr.$(LIBEXT)
:
sensors/msr/MSRSensorGroup.o sensors/msr/MSRConfigurator.o
$(CXX)
$(LIBFLAGS)$@
-o
$@
$^
-L
$(DCDBDEPLOYPATH)
/lib/
-lboost_log
-lboost_system
...
...
dependencies.mk
View file @
ce5173fc
...
...
@@ -11,11 +11,11 @@ GPG-ERROR_VERSION = 1.36
NET-SNMP_VERSION
=
5.8
OPENCV_VERSION
=
4.1.0
MARIADBCONNECTOR_VERSION
=
3.1.3
OPASTACK_VERSION
=
10.
9.3.1.1
OPASTACK_VERSION
=
10.
10.0.0.445
LIBOPA_VERSION
=
0.4.0
BOOST_VERSION_U
=
$(
subst
.,_,
$(BOOST_VERSION)
)
OPASTACK_VERSION_H
=
$(
subst
.
1.1,.1-1
,
$(OPASTACK_VERSION)
)
OPASTACK_VERSION_H
=
$(
subst
.
4,-4
,
$(OPASTACK_VERSION)
)
DISTFILES
=
apache-cassandra-
$(CASSANDRA_VERSION)
.tar.gz
;
http://archive.apache.org/dist/cassandra/
$(CASSANDRA_VERSION)
/apache-cassandra-
$(CASSANDRA_VERSION)
-bin
.tar.gz
\
mosquitto-
$(MOSQUITTO_VERSION)
.tar.gz
;
http://mosquitto.org/files/source/mosquitto-
$(MOSQUITTO_VERSION)
.tar.gz
\
...
...
@@ -30,8 +30,7 @@ DISTFILES = apache-cassandra-$(CASSANDRA_VERSION).tar.gz;http://archive.apache.o
net-snmp-
$
(
NET-SNMP_VERSION
)
.tar.gz
;
https://sourceforge.net/projects/net-snmp/files/net-snmp/
$
(
NET-SNMP_VERSION
)
/net-snmp-
$
(
NET-SNMP_VERSION
)
.tar.gz/download
\
opencv-
$(OPENCV_VERSION)
.tar.gz
;
https://github.com/opencv/opencv/archive/
$(OPENCV_VERSION)
.tar.gz
\
mariadb-connector-c-
$(MARIADBCONNECTOR_VERSION)
-src
.tar.gz
;
https://downloads.mariadb.com/Connectors/c/connector-c-
$(MARIADBCONNECTOR_VERSION)
/mariadb-connector-c-
$(MARIADBCONNECTOR_VERSION)
-src
.tar.gz
\
IntelOPA-Basic.SLES123-x86_64.
$(OPASTACK_VERSION)
.tgz
;
https://downloadmirror.intel.com/28866/eng/IntelOPA-Basic.SLES123-x86_64.
$(OPASTACK_VERSION)
.tgz
IntelOPA-Basic.SLES124-x86_64.
$(OPASTACK_VERSION)
.tgz
;
https://downloadmirror.intel.com/29107/eng/IntelOPA-Basic.SLES124-x86_64.
$(OPASTACK_VERSION)
.tgz
DISTFILES_HASHES
=
apache-cassandra-3.0.18.tar.gz|94dbdaa58b366166c53f881b8e266bc8
;
\
mosquitto-1.5.5.tar.gz|a17dffc6f63b2a4ab2eb5c51139e60e9
;
\
...
...
@@ -45,7 +44,7 @@ DISTFILES_HASHES = apache-cassandra-3.0.18.tar.gz|94dbdaa58b366166c53f881b8e266b
freeipmi-1.6.3.tar.gz|b2d97e20db9b81b460ce1b9dad5bf54e
;
\
net-snmp-5.8.tar.gz|63bfc65fbb86cdb616598df1aff6458a
;
\
opencv-4.1.0.tar.gz|b80c59c7e4feee6a00608315e02b0b73
;
\
IntelOPA-Basic.SLES12
3
-x86_64.10.
9.3.1.1.tgz|b87ff694b5ad1d691a874860bdbe2
c3
1
;
\
IntelOPA-Basic.SLES12
4
-x86_64.10.
10.0.0.445.tgz|124e16f44ad7ba6dce6b15f4b2d364
c3
;
\
mariadb-connector-c-3.1.3-src.tar.gz|384817d60cd890f83c5c9673bfa11a8b
;
CASSANDRA_CLUSTER_NAME
=
Datacenter Monitor Database
...
...
@@ -62,7 +61,7 @@ FETCH = wget -c --no-check-certificate -O
MD5
=
$(
if
$(
shell
which md5 2>/dev/null
)
,md5,
$(
if
$(
shell
md5sum
--tag
Makefile 2&> /dev/null
||
true
)
,md5sum
--tag
,openssl md5
))
DISTFILESNAMES
=
$(
foreach
f,
$(DISTFILES)
,
$(
shell
echo
"
$(f)
"
|
sed
's/;.*//'
))
DISTFILESPATHS_FULL
=
$(
foreach
f,
$(DISTFILES)
,
$(
shell
echo
"
$(f)
"
|
sed
's/.tar.gz;.*//; s/.tgz;.*//; s/.zip;.*//'
))
DISTFILESPATHS
=
apache-cassandra-
$(CASSANDRA_VERSION)
mosquitto-
$(MOSQUITTO_VERSION)
boost_
$(BOOST_VERSION_U)
openssl-
$(OPENSSL_VERSION)
libuv-v
$(LIBUV_VERSION)
cpp-driver-
$(CPPDRV_VERSION)
opencv-
$(OPENCV_VERSION)
mariadb-connector-c-
$(MARIADBCONNECTOR_VERSION)
-src
IntelOPA-Basic.SLES12
3
-x86_64.
$(OPASTACK_VERSION)
DISTFILESPATHS
=
apache-cassandra-
$(CASSANDRA_VERSION)
mosquitto-
$(MOSQUITTO_VERSION)
boost_
$(BOOST_VERSION_U)
openssl-
$(OPENSSL_VERSION)
libuv-v
$(LIBUV_VERSION)
cpp-driver-
$(CPPDRV_VERSION)
opencv-
$(OPENCV_VERSION)
mariadb-connector-c-
$(MARIADBCONNECTOR_VERSION)
-src
IntelOPA-Basic.SLES12
4
-x86_64.
$(OPASTACK_VERSION)
ifneq
(,$(findstring bacnet,$(PLUGINS)))
DISTFILESPATHS
+=
bacnet-stack-
$
(
BACNET-STACK_VERSION
)
endif
...
...
@@ -126,9 +125,9 @@ $(DCDBDEPSPATH)/%/.extracted: | $(DCDBDEPSPATH)/distfiles/$$(call getarchive,%)
else
\
cd
$(DCDBDEPSPATH)
&&
tar
xf distfiles/
$(F)
>
/dev/null
;
\
fi
;
\
if
[
$(F)
=
"IntelOPA-Basic.SLES12
3
-x86_64.
$(OPASTACK_VERSION)
.tgz"
]
;
then
\
if
[
$(F)
=
"IntelOPA-Basic.SLES12
4
-x86_64.
$(OPASTACK_VERSION)
.tgz"
]
;
then
\
echo
"Extracting OPA Library and Headers..."
;
\
cd
$(DCDBDEPSPATH)
/IntelOPA-Basic.SLES12
3
-x86_64.
$(OPASTACK_VERSION)
/IntelOPA-Tools.SLES12
3
-x86_64.
$(OPASTACK_VERSION)
/RPMS/x86_64/
;
\
cd
$(DCDBDEPSPATH)
/IntelOPA-Basic.SLES12
4
-x86_64.
$(OPASTACK_VERSION)
/IntelOPA-Tools.SLES12
4
-x86_64.
$(OPASTACK_VERSION)
/RPMS/x86_64/
;
\
rpm2cpio opa-libopamgt-
$(OPASTACK_VERSION_H)
.x86_64.rpm | cpio
-idmv
;
\
rpm2cpio opa-libopamgt-devel-
$(OPASTACK_VERSION_H)
.x86_64.rpm | cpio
-idmv
;
\
fi
;
\
...
...
@@ -300,15 +299,15 @@ $(DCDBDEPSPATH)/opencv-$(OPENCV_VERSION)/.installed: $(DCDBDEPSPATH)/opencv-$(OP
@
echo
"Installing OpenCV library..."
cd
$
(
@D
)
&&
cd
build
&&
make
install
&&
touch
$
(
@
)
$(DCDBDEPSPATH)/IntelOPA-Basic.SLES12
3
-x86_64.$(OPASTACK_VERSION)/.built
:
$(DCDBDEPSPATH)/IntelOPA-Basic.SLES12
3
-x86_64.$(OPASTACK_VERSION)/.patched
$(DCDBDEPSPATH)/IntelOPA-Basic.SLES12
4
-x86_64.$(OPASTACK_VERSION)/.built
:
$(DCDBDEPSPATH)/IntelOPA-Basic.SLES12
4
-x86_64.$(OPASTACK_VERSION)/.patched
@
touch
$
(
@
)
$(DCDBDEPSPATH)/IntelOPA-Basic.SLES12
3
-x86_64.$(OPASTACK_VERSION)/.installed
:
$(DCDBDEPSPATH)/IntelOPA-Basic.SLES12
3
-x86_64.$(OPASTACK_VERSION)/.built | $(DCDBDEPLOYPATH)
$(DCDBDEPSPATH)/IntelOPA-Basic.SLES12
4
-x86_64.$(OPASTACK_VERSION)/.installed
:
$(DCDBDEPSPATH)/IntelOPA-Basic.SLES12
4
-x86_64.$(OPASTACK_VERSION)/.built | $(DCDBDEPLOYPATH)
@
echo
""
@
echo
"Installing Intel OPA library..."
cp
-a
$(DCDBDEPSPATH)
/IntelOPA-Basic.SLES12
3
-x86_64.
$(OPASTACK_VERSION)
/IntelOPA-Tools.SLES12
3
-x86_64.
$(OPASTACK_VERSION)
/RPMS/x86_64/usr/include/opamgt
$(DCDBDEPLOYPATH)
/include/
&&
\
cp
-a
$(DCDBDEPSPATH)
/IntelOPA-Basic.SLES12
4
-x86_64.
$(OPASTACK_VERSION)
/IntelOPA-Tools.SLES12
4
-x86_64.
$(OPASTACK_VERSION)
/RPMS/x86_64/usr/include/opamgt
$(DCDBDEPLOYPATH)
/include/
&&
\
mv
$(DCDBDEPLOYPATH)
/include/opamgt/iba
$(DCDBDEPLOYPATH)
/include/
&&
\
cp
-a
$(DCDBDEPSPATH)
/IntelOPA-Basic.SLES12
3
-x86_64.
$(OPASTACK_VERSION)
/IntelOPA-Tools.SLES12
3
-x86_64.
$(OPASTACK_VERSION)
/RPMS/x86_64/usr/lib/
*
$(DCDBDEPLOYPATH)
/lib/
&&
\
cp
-a
$(DCDBDEPSPATH)
/IntelOPA-Basic.SLES12
4
-x86_64.
$(OPASTACK_VERSION)
/IntelOPA-Tools.SLES12
4
-x86_64.
$(OPASTACK_VERSION)
/RPMS/x86_64/usr/lib/
*
$(DCDBDEPLOYPATH)
/lib/
&&
\
ln
-sr
$(DCDBDEPLOYPATH)
/lib/libopamgt.so.
$(LIBOPA_VERSION)
$(DCDBDEPLOYPATH)
/lib/libopamgt.so.0
&&
\
touch
$
(
@
)
...
...
patches/IntelOPA-Basic.SLES12
3
-x86_64.10.
9.3.1.1
.patch
→
patches/IntelOPA-Basic.SLES12
4
-x86_64.10.
10.0.0.445
.patch
View file @
ce5173fc
--- IntelOPA-Basic.SLES12
3
-x86_64.10.
9.3.1.1
/IntelOPA-Tools.SLES12
3
-x86_64.10.
9.3.1.1
/RPMS/x86_64/usr/include/opamgt/opamgt.h 2019-11-22 14:31:35.000000000 +0100
+++ IntelOPA-Basic.SLES12
3
-x86_64.10.
9.3.1.1
/IntelOPA-Tools.SLES12
3
-x86_64.10.
9.3.1.1
/RPMS/x86_64/usr/include/opamgt/opamgt.h 2019-11-22 14:45:42.000000000 +0100
--- IntelOPA-Basic.SLES12
4
-x86_64.10.
10.0.0.445
/IntelOPA-Tools.SLES12
4
-x86_64.10.
10.0.0.445
/RPMS/x86_64/usr/include/opamgt/opamgt.h 2019-11-22 14:31:35.000000000 +0100
+++ IntelOPA-Basic.SLES12
4
-x86_64.10.
10.0.0.445
/IntelOPA-Tools.SLES12
4
-x86_64.10.
10.0.0.445
/RPMS/x86_64/usr/include/opamgt/opamgt.h 2019-11-22 14:45:42.000000000 +0100
@@ -39,8 +39,8 @@
#include <stdint.h>
#include <stdio.h>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment