added my Recipes
This commit is contained in:
@@ -0,0 +1,116 @@
|
||||
From dd6ad8ca447457c812809791ab8622da8646104c Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 30 Aug 2019 13:07:33 -0700
|
||||
Subject: [PATCH] Don't use __GNUC_PREREQ
|
||||
|
||||
These are not official GCC predefined macros; they are macros defined
|
||||
by GNU libc and some versions of BSD libc for internal use by their
|
||||
own headers, and we shouldn't be using them without checking for their
|
||||
availability first
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
lib/efi/efi.h | 4 ++--
|
||||
lib/engine/pragma.h | 4 ++--
|
||||
lib/log/log.h | 4 ++--
|
||||
lib/mpb/machine_bytes.h | 4 ++--
|
||||
lib/mpb/mpb.h | 4 ++--
|
||||
lib/orom/orom.h | 4 ++--
|
||||
6 files changed, 12 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/lib/efi/efi.h b/lib/efi/efi.h
|
||||
index 0620d9c..c8358db 100644
|
||||
--- a/lib/efi/efi.h
|
||||
+++ b/lib/efi/efi.h
|
||||
@@ -33,9 +33,9 @@
|
||||
#include <features.h>
|
||||
#include <ssi.h>
|
||||
|
||||
-#if __GNUC_PREREQ(3, 4)
|
||||
+#if ((defined __GNUC__ && __GNUC__ >= 3 && __GNUC_MINOR__ >= 4) || defined __clang__)
|
||||
#pragma once
|
||||
-#endif /* __GNUC_PREREQ */
|
||||
+#endif
|
||||
|
||||
#if defined(__cplusplus)
|
||||
extern "C" {
|
||||
diff --git a/lib/engine/pragma.h b/lib/engine/pragma.h
|
||||
index 8205ed3..fa0b268 100644
|
||||
--- a/lib/engine/pragma.h
|
||||
+++ b/lib/engine/pragma.h
|
||||
@@ -32,9 +32,9 @@
|
||||
|
||||
#include <features.h>
|
||||
|
||||
-#if __GNUC_PREREQ(3, 4)
|
||||
+#if ((defined __GNUC__ && __GNUC__ >= 3 && __GNUC_MINOR__ >= 4) || defined __clang__)
|
||||
#define SSI_HAS_PRAGMA_ONCE
|
||||
-#endif /* __GNUC_PREREQ */
|
||||
+#endif
|
||||
|
||||
#ifdef SSI_HAS_PRAGMA_ONCE
|
||||
#pragma once
|
||||
diff --git a/lib/log/log.h b/lib/log/log.h
|
||||
index 66a707b..ca5000a 100644
|
||||
--- a/lib/log/log.h
|
||||
+++ b/lib/log/log.h
|
||||
@@ -32,9 +32,9 @@
|
||||
|
||||
#include <features.h>
|
||||
|
||||
-#if __GNUC_PREREQ(3, 4)
|
||||
+#if ((defined __GNUC__ && __GNUC__ >= 3 && __GNUC_MINOR__ >= 4) || defined __clang__)
|
||||
#pragma once
|
||||
-#endif /* __GNUC_PREREQ */
|
||||
+#endif
|
||||
|
||||
#if defined(__cplusplus)
|
||||
extern "C" {
|
||||
diff --git a/lib/mpb/machine_bytes.h b/lib/mpb/machine_bytes.h
|
||||
index 6cb81c9..807461f 100644
|
||||
--- a/lib/mpb/machine_bytes.h
|
||||
+++ b/lib/mpb/machine_bytes.h
|
||||
@@ -27,9 +27,9 @@
|
||||
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
-#if __GNUC_PREREQ(3, 4)
|
||||
+#if ((defined __GNUC__ && __GNUC__ >= 3 && __GNUC_MINOR__ >= 4) || defined __clang__)
|
||||
#pragma once
|
||||
-#endif /* __GNUC_PREREQ */
|
||||
+#endif
|
||||
|
||||
#ifndef __ENDIAN_H__INCLUDED__
|
||||
#define __ENDIAN_H__INCLUDED__
|
||||
diff --git a/lib/mpb/mpb.h b/lib/mpb/mpb.h
|
||||
index 32beb21..98f82fe 100644
|
||||
--- a/lib/mpb/mpb.h
|
||||
+++ b/lib/mpb/mpb.h
|
||||
@@ -27,9 +27,9 @@
|
||||
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
-#if __GNUC_PREREQ(3, 4)
|
||||
+#if ((defined __GNUC__ && __GNUC__ >= 3 && __GNUC_MINOR__ >= 4) || defined __clang__)
|
||||
#pragma once
|
||||
-#endif /* __GNUC_PREREQ */
|
||||
+#endif
|
||||
|
||||
#ifndef __MPB_H__INCLUDED__
|
||||
#define __MPB_H__INCLUDED__
|
||||
diff --git a/lib/orom/orom.h b/lib/orom/orom.h
|
||||
index 4492066..16b03a6 100644
|
||||
--- a/lib/orom/orom.h
|
||||
+++ b/lib/orom/orom.h
|
||||
@@ -32,9 +32,9 @@
|
||||
|
||||
#include <features.h>
|
||||
|
||||
-#if __GNUC_PREREQ(3, 4)
|
||||
+#if ((defined __GNUC__ && __GNUC__ >= 3 && __GNUC_MINOR__ >= 4) || defined __clang__)
|
||||
#pragma once
|
||||
-#endif /* __GNUC_PREREQ */
|
||||
+#endif
|
||||
|
||||
#if defined(__cplusplus)
|
||||
extern "C" {
|
||||
@@ -0,0 +1,32 @@
|
||||
From 258a1d128581f185a7a5070f47df06e5c29c9db8 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 30 Aug 2019 13:43:32 -0700
|
||||
Subject: [PATCH] Include libgen.h
|
||||
|
||||
Use XPG version of basename on non gnu libc systems
|
||||
ideally posix version should be used everywhere but that
|
||||
would be upstreams choice to make
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
tools/ssieventmonitor.cpp | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tools/ssieventmonitor.cpp b/tools/ssieventmonitor.cpp
|
||||
index 0d11975..af7e09c 100644
|
||||
--- a/tools/ssieventmonitor.cpp
|
||||
+++ b/tools/ssieventmonitor.cpp
|
||||
@@ -39,7 +39,9 @@
|
||||
#include <sys/select.h>
|
||||
#include <sys/wait.h>
|
||||
#include <sys/inotify.h>
|
||||
-
|
||||
+#ifndef __GLIBC__
|
||||
+#include <libgen.h>
|
||||
+#endif
|
||||
extern "C" {
|
||||
#include "lib/safeclib/safe_str_lib.h"
|
||||
}
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
From 874da836bc857e5942675c59e19f4fd8ad09b13e Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 29 Aug 2019 14:08:19 -0700
|
||||
Subject: [PATCH 1/4] log: Avoid shadowing functions from std lib
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
lib/log/log.c | 2 +-
|
||||
lib/log/log.h | 8 ++++----
|
||||
2 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/lib/log/log.c b/lib/log/log.c
|
||||
index 7d8e17c..18b67a5 100644
|
||||
--- a/lib/log/log.c
|
||||
+++ b/lib/log/log.c
|
||||
@@ -82,7 +82,7 @@ enum log_level log_get_level(void) {
|
||||
}
|
||||
|
||||
/* */
|
||||
-void __log(enum log_level level, const char *message) {
|
||||
+void _ssiap_log(enum log_level level, const char *message) {
|
||||
struct tm tm;
|
||||
struct timeval tv;
|
||||
|
||||
diff --git a/lib/log/log.h b/lib/log/log.h
|
||||
index d94e482..66a707b 100644
|
||||
--- a/lib/log/log.h
|
||||
+++ b/lib/log/log.h
|
||||
@@ -53,13 +53,13 @@ enum log_level {
|
||||
};
|
||||
|
||||
/* */
|
||||
-#define log(__level, __message) \
|
||||
+#define ssiap_log(__level, __message) \
|
||||
do { if (log_get_level() >= (enum log_level)(__level)) \
|
||||
- __log(__level, __message); \
|
||||
+ _ssiap_log(__level, __message); \
|
||||
} while (0)
|
||||
|
||||
#define dlog(__message) \
|
||||
- log(LOG_DEBUG, __message);
|
||||
+ ssiap_log(LOG_DEBUG, __message);
|
||||
|
||||
/* */
|
||||
void log_init(enum log_level level, const char *path);
|
||||
@@ -68,7 +68,7 @@ void log_init(enum log_level level, const char *path);
|
||||
void log_fini(void);
|
||||
|
||||
/* */
|
||||
-void __log(enum log_level level, const char *message);
|
||||
+void _ssiap_log(enum log_level level, const char *message);
|
||||
|
||||
/* */
|
||||
enum log_level log_get_level(void);
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
From 01a75b23382fd042673d1f00fce708ba6c67d05a Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 30 Aug 2019 13:12:54 -0700
|
||||
Subject: [PATCH] Use stangard int types
|
||||
|
||||
__unitn_* are internal to GNU libc lets use portable types
|
||||
|
||||
Fixes
|
||||
error: unknown type name '__uint8_t'
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
lib/engine/end_device.cpp | 13 +++++++------
|
||||
1 file changed, 7 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/lib/engine/end_device.cpp b/lib/engine/end_device.cpp
|
||||
index 5a66de9..da078bf 100644
|
||||
--- a/lib/engine/end_device.cpp
|
||||
+++ b/lib/engine/end_device.cpp
|
||||
@@ -36,6 +36,7 @@
|
||||
#include <sys/ioctl.h>
|
||||
#include <fcntl.h>
|
||||
#include <linux/hdreg.h>
|
||||
+#include <stdint.h>
|
||||
#include <unistd.h>
|
||||
#include <linux/fs.h>
|
||||
#include <climits>
|
||||
@@ -90,20 +91,20 @@ using boost::shared_ptr;
|
||||
|
||||
struct AtaCommand
|
||||
{
|
||||
- __uint8_t command;
|
||||
- __uint8_t obsolete1;
|
||||
- __uint8_t obsolete2;
|
||||
- __uint8_t transportDependent;
|
||||
+ uint8_t command;
|
||||
+ uint8_t obsolete1;
|
||||
+ uint8_t obsolete2;
|
||||
+ uint8_t transportDependent;
|
||||
};
|
||||
|
||||
struct AtaIdentifyCall
|
||||
{
|
||||
AtaCommand command;
|
||||
- __uint16_t data[256];
|
||||
+ uint16_t data[256];
|
||||
};
|
||||
|
||||
namespace {
|
||||
- __uint16_t swap(__uint16_t value)
|
||||
+ uint16_t swap(uint16_t value)
|
||||
{
|
||||
return (value >> 8) | (value << 8);
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,47 @@
|
||||
From 24e0f55c07080a59907c190a315e279f7b2355e5 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 29 Aug 2019 14:25:02 -0700
|
||||
Subject: [PATCH 3/4] engine: Define discover(const String &path) in base class
|
||||
|
||||
this fixes the confusion that compiler may have when inheriting two
|
||||
different classes where each of them defines discover() virtual function
|
||||
but with different signatures
|
||||
|
||||
Remove ununsed orom_vmd
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
lib/engine/storage_object.h | 3 +++
|
||||
lib/engine/vmd_raid_info.h | 2 --
|
||||
2 files changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/engine/storage_object.h b/lib/engine/storage_object.h
|
||||
index f1feb62..9c1d3d8 100644
|
||||
--- a/lib/engine/storage_object.h
|
||||
+++ b/lib/engine/storage_object.h
|
||||
@@ -123,6 +123,9 @@ public:
|
||||
virtual void discover() {
|
||||
throw E_INVALID_OPERATION;
|
||||
}
|
||||
+ virtual void discover(const String &path) {
|
||||
+ throw E_INVALID_OPERATION;
|
||||
+ }
|
||||
virtual void addToSession(const boost::shared_ptr<Session>& pSession) = 0;
|
||||
};
|
||||
|
||||
diff --git a/lib/engine/vmd_raid_info.h b/lib/engine/vmd_raid_info.h
|
||||
index 2bea839..cc6ffbe 100644
|
||||
--- a/lib/engine/vmd_raid_info.h
|
||||
+++ b/lib/engine/vmd_raid_info.h
|
||||
@@ -53,8 +53,6 @@ public:
|
||||
return SSI_ControllerTypeVMD;
|
||||
}
|
||||
|
||||
-private:
|
||||
- struct orom_info orom_vmd;
|
||||
};
|
||||
|
||||
#endif /* __VMD_RAID_INFO_H__INCLUDED__ */
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
From c817db76bb63b872fe2069e3c2449ac18affe8c1 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 30 Aug 2019 13:17:38 -0700
|
||||
Subject: [PATCH] replace canonicalize_file_name with realpath
|
||||
|
||||
Use 'realpath()' (BSD, POSIX) instead of
|
||||
'canonicalize_file_name()' (GNU extension).
|
||||
|
||||
Fixes
|
||||
error: use of undeclared identifier 'canonicalize_file_name'
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
lib/engine/filesystem.cpp | 2 +-
|
||||
tools/ssieventmonitor.cpp | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/engine/filesystem.cpp b/lib/engine/filesystem.cpp
|
||||
index bf5a776..194ab8a 100644
|
||||
--- a/lib/engine/filesystem.cpp
|
||||
+++ b/lib/engine/filesystem.cpp
|
||||
@@ -54,7 +54,7 @@ void CanonicalPath::__canonicalize_path_name(const char *path)
|
||||
if (path == NULL) {
|
||||
throw E_NULL_POINTER;
|
||||
}
|
||||
- char *p = canonicalize_file_name(path);
|
||||
+ char *p = realpath(path, (char *)0);
|
||||
assign(p);
|
||||
if (p) {
|
||||
free(p);
|
||||
diff --git a/tools/ssieventmonitor.cpp b/tools/ssieventmonitor.cpp
|
||||
index 80791fd..3eed877 100644
|
||||
--- a/tools/ssieventmonitor.cpp
|
||||
+++ b/tools/ssieventmonitor.cpp
|
||||
@@ -120,7 +120,7 @@ static int _exec_ssimsg(void)
|
||||
int status;
|
||||
switch (pid) {
|
||||
case 0: {
|
||||
- cp = canonicalize_file_name("/proc/self/exe");
|
||||
+ cp = realpath("/proc/self/exe", (char *)0);
|
||||
if (cp) {
|
||||
strcpy_s(buffer, sizeof(buffer), cp);
|
||||
free(cp);
|
||||
@@ -0,0 +1,33 @@
|
||||
From 98fad8128d0f3b65619827ee5d65f7767b080c4c Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 29 Aug 2019 14:35:16 -0700
|
||||
Subject: [PATCH 4/4] Do not override flags coming from build environment
|
||||
|
||||
e.g. we need some optimization level turned on when security flags are enabled
|
||||
without this change, the build would fail
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
configure.ac | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 34e41ea..9bd0fe3 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -16,9 +16,9 @@ AM_INIT_AUTOMAKE(ssi, ${VERSION})
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
|
||||
dnl Set the language we use
|
||||
-CPPFLAGS="-g3 -gdwarf-2 -Wall -Werror -fvisibility=hidden -D_GNU_SOURCE -O3 -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -fPIC"
|
||||
-CFLAGS="-std=gnu99 -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -fPIC"
|
||||
-CXXFLAGS="-std=gnu++98 -fvisibility-inlines-hidden -O3 -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -fPIC"
|
||||
+#CPPFLAGS="-g3 -gdwarf-2 -Wall -Werror -fvisibility=hidden -D_GNU_SOURCE -O3 -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -fPIC"
|
||||
+#CFLAGS="-std=gnu99 -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -fPIC"
|
||||
+#CXXFLAGS="-std=gnu++98 -fvisibility-inlines-hidden -O3 -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -fPIC"
|
||||
|
||||
dnl Automake 1.11 - silent build rules
|
||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
From e90101128dfe75b9b1a0575a0179d211f677e6ad Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 30 Aug 2019 13:19:50 -0700
|
||||
Subject: [PATCH] include limits.h
|
||||
|
||||
Fixes
|
||||
error: use of undeclared identifier 'PATH_MAX'
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
tools/ssieventmonitor.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/tools/ssieventmonitor.cpp b/tools/ssieventmonitor.cpp
|
||||
index 3eed877..0d11975 100644
|
||||
--- a/tools/ssieventmonitor.cpp
|
||||
+++ b/tools/ssieventmonitor.cpp
|
||||
@@ -34,6 +34,7 @@
|
||||
#include <unistd.h>
|
||||
#include <dirent.h>
|
||||
#include <errno.h>
|
||||
+#include <limits.h>
|
||||
#include <sys/fcntl.h>
|
||||
#include <sys/select.h>
|
||||
#include <sys/wait.h>
|
||||
@@ -0,0 +1,228 @@
|
||||
From 3ec4eaf1688e413e8b5cb433148a3bc6e7987606 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 29 Aug 2019 15:10:03 -0700
|
||||
Subject: [PATCH] enable out of source tree builds
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
lib/efi/Makefile.am | 2 +-
|
||||
lib/engine/Makefile.am | 2 +-
|
||||
lib/orom/Makefile.am | 2 +-
|
||||
lib/safeclib/Makefile.am | 2 +-
|
||||
src/Makefile.am | 16 ++++++++--------
|
||||
tools/Makefile.am | 10 +++++-----
|
||||
ut/Makefile.am | 36 ++++++++++++++++++------------------
|
||||
7 files changed, 35 insertions(+), 35 deletions(-)
|
||||
|
||||
--- a/lib/efi/Makefile.am
|
||||
+++ b/lib/efi/Makefile.am
|
||||
@@ -7,6 +7,6 @@ libefi_la_SOURCES = \
|
||||
efi.h
|
||||
|
||||
libefi_la_CPPFLAGS = \
|
||||
- -I$(top_srcdir) \
|
||||
+ -I$(top_builddir) \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/lib
|
||||
--- a/lib/engine/Makefile.am
|
||||
+++ b/lib/engine/Makefile.am
|
||||
@@ -123,6 +123,7 @@ libengine_la_SOURCES = \
|
||||
volume.h
|
||||
|
||||
libengine_la_CPPFLAGS = \
|
||||
+ -I$(top_builddir) \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/lib
|
||||
--- a/lib/orom/Makefile.am
|
||||
+++ b/lib/orom/Makefile.am
|
||||
@@ -7,6 +7,6 @@ liborom_la_SOURCES = \
|
||||
orom.h
|
||||
|
||||
liborom_la_CPPFLAGS = \
|
||||
- -I$(top_srcdir) \
|
||||
+ -I$(top_builddir) \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/lib
|
||||
--- a/lib/safeclib/Makefile.am
|
||||
+++ b/lib/safeclib/Makefile.am
|
||||
@@ -37,7 +37,7 @@ libsafec_la_SOURCES = \
|
||||
strtok_s.c
|
||||
|
||||
libsafec_la_CPPFLAGS = \
|
||||
- -I$(top_srcdir) \
|
||||
+ -I$(top_builddir) \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/lib \
|
||||
-Wno-unused-variable
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = nostdinc
|
||||
lib_LTLIBRARIES = libssi.la
|
||||
|
||||
libssi_la_CPPFLAGS = \
|
||||
- -I$(top_srcdir) \
|
||||
+ -I$(top_builddir) \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/lib \
|
||||
-DBOOST_NO_USER_CONFIG
|
||||
@@ -46,10 +46,10 @@ libssi_la_SOURCES =
|
||||
templates.h \
|
||||
volume.cpp
|
||||
|
||||
-libssi_la_LIBADD = \
|
||||
- ../lib/efi/libefi.la \
|
||||
- ../lib/log/liblog.la \
|
||||
- ../lib/orom/liborom.la \
|
||||
- ../lib/mpb/libmpb.la \
|
||||
- ../lib/engine/libengine.la \
|
||||
- ../lib/safeclib/libsafec.la
|
||||
+libssi_la_LIBADD = \
|
||||
+ $(top_builddir)/lib/efi/libefi.la \
|
||||
+ $(top_builddir)/lib/log/liblog.la \
|
||||
+ $(top_builddir)/lib/orom/liborom.la \
|
||||
+ $(top_builddir)/lib/mpb/libmpb.la \
|
||||
+ $(top_builddir)/lib/engine/libengine.la \
|
||||
+ $(top_builddir)/lib/safeclib/libsafec.la
|
||||
--- a/tools/Makefile.am
|
||||
+++ b/tools/Makefile.am
|
||||
@@ -6,17 +6,18 @@ ssimsg_SOURCES =
|
||||
ssimsg.cpp
|
||||
|
||||
ssimsg_CPPFLAGS = \
|
||||
- -I$(top_srcdir) \
|
||||
+ -I$(top_builddir) \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/lib
|
||||
|
||||
-ssieventmonitor_SOURCES = \
|
||||
+ssieventmonitor_SOURCES = \
|
||||
ssieventmonitor.cpp
|
||||
|
||||
-ssieventmonitor_CPPFLAGS = \
|
||||
+ssieventmonitor_CPPFLAGS = \
|
||||
+ -I$(top_builddir) \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/lib
|
||||
|
||||
ssieventmonitor_LDADD = \
|
||||
- $(top_srcdir)/lib/safeclib/libsafec.la
|
||||
+ $(top_builddir)/lib/safeclib/libsafec.la
|
||||
--- a/ut/Makefile.am
|
||||
+++ b/ut/Makefile.am
|
||||
@@ -8,81 +8,81 @@ ut_events_SOURCES = \
|
||||
ut_events.cpp
|
||||
|
||||
ut_events_CPPFLAGS = \
|
||||
- -I$(top_srcdir) \
|
||||
+ -I$(top_builddir) \
|
||||
-I$(top_srcdir)/include
|
||||
|
||||
ut_events_LDADD = \
|
||||
- ../src/libssi.la
|
||||
+ $(top_builddir)/src/libssi.la
|
||||
|
||||
ut_volume_SOURCES = \
|
||||
ut_volume.cpp
|
||||
|
||||
ut_volume_CPPFLAGS = \
|
||||
- -I$(top_srcdir) \
|
||||
+ -I$(top_builddir) \
|
||||
-I$(top_srcdir)/include
|
||||
|
||||
ut_volume_LDADD = \
|
||||
- ../src/libssi.la
|
||||
+ $(top_builddir)/src/libssi.la
|
||||
|
||||
ut_session_SOURCES = \
|
||||
ut_session.cpp
|
||||
|
||||
ut_session_CPPFLAGS = \
|
||||
- -g3 -I$(top_srcdir) \
|
||||
+ -g3 -I$(top_builddir) \
|
||||
-I$(top_srcdir)/include
|
||||
|
||||
ut_session_LDADD = \
|
||||
- ../src/libssi.la
|
||||
+ $(top_builddir)/src/libssi.la
|
||||
|
||||
ut_info_SOURCES = \
|
||||
ut_info.cpp
|
||||
|
||||
ut_info_CPPFLAGS = \
|
||||
- -g3 -I$(top_srcdir) \
|
||||
+ -g3 -I$(top_builddir) \
|
||||
-I$(top_srcdir)/include
|
||||
|
||||
ut_info_LDADD = \
|
||||
- ../src/libssi.la
|
||||
+ $(top_builddir)/src/libssi.la
|
||||
|
||||
ut_markasspare_SOURCES = \
|
||||
ut_markasspare.cpp
|
||||
|
||||
ut_markasspare_CPPFLAGS = \
|
||||
- -g3 -I$(top_srcdir) \
|
||||
+ -g3 -I$(top_builddir) \
|
||||
-I$(top_srcdir)/include
|
||||
|
||||
ut_markasspare_LDADD = \
|
||||
- ../src/libssi.la
|
||||
+ $(top_builddir)/src/libssi.la
|
||||
|
||||
ut_migration_SOURCES = \
|
||||
ut_migration.cpp
|
||||
|
||||
ut_migration_CPPFLAGS = \
|
||||
- -g3 -I$(top_srcdir) \
|
||||
+ -g3 -I$(top_builddir) \
|
||||
-I$(top_srcdir)/include
|
||||
|
||||
ut_migration_LDADD = \
|
||||
- ../src/libssi.la
|
||||
+ $(top_builddir)/src/libssi.la
|
||||
|
||||
ut_phy_SOURCES = \
|
||||
ut_phy.cpp
|
||||
|
||||
ut_phy_CPPFLAGS = \
|
||||
- -g3 -I$(top_srcdir) \
|
||||
+ -g3 -I$(top_builddir) \
|
||||
-I$(top_srcdir)/include
|
||||
|
||||
ut_phy_LDADD = \
|
||||
- ../src/libssi.la
|
||||
+ $(top_builddir)/src/libssi.la
|
||||
|
||||
ut_initialize_volume_SOURCES = \
|
||||
ut_initialize_volume.cpp
|
||||
|
||||
ut_initialize_volume_CPPFLAGS = \
|
||||
- -g3 -I$(top_srcdir) \
|
||||
+ -g3 -I$(top_builddir) \
|
||||
-I$(top_srcdir)/include
|
||||
|
||||
ut_initialize_volume_LDADD = \
|
||||
- ../src/libssi.la
|
||||
+ $(top_builddir)/src/libssi.la
|
||||
|
||||
ut_filesystem_SOURCES = \
|
||||
ut_filesystem.cpp \
|
||||
@@ -92,7 +92,7 @@ ut_filesystem_SOURCES = \
|
||||
|
||||
ut_filesystem_CPPFLAGS = \
|
||||
-iquote $(top_srcdir)/lib/engine \
|
||||
- -I$(top_srcdir) \
|
||||
+ -I$(top_builddir) \
|
||||
-I$(top_srcdir)/include
|
||||
|
||||
ut_string_SOURCES = \
|
||||
@@ -103,6 +103,6 @@ ut_string_SOURCES = \
|
||||
|
||||
ut_string_CPPFLAGS = \
|
||||
-iquote $(top_srcdir)/lib/engine \
|
||||
- -I$(top_srcdir) \
|
||||
+ -I$(top_builddir) \
|
||||
-I$(top_srcdir)/include
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
SUMMARY = "Intel RSTe with Linux OS SSI API Library"
|
||||
|
||||
DESCRIPTION = "Intel Rapid Storage Technology enterprise with Linux OS* Standard Storage Interface API Library. \
|
||||
The library allows user to manage storage devices including creating and managing Raid arrays on systems with Intel chipset."
|
||||
|
||||
HOMEPAGE = "http://irstessi.sourceforge.net/"
|
||||
|
||||
LICENSE = "BSD-3-Clause"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=9d701a2fbb56039fd64afb2262008ddb"
|
||||
|
||||
DEPENDS += "sg3-utils"
|
||||
|
||||
SRC_URI = "http://sourceforge.net/projects/irstessi/files/${BPN}.${PV}.tgz \
|
||||
file://0001-log-Avoid-shadowing-functions-from-std-lib.patch \
|
||||
file://0002-boost-Backport-clang-support.patch \
|
||||
file://0003-engine-Define-discover-const-String-path-in-base-cla.patch \
|
||||
file://0004-Do-not-override-flags-coming-from-build-environment.patch \
|
||||
file://0005-enable-out-of-source-tree-builds.patch \
|
||||
file://0001-Don-t-use-__GNUC_PREREQ.patch \
|
||||
file://0002-Use-stangard-int-types.patch \
|
||||
file://0003-replace-canonicalize_file_name-with-realpath.patch \
|
||||
file://0004-include-limits.h.patch \
|
||||
file://0001-Include-libgen.h.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "d06c9b426437a7697d77266e9835b520"
|
||||
SRC_URI[sha256sum] = "59daab29363d6e9f07c524029c4239653cfbbee6b0e57fd75df62499728dad8a"
|
||||
|
||||
S ="${WORKDIR}/${BPN}.${PV}"
|
||||
|
||||
inherit autotools
|
||||
|
||||
CXXFLAGS += "-std=gnu++14"
|
||||
|
||||
do_configure:prepend(){
|
||||
${S}/autogen.sh
|
||||
}
|
||||
|
||||
RDEPENDS:${PN} += "mdadm"
|
||||
|
||||
COMPATIBLE_HOST:powerpc = 'null'
|
||||
COMPATIBLE_HOST:powerpc64le = 'null'
|
||||
Reference in New Issue
Block a user