Build for EPEL 8
This commit is contained in:
Davide Cavalca
parent
77ece2b3ba
commit
e905d3fcb6
|
|
@ -0,0 +1,28 @@
|
|||
From 9f3c61cc34a285133e2a7672a3d12b1ba399b646 Mon Sep 17 00:00:00 2001
|
||||
From: Davide Cavalca <dcavalca@fb.com>
|
||||
Date: Thu, 18 Feb 2021 10:01:34 -0800
|
||||
Subject: [PATCH] oomd: one more missing include
|
||||
|
||||
Summary: Missed this in D26508041 (https://github.com/facebookincubator/oomd/commit/e7403438de998a56ccceefa3e25d7af0fdcbffc2) due to the linter reordering stuff.
|
||||
|
||||
Reviewed By: dschatzberg
|
||||
|
||||
Differential Revision: D26515168
|
||||
|
||||
fbshipit-source-id: 9cdf9f95757f311eb74940044d4be4d53b9c5de8
|
||||
---
|
||||
src/oomd/StatsClient.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/oomd/StatsClient.h b/src/oomd/StatsClient.h
|
||||
index 227f744..452d92a 100644
|
||||
--- a/src/oomd/StatsClient.h
|
||||
+++ b/src/oomd/StatsClient.h
|
||||
@@ -18,6 +18,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <sys/un.h>
|
||||
+#include <optional>
|
||||
#include <string>
|
||||
#include <unordered_map>
|
||||
|
||||
|
|
@ -1,5 +1,30 @@
|
|||
From e7403438de998a56ccceefa3e25d7af0fdcbffc2 Mon Sep 17 00:00:00 2001
|
||||
From: Davide Cavalca <dcavalca@fb.com>
|
||||
Date: Thu, 18 Feb 2021 08:17:03 -0800
|
||||
Subject: [PATCH] oomd: fix missing includes for gcc-11
|
||||
|
||||
Summary:
|
||||
This in an import of a patch currently applied in the Fedora
|
||||
packaging. This patch was authored by Jeff Law <law@redhat.com> in
|
||||
https://src.fedoraproject.org/rpms/oomd/c/3844a403b26cedf9d1066d2feb95fd9b90f6bc34?branch=rawhide
|
||||
|
||||
Reviewed By: dschatzberg
|
||||
|
||||
Differential Revision: D26508041
|
||||
|
||||
fbshipit-source-id: a9e0db47370a84a9363f79e9bd0fd5236d40aed5
|
||||
---
|
||||
src/oomd/Stats.cpp | 1 +
|
||||
src/oomd/StatsClient.cpp | 1 +
|
||||
src/oomd/StatsTest.cpp | 1 +
|
||||
src/oomd/config/JsonConfigParser.cpp | 1 +
|
||||
src/oomd/include/CgroupPath.cpp | 1 +
|
||||
src/oomd/util/Fs.cpp | 2 ++
|
||||
src/oomd/util/FsTest.cpp | 1 +
|
||||
7 files changed, 8 insertions(+)
|
||||
|
||||
diff --git a/src/oomd/Stats.cpp b/src/oomd/Stats.cpp
|
||||
index 7c962e6..7efd605 100644
|
||||
index cc66bc4..9c866ca 100644
|
||||
--- a/src/oomd/Stats.cpp
|
||||
+++ b/src/oomd/Stats.cpp
|
||||
@@ -27,6 +27,7 @@
|
||||
|
|
@ -11,43 +36,43 @@ index 7c962e6..7efd605 100644
|
|||
#include "oomd/Stats.h"
|
||||
#include "oomd/StatsClient.h"
|
||||
diff --git a/src/oomd/StatsClient.cpp b/src/oomd/StatsClient.cpp
|
||||
index ce17ecf..e0dfc41 100644
|
||||
index ce17ecf..f950e0d 100644
|
||||
--- a/src/oomd/StatsClient.cpp
|
||||
+++ b/src/oomd/StatsClient.cpp
|
||||
@@ -15,6 +15,7 @@
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <sys/un.h>
|
||||
#include <unistd.h>
|
||||
#include <iostream>
|
||||
+#include <optional>
|
||||
#include "oomd/StatsClient.h"
|
||||
#include <json/reader.h>
|
||||
#include <json/value.h>
|
||||
#include <vector>
|
||||
#include "oomd/Stats.h"
|
||||
#include "oomd/util/ScopeGuard.h"
|
||||
diff --git a/src/oomd/StatsTest.cpp b/src/oomd/StatsTest.cpp
|
||||
index db70983..09efb5b 100644
|
||||
index db70983..a3ff931 100644
|
||||
--- a/src/oomd/StatsTest.cpp
|
||||
+++ b/src/oomd/StatsTest.cpp
|
||||
@@ -15,6 +15,7 @@
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <json/value.h>
|
||||
#include <sys/socket.h>
|
||||
#include <iostream>
|
||||
+#include <optional>
|
||||
#include "oomd/Stats.h"
|
||||
#include <gmock/gmock.h>
|
||||
#include <gtest/gtest.h>
|
||||
#include "oomd/StatsClient.h"
|
||||
|
||||
#include "oomd/util/Util.h"
|
||||
diff --git a/src/oomd/config/JsonConfigParser.cpp b/src/oomd/config/JsonConfigParser.cpp
|
||||
index 0a09d93..5b05267 100644
|
||||
index 50b1d40..c4ae13c 100644
|
||||
--- a/src/oomd/config/JsonConfigParser.cpp
|
||||
+++ b/src/oomd/config/JsonConfigParser.cpp
|
||||
@@ -18,6 +18,7 @@
|
||||
@@ -17,6 +17,7 @@
|
||||
|
||||
#include "oomd/config/JsonConfigParser.h"
|
||||
|
||||
#include <sstream>
|
||||
+#include <optional>
|
||||
#include <sstream>
|
||||
|
||||
#include <json/reader.h>
|
||||
|
||||
diff --git a/src/oomd/include/CgroupPath.cpp b/src/oomd/include/CgroupPath.cpp
|
||||
index a9965ed..80c9313 100644
|
||||
index addbf74..665c1e7 100644
|
||||
--- a/src/oomd/include/CgroupPath.cpp
|
||||
+++ b/src/oomd/include/CgroupPath.cpp
|
||||
@@ -18,6 +18,7 @@
|
||||
|
|
@ -59,7 +84,7 @@ index a9965ed..80c9313 100644
|
|||
#include "oomd/util/Fs.h"
|
||||
#include "oomd/util/Util.h"
|
||||
diff --git a/src/oomd/util/Fs.cpp b/src/oomd/util/Fs.cpp
|
||||
index ca0f51e..0f038f6 100644
|
||||
index 4fc669f..3389cbd 100644
|
||||
--- a/src/oomd/util/Fs.cpp
|
||||
+++ b/src/oomd/util/Fs.cpp
|
||||
@@ -15,6 +15,8 @@
|
||||
|
|
@ -72,14 +97,14 @@ index ca0f51e..0f038f6 100644
|
|||
|
||||
#include <dirent.h>
|
||||
diff --git a/src/oomd/util/FsTest.cpp b/src/oomd/util/FsTest.cpp
|
||||
index dfc9aef..757a9e1 100644
|
||||
index 362c7e5..4ce31ba 100644
|
||||
--- a/src/oomd/util/FsTest.cpp
|
||||
+++ b/src/oomd/util/FsTest.cpp
|
||||
@@ -17,6 +17,7 @@
|
||||
@@ -15,6 +15,7 @@
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
+#include <optional>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
+#include <optional>
|
||||
|
||||
#include <gmock/gmock.h>
|
||||
#include <gtest/gtest.h>
|
||||
22
oomd.spec
22
oomd.spec
|
|
@ -1,11 +1,16 @@
|
|||
%bcond_without tests
|
||||
|
||||
Name: oomd
|
||||
Summary: Userspace Out-Of-Memory (OOM) killer
|
||||
Version: 0.4.0
|
||||
Release: 4%{dist}
|
||||
Release: 5%{dist}
|
||||
License: GPLv2
|
||||
URL: https://github.com/facebookincubator/oomd/
|
||||
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||
Patch0: %{name}-gcc11.patch
|
||||
# oomd: fix missing includes for gcc-11
|
||||
Patch0: %{url}/commit/e7403438de998a56ccceefa3e25d7af0fdcbffc2.patch
|
||||
# oomd: one more missing include
|
||||
Patch1: %{url}/commit/9f3c61cc34a285133e2a7672a3d12b1ba399b646.patch
|
||||
|
||||
ExcludeArch: i686 armv7hl
|
||||
|
||||
|
|
@ -13,8 +18,10 @@ BuildRequires: gcc-c++
|
|||
BuildRequires: meson >= 0.45
|
||||
BuildRequires: pkgconfig(jsoncpp)
|
||||
BuildRequires: pkgconfig(libsystemd)
|
||||
BuildRequires: pkgconfig(gtest_main)
|
||||
BuildRequires: pkgconfig(gmock)
|
||||
%if %{with tests}
|
||||
BuildRequires: gmock-devel
|
||||
BuildRequires: gtest-devel
|
||||
%endif
|
||||
BuildRequires: systemd-rpm-macros
|
||||
%{?systemd_requires}
|
||||
|
||||
|
|
@ -43,8 +50,10 @@ Furthermore, time spent livedlocked in kernelspace is minimized.
|
|||
%meson
|
||||
%meson_build
|
||||
|
||||
%if %{with tests}
|
||||
%check
|
||||
%meson_test
|
||||
%endif
|
||||
|
||||
%install
|
||||
%meson_install
|
||||
|
|
@ -67,6 +76,11 @@ Furthermore, time spent livedlocked in kernelspace is minimized.
|
|||
%systemd_postun_with_restart oomd.service
|
||||
|
||||
%changelog
|
||||
* Wed Feb 17 2021 Davide Cavalca <dcavalca@fedoraproject.org> - 0.4.0-5
|
||||
- Build for EPEL 8
|
||||
- Make tests conditional
|
||||
- Replace gcc-11 patch with upstream commits
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue